flush

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

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 3dc06e28bff2a0e7a631465283d8081e664377c7..fb7f53b0d4553011ca80d0dadcf5f820322e576e 100644 (file)
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -11,6 +11,7 @@
 %token_prefix PSI_T_
 %token_type {PSI_Token *}
 %token_destructor {free($$);}
+%default_destructor {(void)P;}
 %extra_argument {PSI_Parser *P}
 /* TOKEN is defined inside syntax_error */
 %syntax_error {
@@ -42,6 +43,32 @@ block ::= impl(impl). {
 block ::= decl_typedef(def). {
        P->defs = add_decl_typedef(P->defs, def);
 }
+block ::= constant(constant). {
+       P->consts = add_constant(P->consts, constant);
+}
+
+%type const_type {const_type*}
+const_type(type_) ::= BOOL(T). {
+       type_ = init_const_type(T->type, T->text);
+       free(T);
+}
+const_type(type_) ::= INT(T). {
+       type_ = init_const_type(T->type, T->text);
+       free(T);
+}
+const_type(type_) ::= FLOAT(T). {
+       type_ = init_const_type(T->type, T->text);
+       free(T);
+}
+const_type(type_) ::= STRING(T). {
+       type_ = init_const_type(T->type, T->text);
+       free(T);
+}
+%type constant {constant*}
+constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val) EOS. {
+       constant = init_constant(type, T->text, val);
+       free(T);
+}
 
 %type decl_typedef {decl_typedef*}
 decl_typedef(def) ::= TYPEDEF NAME(ALIAS) decl_type(type) EOS. {
@@ -57,17 +84,28 @@ decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
 %type decl_abi {decl_abi*}
 decl_abi(abi) ::= NAME(T). {
        abi = init_decl_abi(T->text);
+       free(T);
 }
 
 %type decl_var {decl_var*}
 decl_var(var) ::= NAME(T). {
-       var = init_decl_var(T->text, 0);
+       var = init_decl_var(T->text, 0, 0);
        free(T);
 }
 decl_var(var) ::= pointers(p) NAME(T). {
-       var = init_decl_var(T->text, p);
+       var = init_decl_var(T->text, p, 0);
        free(T);
 }
+decl_var(var) ::= NAME(T) LBRACKET NUMBER(D) RBRACKET. {
+       var = init_decl_var(T->text, 1, atol(D->text));
+       free(T);
+       free(D);
+}
+decl_var(var) ::= pointers(p) NAME(T) LBRACKET DIGITS(D) RBRACKET. {
+       var = init_decl_var(T->text, p+1, atol(D->text));
+       free(T);
+       free(D);
+}
 
 %type decl_vars {decl_vars*}
 decl_vars(vars) ::= decl_var(var). {
@@ -158,6 +196,7 @@ decl_type(type_) ::= NAME(T). {
 }
 
 %type impl {impl*}
+%destructor impl {free_impl($$);}
 impl(impl) ::= impl_func(func) LBRACE impl_stmts(stmts) RBRACE. {
        impl = init_impl(func, stmts);
 }
@@ -175,18 +214,23 @@ impl_func(func) ::= FUNCTION REFERENCE NSNAME(NAME) impl_args(args) COLON impl_t
 %type impl_def_val {impl_def_val*}
 impl_def_val(def) ::= NULL(T). {
        def = init_impl_def_val(T);
+       free(T);
 }
 impl_def_val(def) ::= NUMBER(T). {
        def = init_impl_def_val(T);
+       free(T);
 }
 impl_def_val(def) ::= TRUE(T). {
        def = init_impl_def_val(T);
+       free(T);
 }
 impl_def_val(def) ::= FALSE(T). {
        def = init_impl_def_val(T);
+       free(T);
 }
 impl_def_val(def) ::= QUOTED_STRING(T). {
        def = init_impl_def_val(T);
+       free(T);
 }
 
 %type impl_var {impl_var*}
@@ -223,6 +267,7 @@ impl_arg_list(args) ::= impl_arg_list(args_) COMMA impl_arg(arg). {
 }
 
 %type impl_stmts {impl_stmts*}
+%destructor impl_stmts {free_impl_stmts($$);}
 impl_stmts(stmts) ::= impl_stmt(stmt). {
        stmts = init_impl_stmts(stmt);
 }
@@ -231,6 +276,7 @@ impl_stmts(stmts) ::= impl_stmts(stmts_) impl_stmt(stmt). {
 }
 
 %type impl_stmt {impl_stmt*}
+%destructor impl_stmt {free_impl_stmt($$);}
 impl_stmt(stmt) ::= let_stmt(let). {
        stmt = init_impl_stmt(PSI_T_LET, let);
 }
@@ -245,11 +291,24 @@ impl_stmt(stmt) ::= free_stmt(free). {
 }
 
 %type let_stmt {let_stmt*}
+let_stmt(let) ::= LET decl_var(var) EOS. {
+       let = init_let_stmt(var, NULL);
+}
 let_stmt(let) ::= LET decl_var(var) EQUALS let_value(val) EOS. {
        let = init_let_stmt(var, val);
 }
 
 %type let_value {let_value*}
+let_value(val) ::= CALLOC(F) LPAREN NUMBER(N) COMMA decl_type(t) RPAREN. {
+       val = init_let_value(
+               init_let_func(F->type, F->text,
+                       atol(N->text) * psi_t_size(real_decl_type(t)->type)
+               ), NULL, 0
+       );
+       free_decl_type(t);
+       free(F);
+       free(N);
+}
 let_value(val) ::= let_func(func) LPAREN impl_var(var) RPAREN. {
        val = init_let_value(func, var, 0);
 }
@@ -265,23 +324,23 @@ let_value(val) ::= NULL. {
 
 %type let_func {let_func*}
 let_func(func) ::= STRLEN(T). {
-       func = init_let_func(T->type, T->text);
+       func = init_let_func(T->type, T->text, 0);
        free(T);
 }
 let_func(func) ::= STRVAL(T). {
-       func = init_let_func(T->type, T->text);
+       func = init_let_func(T->type, T->text, 0);
        free(T);
 }
 let_func(func) ::= INTVAL(T). {
-       func = init_let_func(T->type, T->text);
+       func = init_let_func(T->type, T->text, 0);
        free(T);
 }
 let_func(func) ::= FLOATVAL(T). {
-       func = init_let_func(T->type, T->text);
+       func = init_let_func(T->type, T->text, 0);
        free(T);
 }
 let_func(func) ::= BOOLVAL(T). {
-       func = init_let_func(T->type, T->text);
+       func = init_let_func(T->type, T->text, 0);
        free(T);
 }
 
@@ -296,6 +355,10 @@ set_value(val) ::= set_func(func) LPAREN decl_vars(vars) RPAREN. {
 }
 
 %type set_func {set_func*}
+set_func(func) ::= TO_ARRAY(T). {
+       func = init_set_func(T->type, T->text);
+       free(T);
+}
 set_func(func) ::= TO_STRING(T). {
        func = init_set_func(T->type, T->text);
        free(T);