add flags.var to parser for procedure params marked VAR

mpictor · mpictor · commit 14c854e0dfae · 2014-02-24T20:37:32.000-05:00
diff --git a/include/express/type.h b/include/express/type.h
@@ -164,6 +164,7 @@ struct TypeBody_ {
                                    *   element = expression [ ':' repetition ] .
                                    * TODO exp2cxx and exp2py do not use this! Are all use cases handled by libexppp?
                                    */
+        unsigned var        : 1; /** denotes variable marked 'VAR' - i.e. one where changes are propagated back to the caller */
         unsigned encoded    : 1; /**< encoded string */
     } flags;
     Type base;      /**< underlying base type if any can also contain true type if this type is a type reference */
diff --git a/src/express/expparse.y b/src/express/expparse.y
@@ -1121,11 +1121,11 @@ expression_list(A) ::= expression_list(B) TOK_COMMA expression(C).
 
 var(A) ::= /* NULL */.
 {
-    A.var = 1;
+    A.var = 0;
 }
 var(A) ::= TOK_VAR.
 {
-    A.var = 0;
+    A.var = 1;
 }
 
 formal_parameter(A) ::= var(B) id_list(C) TOK_COLON parameter_type(D).
@@ -1140,7 +1140,7 @@ formal_parameter(A) ::= var(B) id_list(C) TOK_COLON parameter_type(D).
 
     e = EXPcreate_from_symbol(Type_Attribute, tmp);
     v = VARcreate(e, D);
-    v->flags.optional = B.var;
+    v->flags.var = B.var; /* NOTE this was flags.optional... ?! */
     v->flags.parameter = true;
     param->data = (Generic)v;
 
diff --git a/src/express/generated/expparse.c b/src/express/generated/expparse.c
@@ -3131,14 +3131,14 @@ static void yy_reduce(
       case 115: /* var ::= */
 #line 1123 "expparse.y"
 {
-    yygotominor.yy252.var = 1;
+    yygotominor.yy252.var = 0;
 }
 #line 3137 "expparse.c"
         break;
       case 116: /* var ::= TOK_VAR */
 #line 1127 "expparse.y"
 {
-    yygotominor.yy252.var = 0;
+    yygotominor.yy252.var = 1;
 }
 #line 3144 "expparse.c"
         break;
@@ -3155,7 +3155,7 @@ static void yy_reduce(
 
     e = EXPcreate_from_symbol(Type_Attribute, tmp);
     v = VARcreate(e, yymsp[0].minor.yy297);
-    v->flags.optional = yymsp[-3].minor.yy252.var;
+    v->flags.var = yymsp[-3].minor.yy252.var; /* NOTE this was flags.optional... ?! */
     v->flags.parameter = true;
     param->data = (Generic)v;
 
diff --git a/src/express/generated/verification_info.cmake b/src/express/generated/verification_info.cmake
@@ -5,8 +5,8 @@ set(baseline_perplex_version "1.0.0")
 set(baseline_lempar_c_md5 60741b9dd886b77a5732a2e85d6d56b0)
 set(baseline_perplex_template_c_md5 7db377251a8c99c835f06df129d95bed)
 set(baseline_expscan_l_md5 c86358d3e57ce6916c28a63262fad6e6)
-set(baseline_expparse_y_md5 59a62d64cb9252e439308d45cbc4ff5d)
+set(baseline_expparse_y_md5 ab4adaa9f6b7430499cff3709fff7456)
 set(baseline_expscan_c_md5 98381bfb4cbce672eb6f438e71c40101)
 set(baseline_expscan_h_md5 3052c058a37045b43f96e4c04039bce3)
-set(baseline_expparse_c_md5 9b859ebac1b57ee7b5b19e1bdaf43a5e)
+set(baseline_expparse_c_md5 e5ea5b4acf97bfb308e63e5ed7949acb)
 set(baseline_expparse_h_md5 e4a5599839b2a9f7a6915a0dcc7747b0)
diff --git a/src/express/token_type.h b/src/express/token_type.h
@@ -18,7 +18,7 @@ struct type_flags {
     unsigned optional: 1;
     unsigned unique: 1;
     unsigned fixed: 1;
-    unsigned var: 1;        /* when formal is "VAR" */
+    unsigned var: 1;        /**< when formal is "VAR" */
 };
 
 struct entity_body {

Original file line number	Diff line number	Diff line change
`@@ -1121,11 +1121,11 @@ expression_list(A) ::= expression_list(B) TOK_COMMA expression(C).`
`1121`	`1121`
`1122`	`1122`	`var(A) ::= /* NULL */.`
`1123`	`1123`	`{`
`1124`		`- A.var = 1;`
	`1124`	`+ A.var = 0;`
`1125`	`1125`	`}`
`1126`	`1126`	`var(A) ::= TOK_VAR.`
`1127`	`1127`	`{`
`1128`		`- A.var = 0;`
	`1128`	`+ A.var = 1;`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`	`1131`	`formal_parameter(A) ::= var(B) id_list(C) TOK_COLON parameter_type(D).`
`@@ -1140,7 +1140,7 @@ formal_parameter(A) ::= var(B) id_list(C) TOK_COLON parameter_type(D).`
`1140`	`1140`
`1141`	`1141`	`e = EXPcreate_from_symbol(Type_Attribute, tmp);`
`1142`	`1142`	`v = VARcreate(e, D);`
`1143`		`- v->flags.optional = B.var;`
	`1143`	`+ v->flags.var = B.var; /* NOTE this was flags.optional... ?! */`
`1144`	`1144`	`v->flags.parameter = true;`
`1145`	`1145`	`param->data = (Generic)v;`
`1146`	`1146`
Original file line number	Diff line number	Diff line change
`@@ -3131,14 +3131,14 @@ static void yy_reduce(`
`3131`	`3131`	`case 115: /* var ::= */`
`3132`	`3132`	`#line 1123 "expparse.y"`
`3133`	`3133`	`{`
`3134`		`- yygotominor.yy252.var = 1;`
	`3134`	`+ yygotominor.yy252.var = 0;`
`3135`	`3135`	`}`
`3136`	`3136`	`#line 3137 "expparse.c"`
`3137`	`3137`	`break;`
`3138`	`3138`	`case 116: /* var ::= TOK_VAR */`
`3139`	`3139`	`#line 1127 "expparse.y"`
`3140`	`3140`	`{`
`3141`		`- yygotominor.yy252.var = 0;`
	`3141`	`+ yygotominor.yy252.var = 1;`
`3142`	`3142`	`}`
`3143`	`3143`	`#line 3144 "expparse.c"`
`3144`	`3144`	`break;`
`@@ -3155,7 +3155,7 @@ static void yy_reduce(`
`3155`	`3155`
`3156`	`3156`	`e = EXPcreate_from_symbol(Type_Attribute, tmp);`
`3157`	`3157`	`v = VARcreate(e, yymsp[0].minor.yy297);`
`3158`		`- v->flags.optional = yymsp[-3].minor.yy252.var;`
	`3158`	`+ v->flags.var = yymsp[-3].minor.yy252.var; /* NOTE this was flags.optional... ?! */`
`3159`	`3159`	`v->flags.parameter = true;`
`3160`	`3160`	`param->data = (Generic)v;`
`3161`	`3161`