projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/ext-psi]
/
src
/
parser_proc.y
diff --git
a/src/parser_proc.y
b/src/parser_proc.y
index fb7f53b0d4553011ca80d0dadcf5f820322e576e..d368914f442bd091de8650e35926d4cc4272102c 100644
(file)
--- a/
src/parser_proc.y
+++ b/
src/parser_proc.y
@@
-46,6
+46,14
@@
block ::= decl_typedef(def). {
block ::= constant(constant). {
P->consts = add_constant(P->consts, constant);
}
block ::= constant(constant). {
P->consts = add_constant(P->consts, constant);
}
+block ::= decl_struct(strct). {
+ P->structs = add_decl_struct(P->structs, strct);
+}
+
+%type decl_struct {decl_struct*}
+decl_struct(strct) ::= STRUCT NAME(N) LBRACE struct_args(args) RBRACE. {
+ strct = init_decl_struct(N->text, args);
+}
%type const_type {const_type*}
const_type(type_) ::= BOOL(T). {
%type const_type {const_type*}
const_type(type_) ::= BOOL(T). {
@@
-71,10
+79,16
@@
constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
}
%type decl_typedef {decl_typedef*}
}
%type decl_typedef {decl_typedef*}
-decl_typedef(def) ::= TYPEDEF
NAME(ALIAS) decl_type(type
) EOS. {
+decl_typedef(def) ::= TYPEDEF
decl_type(type) NAME(ALIAS
) EOS. {
def = init_decl_typedef(ALIAS->text, type);
free(ALIAS);
}
def = init_decl_typedef(ALIAS->text, type);
free(ALIAS);
}
+decl_typedef(def) ::= TYPEDEF STRUCT(S) NAME(N) NAME(ALIAS) EOS. {
+ def = init_decl_typedef(ALIAS->text, init_decl_type(S->type, N->text));
+ free(ALIAS);
+ free(S);
+ free(N);
+}
%type decl {decl*}
decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
%type decl {decl*}
decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
@@
-101,7
+115,7
@@
decl_var(var) ::= NAME(T) LBRACKET NUMBER(D) RBRACKET. {
free(T);
free(D);
}
free(T);
free(D);
}
-decl_var(var) ::= pointers(p) NAME(T) LBRACKET
DIGITS
(D) RBRACKET. {
+decl_var(var) ::= pointers(p) NAME(T) LBRACKET
NUMBER
(D) RBRACKET. {
var = init_decl_var(T->text, p+1, atol(D->text));
free(T);
free(D);
var = init_decl_var(T->text, p+1, atol(D->text));
free(T);
free(D);
@@
-128,6
+142,13
@@
decl_args(args) ::= decl_arg(arg). {
decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
args = add_decl_arg(args_, arg);
}
decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
args = add_decl_arg(args_, arg);
}
+%type struct_args {decl_args*}
+struct_args(args) ::= decl_arg(arg) EOS. {
+ args = init_decl_args(arg);
+}
+struct_args(args) ::= struct_args(args_) decl_arg(arg) EOS. {
+ args = add_decl_arg(args_, arg);
+}
%type decl_type {decl_type*}
decl_type(type_) ::= VOID(T). {
%type decl_type {decl_type*}
decl_type(type_) ::= VOID(T). {