legacy parser USE / REFERENCE bug fix

cshorler · cshorler · commit f8bd03507d49 · 2020-07-21T16:05:24.000+01:00
diff --git a/src/express/expparse.y b/src/express/expparse.y
@@ -1340,11 +1340,11 @@ initializer(A) ::= TOK_ASSIGNMENT expression(B).
  */
 rename ::= TOK_IDENTIFIER(A).
 {
-    (*interface_func)(CURRENT_SCOPE, interface_schema, A, A);
+    (*interface_func)(CURRENT_SCOPE, interface_schema, A.symbol, A.symbol);
 }
 rename ::= TOK_IDENTIFIER(A) TOK_AS TOK_IDENTIFIER(B).
 {
-    (*interface_func)(CURRENT_SCOPE, interface_schema, A, B);
+    (*interface_func)(CURRENT_SCOPE, interface_schema, A.symbol, B.symbol);
 }
 
 rename_list(A) ::= rename(B).
diff --git a/src/express/generated/expparse.c b/src/express/generated/expparse.c
@@ -3397,14 +3397,14 @@ static void yy_reduce(
       case 155: /* rename ::= TOK_IDENTIFIER */
 #line 1342 "expparse.y"
 {
-    (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[0].minor.yy0, yymsp[0].minor.yy0);
+    (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[0].minor.yy0.symbol, yymsp[0].minor.yy0.symbol);
 }
 #line 3403 "expparse.c"
         break;
       case 156: /* rename ::= TOK_IDENTIFIER TOK_AS TOK_IDENTIFIER */
 #line 1346 "expparse.y"
 {
-    (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[-2].minor.yy0, yymsp[0].minor.yy0);
+    (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[-2].minor.yy0.symbol, yymsp[0].minor.yy0.symbol);
 }
 #line 3410 "expparse.c"
         break;
diff --git a/src/express/generated/verification_info.cmake b/src/express/generated/verification_info.cmake
@@ -1,7 +1,7 @@
 # Autogenerated verification information
 set(baseline_expscan_l_md5 c86358d3e57ce6916c28a63262fad6e6)
-set(baseline_expparse_y_md5 91c889ef1f177533bcc581a735273b5e)
+set(baseline_expparse_y_md5 6e10d377f3d2abd9cce8cc439942dc2a)
 set(baseline_expscan_c_md5 b6b239869e4c7d169107fe45f760ffa0)
 set(baseline_expscan_h_md5 3052c058a37045b43f96e4c04039bce3)
-set(baseline_expparse_c_md5 f10b7efa5c5e35aa57b8a1050f22901a)
+set(baseline_expparse_c_md5 c170b5e39b5fe56e2c39288fbe2b48a1)
 set(baseline_expparse_h_md5 e4a5599839b2a9f7a6915a0dcc7747b0)

Original file line number	Diff line number	Diff line change
`@@ -1340,11 +1340,11 @@ initializer(A) ::= TOK_ASSIGNMENT expression(B).`
`1340`	`1340`	`*/`
`1341`	`1341`	`rename ::= TOK_IDENTIFIER(A).`
`1342`	`1342`	`{`
`1343`		`- (*interface_func)(CURRENT_SCOPE, interface_schema, A, A);`
	`1343`	`+ (*interface_func)(CURRENT_SCOPE, interface_schema, A.symbol, A.symbol);`
`1344`	`1344`	`}`
`1345`	`1345`	`rename ::= TOK_IDENTIFIER(A) TOK_AS TOK_IDENTIFIER(B).`
`1346`	`1346`	`{`
`1347`		`- (*interface_func)(CURRENT_SCOPE, interface_schema, A, B);`
	`1347`	`+ (*interface_func)(CURRENT_SCOPE, interface_schema, A.symbol, B.symbol);`
`1348`	`1348`	`}`
`1349`	`1349`
`1350`	`1350`	`rename_list(A) ::= rename(B).`
Original file line number	Diff line number	Diff line change
`@@ -3397,14 +3397,14 @@ static void yy_reduce(`
`3397`	`3397`	`case 155: /* rename ::= TOK_IDENTIFIER */`
`3398`	`3398`	`#line 1342 "expparse.y"`
`3399`	`3399`	`{`
`3400`		`- (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[0].minor.yy0, yymsp[0].minor.yy0);`
	`3400`	`+ (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[0].minor.yy0.symbol, yymsp[0].minor.yy0.symbol);`
`3401`	`3401`	`}`
`3402`	`3402`	`#line 3403 "expparse.c"`
`3403`	`3403`	`break;`
`3404`	`3404`	`case 156: /* rename ::= TOK_IDENTIFIER TOK_AS TOK_IDENTIFIER */`
`3405`	`3405`	`#line 1346 "expparse.y"`
`3406`	`3406`	`{`
`3407`		`- (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[-2].minor.yy0, yymsp[0].minor.yy0);`
	`3407`	`+ (*interface_func)(CURRENT_SCOPE, interface_schema, yymsp[-2].minor.yy0.symbol, yymsp[0].minor.yy0.symbol);`
`3408`	`3408`	`}`
`3409`	`3409`	`#line 3410 "expparse.c"`
`3410`	`3410`	`break;`