X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=c5eecbaf9a044b9f04426589a2dd1d2939e39a39;hp=0a7259ed8f3b082332bfc78328820bc5095fb92a;hb=35914cd494aac5ca32868ed4e791ccef04d5216d;hpb=2421d323be79e4a811a4197914330a8c0124b130

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 0a7259e..c5eecba 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -23,8 +23,9 @@
 }
 
 %nonassoc NAME.
-%left PLUS MINUS SLASH ASTERISK.
-%fallback NAME FREE SET LET RETURN LIB INT UNSIGNED.
+%left PLUS MINUS.
+%left SLASH ASTERISK.
+%fallback NAME TEMP FREE SET LET RETURN LIB INT UNSIGNED.
 
 file ::= blocks.
 
@@ -348,28 +349,6 @@ impl_stmt(stmt) ::= free_stmt(free). {
 	stmt = init_impl_stmt(PSI_T_FREE, free);
 }
 
-%type let_stmt {let_stmt*}
-%destructor let_stmt {free_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*}
-%destructor let_value {free_let_value($$);}
-let_value(val) ::= CALLOC(F) LPAREN let_calloc(alloc) RPAREN. {
-	val = init_let_value(init_let_func(F->type, F->text, alloc), NULL, 0);
-	free(F);
-}
-
-%type let_calloc {let_calloc*}
-%destructor let_calloc {free_let_calloc($$);}
-let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
-	alloc = init_let_calloc(nmemb, size);
-}
-
 %token_class num_exp_token NUMBER NSNAME.
 %token_class num_exp_op_token PLUS MINUS ASTERISK SLASH.
 %type num_exp {num_exp*}
@@ -388,21 +367,67 @@ num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
 	free(operator_);
 }
 
-let_value(val) ::= reference(r) let_func(func) LPAREN impl_var(var) RPAREN. {
-	val = init_let_value(func, var, r);
+%type let_stmt {let_stmt*}
+%destructor let_stmt {free_let_stmt($$);}
+let_stmt(let) ::= LET decl_var(var) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL));
+}/*
+let_stmt(let) ::= LET decl_var(var) EQUALS let_val(val) EOS. {
+	let = init_let_stmt(var, val);
+}*/
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_val(val) EOS. {
+	val->flags.one.is_reference = r ? 1 : 0;
+	let = init_let_stmt(var, val);
 }
-let_value(val) ::= reference(r) NULL. {
-	val = init_let_value(NULL, NULL, r);
+let_stmt(let) ::= TEMP decl_var(var) EQUALS decl_var(val) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_TMP, val));
 }
 
+%type let_val {let_val*}
+%destructor let_val {free_let_val($$);}
+let_val(val) ::= NULL. {
+	val = init_let_val(PSI_LET_NULL, NULL);
+}
+let_val(val) ::= num_exp(exp). {
+	val = init_let_val(PSI_LET_NUMEXP, exp);
+}
+let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
+	val = init_let_val(PSI_LET_CALLOC, alloc);
+}
+let_val(val) ::= let_func(func). {
+	val = init_let_val(PSI_LET_FUNC, func);
+}
+/*
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) NULL EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL, r?PSI_LET_REFERENCE:0));
+}
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) num_exp(exp) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_NUMEXP, exp, r?PSI_LET_REFERENCE:0));
+}
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) CALLOC LPAREN let_calloc(alloc) RPAREN EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_CALLOC, alloc, r?PSI_LET_REFERENCE:0));
+}
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_func(func) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_FUNC, func, r?PSI_LET_REFERENCE:0));
+}
+let_stmt(let) ::= LET decl_var(var) EQUALS decl_var(val) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_VAR, val, 0));
+}
+*/
+%type let_calloc {let_calloc*}
+%destructor let_calloc {free_let_calloc($$);}
+let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
+	alloc = init_let_calloc(nmemb, size);
+}
 %token_class let_func_token OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
 %type let_func {let_func*}
 %destructor let_func {free_let_func($$);}
-let_func(func) ::= let_func_token(T). {
-	func = init_let_func(T->type, T->text, NULL);
+let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
+	func = init_let_func(T->type, T->text, var);
 	free(T);
 }
 
+
 %type set_stmt {set_stmt*}
 %destructor set_stmt {free_set_stmt($$);}
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
@@ -411,13 +436,23 @@ set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
 
 %type set_value {set_value*}
 %destructor set_value {free_set_value($$);}
-set_value(val) ::= set_func(func) LPAREN decl_vars(vars) RPAREN. {
-	val = init_set_value(func, vars);
+set_value(val) ::= set_func(func) LPAREN decl_var(var) RPAREN. {
+	val = init_set_value(func, init_decl_vars(var));
+}
+set_value(val) ::= set_func(func) LPAREN decl_var(var) COMMA num_exp(num_) RPAREN. {
+	val = init_set_value(func, init_decl_vars(var));
+	val->num = num_;
+}
+set_value(val) ::= set_func(func_) LPAREN decl_var(var) COMMA set_vals(vals) RPAREN. {
+	val = vals;
+	val->func = func_;
+	val->vars = init_decl_vars(var);
 }
-set_value(val) ::= set_func(func_) LPAREN decl_vars(vars_) COMMA set_vals(vals) RPAREN. {
+set_value(val) ::= set_func(func_) LPAREN decl_var(var) COMMA num_exp(num_) COMMA set_vals(vals) RPAREN. {
 	val = vals;
 	val->func = func_;
-	val->vars = vars_;
+	val->num = num_;
+	val->vars = init_decl_vars(var);
 }
 %type set_vals {set_value*}
 %destructor set_vals {free_set_value($$);}