Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

glr: examples: fix locations

Browse Source 
The locations are actually false: they should include the location of
the semicolon (we print statements), but they don't.

* examples/c++/glr/c++-types.test, examples/c++/glr/c++-types.yy,
* examples/c/glr/c++-types.test, examples/c/glr/c++-types.y,
* tests/cxx-type.at:
Fix locations and adjust expectations.
This commit is contained in:
Akim Demaille
2021-01-10 16:28:54 +01:00
parent 5433b0a84b
commit 3bcc090758
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/c++/glr/c++-types.test
View File

@@ -25,10 +25,10 @@ T x = y;
x = y; x = y;
EOF EOF
run 0 "\ run 0 "\
1.0-4: +(z, q) 1.0-5: +(z, q)
3.0-2: <declare>(T, x) 3.0-3: <declare>(T, x)
5.0-6: <init-declare>(T, x, y) 5.0-7: <init-declare>(T, x, y)
7.0-4: =(x, y)" 7.0-5: =(x, y)"
cat >input <<EOF cat >input <<EOF
T (x) + y; T (x) + y;
@@ -42,9 +42,9 @@ T (y y) = z + q;
z + q; z + q;
EOF EOF
run 0 "\ run 0 "\
1.0-8: +(<cast>(x, T), y) 1.0-9: +(<cast>(x, T), y)
3.0-4: <OR>(<declare>(T, x), <cast>(x, T)) 3.0-5: <OR>(<declare>(T, x), <cast>(x, T))
5.0-12: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q))) 5.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))
7.0-14: <error> 7.0-15: <error>
9.0-4: +(z, q) 9.0-5: +(z, q)
err: 7.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'" err: 7.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"

2
examples/c++/glr/c++-types.yy
View File

@@ -157,7 +157,7 @@ yylex (yy::parser::value_type* lvalp, yy::parser::location_type* llocp)
tok = c; tok = c;
lvalp = nullptr; lvalp = nullptr;
} }
llocp->end.column = colNum-1; llocp->end.column = colNum;
return tok; return tok;
} }
} }

18
examples/c/glr/c++-types.test
View File

@@ -35,13 +35,13 @@ T (y y) = z + q;
z + q; z + q;
EOF EOF
run 0 "\ run 0 "\
1.0-4: +(z, q) 1.0-5: +(z, q)
3.0-2: <declare>(T, x) 3.0-3: <declare>(T, x)
5.0-6: <init-declare>(T, x, y) 5.0-7: <init-declare>(T, x, y)
7.0-4: =(x, y) 7.0-5: =(x, y)
9.0-8: +(<cast>(x, T), y) 9.0-9: +(<cast>(x, T), y)
11.0-4: <OR>(<declare>(T, x), <cast>(x, T)) 11.0-5: <OR>(<declare>(T, x), <cast>(x, T))
13.0-12: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q))) 13.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))
15.0-14: <error> 15.0-15: <error>
17.0-4: +(z, q) 17.0-5: +(z, q)
err: 15.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'" err: 15.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"

2
examples/c/glr/c++-types.y
View File

@@ -199,7 +199,7 @@ yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
colNum += 1; colNum += 1;
tok = c; tok = c;
} }
llocp->last_column = colNum-1; llocp->last_column = colNum;
return tok; return tok;
} }
} }

38
tests/cxx-type.at
View File

@@ -208,7 +208,7 @@ main (int argc, char **argv)
tok = c; tok = c;
yylval = YY_NULLPTR; yylval = YY_NULLPTR;
}]AT_LOCATION_IF([[ }]AT_LOCATION_IF([[
yylloc.last_column = colNum-1;]])[ yylloc.last_column = colNum;]])[
return tok; return tok;
} }
} }
@@ -344,15 +344,15 @@ m4_define([_AT_RESOLVED_GLR_OUTPUT],
]]) ]])
m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC],
[[3.0-3.5: +(z,q) [[3.0-3.6: +(z,q)
5.0-5.3: <declare>(T,x) 5.0-5.4: <declare>(T,x)
7.0-7.7: <init-declare>(T,x,y) 7.0-7.8: <init-declare>(T,x,y)
9.0-9.5: =(x,y) 9.0-9.6: =(x,y)
11.0-11.9: +(<cast>(x,T),y) 11.0-11.10: +(<cast>(x,T),y)
13.0-13.5: <declare>(T,x) 13.0-13.6: <declare>(T,x)
15.0-15.13: <init-declare>(T,y,+(z,q)) 15.0-15.14: <init-declare>(T,y,+(z,q))
17.0-17.15: <error> 17.0-17.16: <error>
19.0-19.5: +(z,q) 19.0-19.6: +(z,q)
]]) ]])
m4_define([_AT_AMBIG_GLR_OUTPUT], m4_define([_AT_AMBIG_GLR_OUTPUT],
@@ -368,15 +368,15 @@ m4_define([_AT_AMBIG_GLR_OUTPUT],
]]) ]])
m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC], m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC],
[[3.0-3.5: +(z,q) [[3.0-3.6: +(z,q)
5.0-5.3: <declare>(T,x) 5.0-5.4: <declare>(T,x)
7.0-7.7: <init-declare>(T,x,y) 7.0-7.8: <init-declare>(T,x,y)
9.0-9.5: =(x,y) 9.0-9.6: =(x,y)
11.0-11.9: +(<cast>(x,T),y) 11.0-11.10: +(<cast>(x,T),y)
13.0-13.5: <OR>(<declare>(T,x),<cast>(x,T)) 13.0-13.6: <OR>(<declare>(T,x),<cast>(x,T))
15.0-15.13: <OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q))) 15.0-15.14: <OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q)))
17.0-17.15: <error> 17.0-17.16: <error>
19.0-19.5: +(z,q) 19.0-19.6: +(z,q)
]]) ]])
m4_define([_AT_GLR_STDERR], m4_define([_AT_GLR_STDERR],