diff options
| author | Akim Demaille <demaille@gostai.com> | 2010-04-14 16:37:54 +0200 |
|---|---|---|
| committer | Akim Demaille <demaille@gostai.com> | 2010-05-04 11:32:39 +0200 |
| commit | 49976d5c45048312c97c4eec4b607660444642a9 (patch) | |
| tree | 3337f6c72703177783809dc4dee968d442cf197c /tests | |
| parent | bc81de36b7ef78ff280e14a173e5cc5d5a3191eb (diff) | |
| download | bison-49976d5c45048312c97c4eec4b607660444642a9.tar.gz | |
lalr1.cc: location_type: make sure we don't depend on loc.(begin|end).
* tests/calc.at (Span): Instead of begin/end, as in the built-in
location class, use first and last.
Define YYLLOC_DEFAULT to adjust to these changes.
* tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Adjust to the
location_type changes.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/calc.at | 33 | ||||
| -rw-r--r-- | tests/local.at | 2 |
2 files changed, 25 insertions, 10 deletions
diff --git a/tests/calc.at b/tests/calc.at index 1a3096e7..08ccbe41 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -156,7 +156,7 @@ AT_SKEL_CC_IF( [%define global_tokens_and_yystype])[ %code requires { -]AT_LOCATION_TYPE_IF([ +]AT_LOCATION_TYPE_IF([[ # include <iostream> struct Point { @@ -166,10 +166,24 @@ AT_SKEL_CC_IF( struct Span { - Point begin; - Point end; + Point first; + Point last; }; -])[ + +# define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + if (N) \ + { \ + (Current).first = (Rhs)[1].location.first; \ + (Current).last = (Rhs)[N].location.last; \ + } \ + else \ + { \ + (Current).first = (Current).last = (Rhs)[0].location.last; \ + } \ +} while (false) + +]])[ /* Exercise pre-prologue dependency to %union. */ typedef int semantic_value; } @@ -207,6 +221,7 @@ FILE *input; static semantic_value global_result = 0; static int global_count = 0; static int power (int base, int exponent); + ]AT_SKEL_CC_IF(, [/* yyerror receives the location if: - %location & %pure & %glr @@ -278,11 +293,11 @@ exp: std::ostream& operator<< (std::ostream& o, const Span& s) { - o << s.begin.l << '.' << s.begin.c; - if (s.begin.l != s.end.l) - o << '-' << s.end.l << '.' << s.end.c - 1; - else if (s.begin.c != s.end.c - 1) - o << '-' << s.end.c - 1; + o << s.first.l << '.' << s.first.c; + if (s.first.l != s.last.l) + o << '-' << s.last.l << '.' << s.last.c - 1; + else if (s.first.c != s.last.c - 1) + o << '-' << s.last.c - 1; return o; } ]]) diff --git a/tests/local.at b/tests/local.at index 8ebf26a8..6b9dad7b 100644 --- a/tests/local.at +++ b/tests/local.at @@ -155,7 +155,7 @@ AT_PURE_LEX_IF( AT_SKEL_CC_IF( [AT_LOCATION_TYPE_IF( - [AT_LOC_PUSHDEF([begin.l], [begin.c], [end.l], [end.c])], + [AT_LOC_PUSHDEF([first.l], [first.c], [last.l], [last.c])], [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])], [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])]) |