flush

[m6w6/ext-psi] / src / parser_proc.y

diff --git a/src/parser_proc.y b/src/parser_proc.y
index efffcf79fdc0061da00aa89c609190d9d8cb0cc1..b606cf0ab7547d57640004f3dfdaea4934562c2c 100644 (file)
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -17,6 +17,9 @@
 %syntax_error {
        PSI_ParserSyntaxError(P, P->fn, P->line, "Unexpected token '%s'", TOKEN->text);
 }
+
+%nonassoc NAME.
+
 file ::= blocks.
 
 blocks ::= block.
@@ -204,7 +207,7 @@ decl_type(type_) ::= SIZE_T(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
-decl_type(type_) ::= SINT8(T). {
+decl_type(type_) ::= INT8(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
@@ -212,7 +215,7 @@ decl_type(type_) ::= UINT8(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
-decl_type(type_) ::= SINT16(T). {
+decl_type(type_) ::= INT16(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
@@ -220,7 +223,7 @@ decl_type(type_) ::= UINT16(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
-decl_type(type_) ::= SINT32(T). {
+decl_type(type_) ::= INT32(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
@@ -228,7 +231,7 @@ decl_type(type_) ::= UINT32(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
-decl_type(type_) ::= SINT64(T). {
+decl_type(type_) ::= INT64(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
@@ -240,6 +243,11 @@ decl_type(type_) ::= NAME(T). {
        type_ = init_decl_type(T->type, T->text);
        free(T);
 }
+decl_type(type_) ::= STRUCT(S) NAME(T). {
+       type_ = init_decl_type(S->type, T->text);
+       free(S);
+       free(T);
+}
 
 %type impl {impl*}
 %destructor impl {free_impl($$);}
@@ -261,23 +269,23 @@ impl_func(func) ::= FUNCTION REFERENCE NSNAME(NAME) impl_args(args) COLON impl_t
 %type impl_def_val {impl_def_val*}
 %destructor impl_def_val {free_impl_def_val($$);}
 impl_def_val(def) ::= NULL(T). {
-       def = init_impl_def_val(T);
+       def = init_impl_def_val(T->type, T->text);
        free(T);
 }
 impl_def_val(def) ::= NUMBER(T). {
-       def = init_impl_def_val(T);
+       def = init_impl_def_val(T->type, T->text);
        free(T);
 }
 impl_def_val(def) ::= TRUE(T). {
-       def = init_impl_def_val(T);
+       def = init_impl_def_val(T->type, T->text);
        free(T);
 }
 impl_def_val(def) ::= FALSE(T). {
-       def = init_impl_def_val(T);
+       def = init_impl_def_val(T->type, T->text);
        free(T);
 }
 impl_def_val(def) ::= QUOTED_STRING(T). {
-       def = init_impl_def_val(T);
+       def = init_impl_def_val(T->type, T->text);
        free(T);
 }