Rename identifiers to avoid real and potential collisions.

[bison.git] / tests / sets.at

diff --git a/tests/sets.at b/tests/sets.at
index 64402c20ac99d17fc930c80f5659e459463c7d3b..373271dc1a81e961499feaee0c870c469f098517 100644 (file)
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -29,25 +29,25 @@ m4_define([AT_EXTRACT_SETS],
    :null
    p
    n
    :null
    p
    n

-   /^[         ]*$/! b null
+   /^[         ]*$/ !b null

 }
 /^FIRSTS$/ {
    :firsts
    p
    n
 }
 /^FIRSTS$/ {
    :firsts
    p
    n

-   /^[         ]*$/! b firsts
+   /^[         ]*$/ !b firsts

 }
 /^FDERIVES$/ {
    :fderiv
    p
    n
 }
 /^FDERIVES$/ {
    :fderiv
    p
    n

-   /^[         ]*$/! b fderiv
+   /^[         ]*$/ !b fderiv

 }
 /^DERIVES$/ {
    :deriv
    p
    n
 }
 /^DERIVES$/ {
    :deriv
    p
    n

-   /^[         ]*$/! b deriv
+   /^[         ]*$/ !b deriv

 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])
 }
 ]])
 AT_CHECK([sed -f extract.sed $1], 0, [stdout])


@@ -78,32 +78,32 @@ AT_DATA([[input.y]],
 e: 'e' | /* Nothing */;
 ]])
 
 e: 'e' | /* Nothing */;
 ]])
 

-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])

 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES
 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES

-       $axiom derives
-               1: e $ (rule 0)
+       $accept derives
+                 0  e $end

        e derives
        e derives

-               2: 'e' (rule 1)
-               3: (rule 2)
+                 1  'e'
+                 2  /* empty */

 NULLABLE
 NULLABLE

-       $axiom: no
+       $accept: no

        e: yes
 FIRSTS
        e: yes
 FIRSTS

-       $axiom firsts
-               4 ($axiom)
-               5 (e)
+       $accept firsts
+               $accept
+               e

        e firsts
        e firsts

-               5 (e)
+               e

 FDERIVES
 FDERIVES

-       $axiom derives
-               0: e $
-               1: 'e'
-               2:
+       $accept derives
+                 0  e $end
+                 1  'e'
+                 2  /* empty */

        e derives
        e derives

-               1: 'e'
-               2:
+                 1  'e'
+                 2  /* empty */

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -162,10 +162,10 @@ g: h;
 h: 'h';
 ]])
 
 h: 'h';
 ]])
 

-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])

 
 

-AT_CHECK([[sed -n 's/[  ]*$//;/^RTC: Output BEGIN/,/^RTC: Output END/p' stderr]], [],
-[[RTC: Output BEGIN
+AT_CHECK([[sed -n 's/[  ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [],
+[[RTC: Firsts Output BEGIN

 
    012345678
   .---------.
 
    012345678
   .---------.


@@ -179,7 +179,7 @@ AT_CHECK([[sed -n 's/[       ]*$//;/^RTC: Output BEGIN/,/^RTC: Output END/p' stderr]]
  7|       11|
  8|        1|
   `---------'
  7|       11|
  8|        1|
   `---------'

-RTC: Output END
+RTC: Firsts Output END

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -208,47 +208,47 @@ exp:
  ;
 ]])
 
  ;
 ]])
 

-AT_CHECK([[bison --trace input.y]], [], [], [stderr])
+AT_CHECK([[bison --trace=sets input.y]], [], [], [stderr])

 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES
 AT_EXTRACT_SETS([stderr], [sets])
 AT_CHECK([[cat sets]], [],
 [[DERIVES

-       $axiom derives
-               1: exp $ (rule 0)
+       $accept derives
+                 0  exp $end

        exp derives
        exp derives

-               2: exp '<' exp (rule 1)
-               3: exp '>' exp (rule 2)
-               4: exp '+' exp (rule 3)
-               5: exp '-' exp (rule 4)
-               6: exp '^' exp (rule 5)
-               7: exp '=' exp (rule 6)
-               8: "exp" (rule 7)
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"

 NULLABLE
 NULLABLE

-       $axiom: no
+       $accept: no

        exp: no
 FIRSTS
        exp: no
 FIRSTS

-       $axiom firsts
-               10 ($axiom)
-               11 (exp)
+       $accept firsts
+               $accept
+               exp

        exp firsts
        exp firsts

-               11 (exp)
+               exp

 FDERIVES
 FDERIVES

-       $axiom derives
-               0: exp $
-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "exp"
+       $accept derives
+                 0  exp $end
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"

        exp derives
        exp derives

-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "exp"
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP