[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/13] java: tests: check location tracking in the calculator
|
From: |
Akim Demaille |
|
Subject: |
[PATCH 10/13] java: tests: check location tracking in the calculator |
|
Date: |
Wed, 5 Feb 2020 18:05:02 +0100 |
Unfortunately in the Java skeleton the user cannot override the way
locations are displayed, and locations don't know the structure of the
positions. So they cannot implement the tricks used in the C/C++
skeletons to display "1.1" instead of "1.1-1.2".
* tests/local.at (Java): Add support for column tracking in the
locations, as we did in examples/java/calc.
* tests/calc.at: Use AT_CALC_YYLEX.
---
TODO | 10 +++
tests/calc.at | 170 +++++++++++++++++++------------------------------
tests/local.at | 59 ++++++++++++++---
3 files changed, 123 insertions(+), 116 deletions(-)
diff --git a/TODO b/TODO
index d579b379..e50461e0 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,16 @@
YYUNDEFTOK is an internal symbol number, as YYTERROR.
But YYERRCODE is an external token number.
+** Tests
+The calc.at test should call yyerror with location:
+
+| exp '=' exp
+ {
+ if ($1.intValue () != $3.intValue ())
+ yyerror (]AT_LOCATION_IF([[@$, ]])["calc: error: " + $1 + " != " + $3);
+ }
+
+
** doc
I feel it's ugly to use the GNU style to declare functions in the doc. It
generates tons of white space in the page, and may contribute to bad page
diff --git a/tests/calc.at b/tests/calc.at
index 3f800430..96ba5c54 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -334,28 +334,31 @@ class CalcLexer(R) : Lexer
m4_define([AT_CALC_YYLEX(java)],
[AT_LEXPARAM_IF([[%code lexer {]],
[[%code epilogue { class CalcLexer implements Calc.Lexer {]])[
- StreamTokenizer st;
+ StreamTokenizer st;]AT_LOCATION_IF([[
+ PositionReader reader;]])[
public ]AT_LEXPARAM_IF([[YYLexer]], [[CalcLexer]])[ (InputStream is)
- {
- st = new StreamTokenizer (new InputStreamReader (is));
+ {]AT_LOCATION_IF([[
+ reader = new PositionReader (new InputStreamReader (is));
+ st = new StreamTokenizer (reader);]], [[
+ st = new StreamTokenizer (new InputStreamReader (is));]])[
st.resetSyntax ();
st.eolIsSignificant (true);
- st.whitespaceChars ('\t', '\t');
- st.whitespaceChars (' ', ' ');
st.wordChars ('0', '9');
}
]AT_LOCATION_IF([[
- Position yypos = new Position (1, 0);
+ Position start = new Position (1, 0);
+ Position end = new Position (1, 0);
- public Position getStartPos() {
- return yypos;
+ public Position getStartPos () {
+ return start;
}
- public Position getEndPos() {
- return yypos;
+ public Position getEndPos () {
+ return end;
}
+
]])[
]AT_YYERROR_DEFINE[
@@ -365,26 +368,27 @@ m4_define([AT_CALC_YYLEX(java)],
return yylval;
}
- public int yylex () throws IOException {
+ public int yylex () throws IOException {;]AT_LOCATION_IF([[
+ start.set (reader.getPosition ());]])[
int ttype = st.nextToken ();]AT_LOCATION_IF([[
- yypos = new Position (yypos.lineno (), yypos.token () + 1);]])[
- if (ttype == st.TT_EOF)
- return EOF;
-
- else if (ttype == st.TT_EOL)
- {]AT_LOCATION_IF([[
- yypos = new Position (yypos.lineno () + 1, 0);]])[
- return (int) '\n';
- }
-
- else if (ttype == st.TT_WORD)
+ end.set (reader.getPosition ());]])[
+ switch (ttype)
{
- yylval = new Integer (st.sval);
+ case StreamTokenizer.TT_EOF:
+ return EOF;
+ case StreamTokenizer.TT_EOL:;]AT_LOCATION_IF([[
+ end.line += 1;
+ end.column = 0;]])[
+ return (int) '\n';
+ case StreamTokenizer.TT_WORD:
+ yylval = new Integer (st.sval);]AT_LOCATION_IF([[
+ end.set (reader.getPreviousPosition ());]])[
return NUM;
+ case ' ': case '\t':
+ return yylex ();
+ default:
+ return ttype;
}
-
- else
- return st.ttype;
}
]AT_LEXPARAM_IF([], [[}]])[
};
@@ -635,12 +639,13 @@ m4_define([_AT_DATA_CALC_Y(java)],
]$4[
-%code imports {
- import java.io.StreamTokenizer;
+%code imports {]AT_LOCATION_IF([[
+ import java.io.BufferedReader;]])[
+ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
- import java.io.IOException;
+ import java.io.StreamTokenizer;
}
%code {
@@ -674,7 +679,7 @@ exp:
| exp '=' exp
{
if ($1.intValue () != $3.intValue ())
- yyerror (]AT_LOCATION_IF([[@$, ]])["calc: error: " + $1 + " != " + $3);
+ yyerror ("calc: error: " + $1 + " != " + $3);
}
| exp '+' exp { $$ = $1 + $3; }
| exp '-' exp { $$ = $1 - $3; }
@@ -687,65 +692,10 @@ exp:
| '!' { $$ = 0; return YYERROR; }
| '-' error { $$ = 0; return YYERROR; }
;
-
-]AT_LEXPARAM_IF([[%code lexer {]],
- [[%code epilogue { class CalcLexer implements Calc.Lexer {]])[
- StreamTokenizer st;
-
- public ]AT_LEXPARAM_IF([[YYLexer]], [[CalcLexer]])[ (InputStream is)
- {
- st = new StreamTokenizer (new InputStreamReader (is));
- st.resetSyntax ();
- st.eolIsSignificant (true);
- st.whitespaceChars ('\t', '\t');
- st.whitespaceChars (' ', ' ');
- st.wordChars ('0', '9');
- }
-
+]AT_CALC_YYLEX[
]AT_LOCATION_IF([[
- Position yypos = new Position (1, 0);
-
- public Position getStartPos() {
- return yypos;
- }
-
- public Position getEndPos() {
- return yypos;
- }
-]])[
- ]AT_YYERROR_DEFINE[
-
- Integer yylval;
-
- public Object getLVal() {
- return yylval;
- }
-
- public int yylex () throws IOException {
- int ttype = st.nextToken ();]AT_LOCATION_IF([[
- yypos = new Position (yypos.lineno (), yypos.token () + 1);]])[
- if (ttype == st.TT_EOF)
- return EOF;
-
- else if (ttype == st.TT_EOL)
- {]AT_LOCATION_IF([[
- yypos = new Position (yypos.lineno () + 1, 0);]])[
- return (int) '\n';
- }
-
- else if (ttype == st.TT_WORD)
- {
- yylval = new Integer (st.sval);
- return NUM;
- }
-
- else
- return st.ttype;
- }
-]AT_LEXPARAM_IF([], [[}]])[
-};
%%
-]AT_JAVA_POSITION_DEFINE[
+]AT_JAVA_POSITION_DEFINE])[
]])
])# _AT_DATA_JAVA_CALC_Y
@@ -771,6 +721,9 @@ m4_define([AT_DATA_CALC_Y],
#
# We don't count GLR's traces yet, since its traces are somewhat
# different from LALR's. Likewise for D.
+#
+# The push traces are the same, except for "Return for a new token", don't
+# count them.
m4_define([_AT_CHECK_CALC],
[AT_DATA([[input]],
[[$2
@@ -778,7 +731,7 @@ m4_define([_AT_CHECK_CALC],
AT_JAVA_IF(
[AT_JAVA_PARSER_CHECK([Calc < input], 0, [AT_PARAM_IF([m4_n([$3])])],
[stderr])],
[AT_PARSER_CHECK([calc input], 0, [AT_PARAM_IF([m4_n([$3])])],
[stderr])])
-AT_LANG_MATCH([c\|c++],
+AT_LANG_MATCH([c\|c++\|java],
[AT_GLR_IF([],
[AT_CHECK([grep -v 'Return for a new token:' stderr | wc -l],
[0],
@@ -907,6 +860,8 @@ AT_FULL_COMPILE(AT_JAVA_IF([[Calc]], [[calc]]),
AT_DEFINES_IF([[lex], [main]], [
AT_CHECK_SPACES([AT_JAVA_IF([Calc], [calc]).AT_LANG_EXT
AT_DEFINES_IF([AT_JAVA_IF([Calc], [calc]).AT_LANG_HDR])])
# Test the precedences.
+# The Java traces do not show the clean up sequence at the end,
+# since it does not support %destructor.
_AT_CHECK_CALC([$1],
[1 + 2 * 3 = 7
1 + 2 * -3 = -5
@@ -922,33 +877,33 @@ _AT_CHECK_CALC([$1],
2^2^3 = 256
(2^2)^3 = 64],
[[final: 64 12 0]],
- [1017])
+ [AT_JAVA_IF([1014], [1017])])
# Some syntax errors.
_AT_CHECK_CALC_ERROR([$1], [1], [1 2],
[[final: 0 0 1]],
[15],
- [[1.3: syntax error on token [number] (expected: ['=']
['-'] ['+'] ['*'] ['/'] ['^'] ['\n'])]])
+ [AT_JAVA_IF([1.3-1.4], [1.3])[: syntax error on token
[number] (expected: ['='] ['-'] ['+'] ['*'] ['/'] ['^'] ['\n'])]])
_AT_CHECK_CALC_ERROR([$1], [1], [1//2],
[[final: 0 0 1]],
[20],
- [[1.3: syntax error on token ['/'] (expected: [number]
['-'] ['('] ['!'])]])
+ [AT_JAVA_IF([1.3-1.4], [1.3])[: syntax error on token
['/'] (expected: [number] ['-'] ['('] ['!'])]])
_AT_CHECK_CALC_ERROR([$1], [1], [error],
[[final: 0 0 1]],
[5],
- [[1.1: syntax error on token [$undefined] (expected:
[number] ['-'] ['\n'] ['('] ['!'])]])
+ [AT_JAVA_IF([1.1-1.2], [1.1])[: syntax error on token
[$undefined] (expected: [number] ['-'] ['\n'] ['('] ['!'])]])
_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3],
[[final: 0 0 1]],
[30],
[AT_LAC_IF(
- [[1.7: syntax error on token ['='] (expected: ['-']
['+'] ['*'] ['/'] ['^'] ['\n'])]],
- [[1.7: syntax error on token ['='] (expected: ['-']
['+'] ['*'] ['/'] ['^'])]])])
+ [AT_JAVA_IF([1.7-1.8], [1.7])[: syntax error on token
['='] (expected: ['-'] ['+'] ['*'] ['/'] ['^'] ['\n'])]],
+ [AT_JAVA_IF([1.7-1.8], [1.7])[: syntax error on token
['='] (expected: ['-'] ['+'] ['*'] ['/'] ['^'])]])])
_AT_CHECK_CALC_ERROR([$1], [1],
[
+1],
[[final: 0 0 1]],
[20],
- [[2.1: syntax error on token ['+'] (expected:
]AT_TOKEN_TRANSLATE_IF([[[end of file]]], [[[end of input]]])[ [number] ['-']
['\n'] ['('] ['!'])]])
+ [AT_JAVA_IF([2.1-2.2], [2.1])[: syntax error on token
['+'] (expected: ]AT_TOKEN_TRANSLATE_IF([[[end of file]]], [[[end of input]]])[
[number] ['-'] ['\n'] ['('] ['!'])]])
# Exercise error messages with EOF: work on an empty file.
_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null],
[[final: 0 0 1]],
@@ -975,10 +930,10 @@ _AT_CHECK_CALC_ERROR([$1], [0],
[() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
[[final: 4444 0 4]],
[250],
-[[1.2: syntax error on token [')'] (expected: [number] ['-'] ['('] ['!'])
-1.18: syntax error on token [')'] (expected: [number] ['-'] ['('] ['!'])
-1.23: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])
-1.41: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])
+[AT_JAVA_IF([1.2-1.3], [1.2])[: syntax error on token [')'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.18-1.19], [1.18])[: syntax error on token [')'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.23-1.24], [1.23])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.41-1.42], [1.41])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])
calc: error: 4444 != 1]])
# The same, but this time exercising explicitly triggered syntax errors.
@@ -986,13 +941,13 @@ calc: error: 4444 != 1]])
_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (1 2) = 1],
[[final: 2222 0 1]],
[102],
-[[1.10: syntax error on token [number] (expected: ['='] ['-'] ['+'] ['*']
['/'] ['^'] [')'])
+[AT_JAVA_IF([1.10-1.11], [1.10])[: syntax error on token [number] (expected:
['='] ['-'] ['+'] ['*'] ['/'] ['^'] [')'])
calc: error: 2222 != 1]])
_AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (1 2) = 1],
[[final: 2222 0 2]],
[113],
-[[1.4: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])
-1.12: syntax error on token [number] (expected: ['='] ['-'] ['+'] ['*'] ['/']
['^'] [')'])
+[AT_JAVA_IF([1.4-1.5], [1.4])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.12-1.13], [1.12])[: syntax error on token [number] (expected:
['='] ['-'] ['+'] ['*'] ['/'] ['^'] [')'])
calc: error: 2222 != 1]])
# Check that yyerrok works properly: second error is not reported,
@@ -1000,9 +955,9 @@ calc: error: 2222 != 1]])
_AT_CHECK_CALC_ERROR([$1], [0], [(* *) + (*) + (*)],
[[final: 3333 0 3]],
[113],
-[[1.2: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])
-1.10: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])
-1.16: syntax error on token ['*'] (expected: [number] ['-'] ['('] ['!'])]])
+[AT_JAVA_IF([1.2-1.3], [1.2])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.10-1.11], [1.10])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])
+]AT_JAVA_IF([1.16-1.17], [1.16])[: syntax error on token ['*'] (expected:
[number] ['-'] ['('] ['!'])]])
AT_BISON_OPTION_POPDEFS
@@ -1204,7 +1159,10 @@ m4_define([AT_CHECK_CALC_LALR1_JAVA],
[AT_CHECK_CALC([%language "Java" $1], [$2])])
AT_CHECK_CALC_LALR1_JAVA
-
+AT_CHECK_CALC_LALR1_JAVA([%define parse.error verbose])
+AT_CHECK_CALC_LALR1_JAVA([%locations %define parse.error verbose])
+AT_CHECK_CALC_LALR1_JAVA([%define parse.trace %define parse.error verbose
%locations])
+AT_CHECK_CALC_LALR1_JAVA([%define parse.trace %define parse.error verbose
%locations %lex-param {InputStream is}])
m4_popdef([AT_TOKEN_TRANSLATE_IF])
diff --git a/tests/local.at b/tests/local.at
index ee499a08..9b6c203f 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -832,39 +832,78 @@ m4_define([AT_YYERROR_DECLARE_EXTERN(java)], [])
# -----------------------
m4_define([AT_JAVA_POSITION_DEFINE],
[[class Position {
- public int line;
- public int token;
+ public int line = 1;
+ public int column = 1;
public Position ()
{
- line = 0;
- token = 0;
+ line = 1;
+ column = 1;
}
public Position (int l, int t)
{
line = l;
- token = t;
+ column = t;
+ }
+
+ public void set (Position p)
+ {
+ line = p.line;
+ column = p.column;
}
public boolean equals (Position l)
{
- return l.line == line && l.token == token;
+ return l.line == line && l.column == column;
}
public String toString ()
{
- return Integer.toString (line) + "." + Integer.toString (token);
+ return Integer.toString (line) + "." + Integer.toString (column);
}
- public int lineno ()
+ public int line ()
{
return line;
}
- public int token ()
+ public int column ()
{
- return token;
+ return column;
+ }
+}
+
+class PositionReader extends BufferedReader {
+
+ private Position position = new Position ();
+ private Position previousPosition = new Position ();
+
+ public PositionReader (Reader reader) {
+ super (reader);
+ }
+
+ public int read () throws IOException {
+ int res = super.read ();
+ previousPosition.set (position);
+ if (res > -1) {
+ char c = (char)res;
+ if (c == '\r' || c == '\n') {
+ position.line += 1;
+ position.column = 1;
+ } else {
+ position.column += 1;
+ }
+ }
+ return res;
+ }
+
+ public Position getPosition () {
+ return position;
+ }
+
+ public Position getPreviousPosition () {
+ return previousPosition;
}
}]])
--
2.25.0
- [PATCH 03/13] traces: don't print the stack before the gotos, (continued)
- [PATCH 03/13] traces: don't print the stack before the gotos, Akim Demaille, 2020/02/05
- [PATCH 01/13] traces: write the "Reading a token" alone on its line, Akim Demaille, 2020/02/05
- [PATCH 02/13] traces: show the stack after reading a token, Akim Demaille, 2020/02/05
- [PATCH 05/13] java: examples: prefer switch to chains of else-if, Akim Demaille, 2020/02/05
- [PATCH 04/13] java: examples: split in two, Akim Demaille, 2020/02/05
- [PATCH 06/13] java: examples: fix the tracking of locations, Akim Demaille, 2020/02/05
- [PATCH 07/13] java: style: prefer putting the square brackets on the type, Akim Demaille, 2020/02/05
- [PATCH 08/13] java: style: avoid useless initializers, Akim Demaille, 2020/02/05
- [PATCH 09/13] java: tests: prepare the replacement of calculator tests, Akim Demaille, 2020/02/05
- [PATCH 10/13] java: tests: check location tracking in the calculator,
Akim Demaille <=
- [PATCH 12/13] java: tests: check push parsers, Akim Demaille, 2020/02/05
- [PATCH 11/13] java: tests: remove now redundant tests, Akim Demaille, 2020/02/05
- [PATCH 13/13] java: tests: remove now redundant tests, Akim Demaille, 2020/02/05