create Type_Repeat for repeat expr's

mpictor · mpictor · commit 383c18e9b7a6 · 2013-09-13T20:33:42.000-04:00
diff --git a/include/express/type.h b/include/express/type.h
@@ -193,7 +193,7 @@ extern SC_EXPRESS_EXPORT Type Type_Boolean;
 extern SC_EXPRESS_EXPORT Type Type_Enumeration;
 extern SC_EXPRESS_EXPORT Type Type_Expression;
 extern SC_EXPRESS_EXPORT Type Type_Aggregate;
-extern SC_EXPRESS_EXPORT Type Type_Integer;
+extern SC_EXPRESS_EXPORT Type Type_Repeat;
 extern SC_EXPRESS_EXPORT Type Type_Integer;
 extern SC_EXPRESS_EXPORT Type Type_Number;
 extern SC_EXPRESS_EXPORT Type Type_Real;
diff --git a/src/express/expparse.y b/src/express/expparse.y
@@ -437,7 +437,7 @@ aggregate_init_body(A) ::= aggregate_init_element(B) TOK_COLON expression(C).
 
     LISTadd_last(A, (Generic)C);
 
-    C->type->u.type->body->flags.repeat = 1;
+    C->type = Type_Repeat;
 }
 aggregate_init_body(A) ::= aggregate_init_body(B) TOK_COMMA
 			    aggregate_init_element(C).
@@ -455,7 +455,7 @@ aggregate_init_body(A) ::= aggregate_init_body(B) TOK_COMMA
     LISTadd_last(A, (Generic)C);
     LISTadd_last(A, (Generic)D);
 
-    D->type->u.type->body->flags.repeat = 1;
+    D->type = Type_Repeat;
 }
 
 aggregate_type(A) ::= TOK_AGGREGATE TOK_OF parameter_type(B).
diff --git a/src/express/generated/expparse.c b/src/express/generated/expparse.c
@@ -2378,7 +2378,7 @@ static void yy_reduce(
 
     LISTadd_last(yygotominor.yy371, (Generic)yymsp[0].minor.yy401);
 
-    yymsp[0].minor.yy401->type->u.type->body->flags.repeat = 1;
+    yymsp[0].minor.yy401->type = Type_Repeat;
 }
 #line 2384 "expparse.c"
         break;
@@ -2400,7 +2400,7 @@ static void yy_reduce(
     LISTadd_last(yygotominor.yy371, (Generic)yymsp[-2].minor.yy401);
     LISTadd_last(yygotominor.yy371, (Generic)yymsp[0].minor.yy401);
 
-    yymsp[0].minor.yy401->type->u.type->body->flags.repeat = 1;
+    yymsp[0].minor.yy401->type = Type_Repeat;
 }
 #line 2406 "expparse.c"
         break;
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 617531ffdf3ee747cd5980f3c3a9a4bd)
-set(baseline_expparse_y_md5 5443ad0e6683ac00766dfc6e2cd72cbf)
+set(baseline_expparse_y_md5 4f0aa066541f563ddcc96dcf1a89b29d)
 set(baseline_expscan_c_md5 980080ce3ee1366a28f2ecfabbe65a3f)
 set(baseline_expscan_h_md5 3052c058a37045b43f96e4c04039bce3)
-set(baseline_expparse_c_md5 37b5ed548cd394342c18e240d312f55e)
+set(baseline_expparse_c_md5 010c5300472b52d88351c844d20581a5)
 set(baseline_expparse_h_md5 e4a5599839b2a9f7a6915a0dcc7747b0)
diff --git a/src/express/type.c b/src/express/type.c
@@ -138,7 +138,7 @@ Type Type_Boolean;
 Type Type_Enumeration;
 Type Type_Expression;
 Type Type_Aggregate;
-Type Type_Integer;
+Type Type_Repeat;
 Type Type_Integer;
 Type Type_Number;
 Type Type_Real;
@@ -406,6 +406,10 @@ void TYPEinitialize() {
     Type_Identifier = TYPEcreate( identifier_ );
     Type_Identifier->u.type->body->flags.shared = 1;
 
+    Type_Repeat = TYPEcreate( integer_ );
+    Type_Repeat->u.type->body->flags.shared = 1;
+    Type_Repeat->u.type->body->flags.repeat = 1;
+
     Type_Oneof = TYPEcreate( oneof_ );
     Type_Oneof->u.type->body->flags.shared = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ aggregate_init_body(A) ::= aggregate_init_element(B) TOK_COLON expression(C).`
`437`	`437`
`438`	`438`	`LISTadd_last(A, (Generic)C);`
`439`	`439`
`440`		`- C->type->u.type->body->flags.repeat = 1;`
	`440`	`+ C->type = Type_Repeat;`
`441`	`441`	`}`
`442`	`442`	`aggregate_init_body(A) ::= aggregate_init_body(B) TOK_COMMA`
`443`	`443`	`aggregate_init_element(C).`
`@@ -455,7 +455,7 @@ aggregate_init_body(A) ::= aggregate_init_body(B) TOK_COMMA`
`455`	`455`	`LISTadd_last(A, (Generic)C);`
`456`	`456`	`LISTadd_last(A, (Generic)D);`
`457`	`457`
`458`		`- D->type->u.type->body->flags.repeat = 1;`
	`458`	`+ D->type = Type_Repeat;`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`aggregate_type(A) ::= TOK_AGGREGATE TOK_OF parameter_type(B).`
Original file line number	Diff line number	Diff line change
`@@ -2378,7 +2378,7 @@ static void yy_reduce(`
`2378`	`2378`
`2379`	`2379`	`LISTadd_last(yygotominor.yy371, (Generic)yymsp[0].minor.yy401);`
`2380`	`2380`
`2381`		`- yymsp[0].minor.yy401->type->u.type->body->flags.repeat = 1;`
	`2381`	`+ yymsp[0].minor.yy401->type = Type_Repeat;`
`2382`	`2382`	`}`
`2383`	`2383`	`#line 2384 "expparse.c"`
`2384`	`2384`	`break;`
`@@ -2400,7 +2400,7 @@ static void yy_reduce(`
`2400`	`2400`	`LISTadd_last(yygotominor.yy371, (Generic)yymsp[-2].minor.yy401);`
`2401`	`2401`	`LISTadd_last(yygotominor.yy371, (Generic)yymsp[0].minor.yy401);`
`2402`	`2402`
`2403`		`- yymsp[0].minor.yy401->type->u.type->body->flags.repeat = 1;`
	`2403`	`+ yymsp[0].minor.yy401->type = Type_Repeat;`
`2404`	`2404`	`}`
`2405`	`2405`	`#line 2406 "expparse.c"`
`2406`	`2406`	`break;`