maint: post-release administrivia

[bison.git] / tests / output.at

diff --git a/tests/output.at b/tests/output.at
index 37d2c3da6bf5acb63989761c775703587bb3ebd8..09126774fe1ec002cee19d33011e79c821217e2e 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,6 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
 
 # Checking the output filenames.                    -*- Autotest -*-
 

-# Copyright (C) 2000-2002, 2005-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2002, 2005-2015 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -17,90 +17,121 @@
 
 AT_BANNER([[Output file names.]])
 
 
 AT_BANNER([[Output file names.]])
 

-
-# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [SHELLIO],
+# AT_CHECK_FILES(EXPECTED-FILES, [IGNORED-FILES])
+# -----------------------------------------------
+# Check that the current directory contains FILE... (sorted).
+m4_define([AT_CHECK_FILES],
+[AT_CHECK([[find . -type f |
+           $PERL -ne '
+      s,\./,,; chomp;
+      push @file, $_ unless m{^($2|testsuite.log)$};
+      END { print join (" ", sort @file), "\n" }']],
+          [], [$1
+])])
+
+# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [STATUS],

 #                 [ADDITIONAL-TESTS], [PRE-TESTS])
 # -----------------------------------------------------------------------------
 m4_define([AT_CHECK_OUTPUT],
 #                 [ADDITIONAL-TESTS], [PRE-TESTS])
 # -----------------------------------------------------------------------------
 m4_define([AT_CHECK_OUTPUT],

-[AT_SETUP([[Output files: $2 $3 $5]])
-$7
-for file in $1 $4; do
-  case "$file" in
-    */*) mkdir -p `echo "$file" | sed 's,/.*,,'`;;
+[AT_SETUP([[Output files: ]$2 $3])[
+]$7[
+for file in ]$1 $4[; do
+  case $file in
+    */*) mkdir -p `echo "$file" | sed 's,/[^/]*,,'`;;

   esac
 done
   esac
 done

-AT_DATA([$1],
-[[$2
+]AT_DATA([$1],
+[$2[

 %%
 %%

-foo: {};
+foo: %empty {};
+]])[
+
+]AT_BISON_CHECK([$3 $1], [$5], [], [ignore])[
+# Ignore the files non-generated files
+]AT_CHECK_FILES([$4], [$1])[
+]$6[
+]AT_CLEANUP[

 ]])
 
 ]])
 

-AT_BISON_CHECK([$3 $1 $5], 0)
-AT_CHECK([ls $4], [], [ignore])
-$6
-AT_CLEANUP
-])
-

 AT_CHECK_OUTPUT([foo.y], [], [-dv],
 AT_CHECK_OUTPUT([foo.y], [], [-dv],

-               [foo.output foo.tab.c foo.tab.h])
+                [foo.output foo.tab.c foo.tab.h])

 
 # Some versions of Valgrind (at least valgrind-3.6.0.SVN-Debian) report
 # "fgrep: write error: Bad file descriptor" when stdout is closed, so we
 # skip this test group during maintainer-check-valgrind.
 
 # Some versions of Valgrind (at least valgrind-3.6.0.SVN-Debian) report
 # "fgrep: write error: Bad file descriptor" when stdout is closed, so we
 # skip this test group during maintainer-check-valgrind.

-AT_CHECK_OUTPUT([foo.y], [], [-dv],
-               [foo.output foo.tab.c foo.tab.h],
-               [>&-], [],
-               [AT_CHECK([[case "$PREBISON" in *valgrind*) exit 77;; esac]])])
+AT_CHECK_OUTPUT([foo.y], [], [-dv >&-],
+                [foo.output foo.tab.c foo.tab.h],
+                [], [],
+                [AT_CHECK([[case "$PREBISON" in *valgrind*) exit 77;; esac]])])

 
 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],
 
 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],

-               [foo.c foo.h foo.output])
+                [foo.c foo.h foo.output])

 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],
 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],

-               [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_OUTPUT([foo.y], [], [-dv -y],
-               [y.output y.tab.c y.tab.h])
+                [foo.output foo.tab.c foo.tab.h])
+
+AT_CHECK_OUTPUT([foo.y], [], [-dv -g --xml -y],
+                [y.dot y.output y.tab.c y.tab.h y.xml])
+# With '-o y.tab.c', we expect 'y.output' etc. (for compatility with Yacc).
+AT_CHECK_OUTPUT([foo.y], [], [-dv -g --xml -o y.tab.c],
+                [y.dot y.output y.tab.c y.tab.h y.xml])
+

 AT_CHECK_OUTPUT([foo.y], [], [-dv -b bar],
 AT_CHECK_OUTPUT([foo.y], [], [-dv -b bar],

-               [bar.output bar.tab.c bar.tab.h])
+                [bar.output bar.tab.c bar.tab.h])

 AT_CHECK_OUTPUT([foo.y], [], [-dv -g -o foo.c],
 AT_CHECK_OUTPUT([foo.y], [], [-dv -g -o foo.c],

-               [foo.c foo.dot foo.h foo.output])
+                [foo.c foo.dot foo.h foo.output])

 
 
 AT_CHECK_OUTPUT([foo.y], [%defines %verbose],      [],
 
 
 AT_CHECK_OUTPUT([foo.y], [%defines %verbose],      [],

-               [foo.output foo.tab.c foo.tab.h])
+                [foo.output foo.tab.c foo.tab.h])

 AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
 AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],

-               [y.output y.tab.c y.tab.h])
+                [y.output y.tab.c y.tab.h])

 
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose %yacc],[],
 
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose %yacc],[],

-               [y.output y.tab.c y.tab.h])
+                [y.output y.tab.c y.tab.h])

 
 # Exercise %output and %file-prefix including deprecated '='
 AT_CHECK_OUTPUT([foo.y], [%file-prefix "bar" %defines %verbose],      [],
 
 # Exercise %output and %file-prefix including deprecated '='
 AT_CHECK_OUTPUT([foo.y], [%file-prefix "bar" %defines %verbose],      [],

-               [bar.output bar.tab.c bar.tab.h])
-AT_CHECK_OUTPUT([foo.y], [%output="bar.c" %defines %verbose %yacc],[],
-               [bar.output bar.c bar.h])
+                [bar.output bar.tab.c bar.tab.h])
+AT_CHECK_OUTPUT([foo.y], [%output "bar.c" %defines %verbose %yacc],[],
+                [bar.c bar.h bar.output])

 AT_CHECK_OUTPUT([foo.y],
 AT_CHECK_OUTPUT([foo.y],

-               [%file-prefix="baz" %output "bar.c" %defines %verbose %yacc],
-               [],
-               [bar.output bar.c bar.h])
+                [%file-prefix "baz" %output "bar.c" %defines %verbose %yacc],
+                [],
+                [bar.c bar.h bar.output])

 
 
 # Check priorities of extension control.
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],
 
 
 # Check priorities of extension control.
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],

-               [foo.output foo.tab.cc foo.tab.hh])
+                [foo.output foo.tab.cc foo.tab.hh])

 
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],
 
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],

-               [foo.c foo.h foo.output])
+                [foo.c foo.h foo.output])

 
 AT_CHECK_OUTPUT([foo.yy], [],
 
 AT_CHECK_OUTPUT([foo.yy], [],

-               [--defines=foo.hpp -o foo.c++],
-               [foo.c++ foo.hpp])
+                [--defines=foo.hpp -o foo.c++],
+                [foo.c++ foo.hpp])

 
 AT_CHECK_OUTPUT([foo.yy], [%defines "foo.hpp"],
 
 AT_CHECK_OUTPUT([foo.yy], [%defines "foo.hpp"],

-               [-o foo.c++],
-               [foo.c++ foo.hpp])
+                [-o foo.c++],
+                [foo.c++ foo.hpp])

 
 AT_CHECK_OUTPUT([foo.yy], [],
 
 AT_CHECK_OUTPUT([foo.yy], [],

-               [-o foo.c++ --graph=foo.gph],
-               [foo.c++ foo.gph])
+                [-o foo.c++ --graph=foo.gph],
+                [foo.c++ foo.gph])
+
+# Do not generate code when there are early errors (even warnings as
+# errors).
+AT_CHECK_OUTPUT([foo.y], [%type <foo> useless],
+                [--defines --graph --xml --report=all -Wall -Werror],
+                [foo.dot foo.output foo.xml],
+                [1])
+
+# Do not generate code when there are late errors (even warnings as
+# errors).
+AT_CHECK_OUTPUT([foo.y], [%define useless],
+                [--defines --graph --xml --report=all -Wall -Werror],
+                [foo.dot foo.output foo.xml],
+                [1])

 
 
 ## ------------ ##
 
 
 ## ------------ ##


@@ -113,22 +144,36 @@ AT_CHECK([grep 'include .subdir/' $1.cc], 1, [])
 AT_CHECK([grep 'include .subdir/' $1.hh], 1, [])
 ])
 
 AT_CHECK([grep 'include .subdir/' $1.hh], 1, [])
 ])
 

+AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %verbose], [],
+                [foo.output foo.tab.cc])
+

 AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],
 AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],

-               [foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh])
+                [foo.output foo.tab.cc foo.tab.hh stack.hh])
+
+AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %verbose %locations], [],
+                [foo.output foo.tab.cc])
+
+AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose %locations], [],
+                [foo.output foo.tab.cc foo.tab.hh location.hh position.hh stack.hh])

 
 AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],
 
 AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],

-               [foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh],
-               [], [AT_CHECK_NO_SUBDIR_PART([foo.tab])])
+                [foo.output foo.tab.cc foo.tab.hh stack.hh],
+                [], [AT_CHECK_NO_SUBDIR_PART([foo.tab])])

 
 

-AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose],
-               [-o subdir/foo.cc],
-               [subdir/foo.cc subdir/foo.hh subdir/foo.output subdir/location.hh subdir/stack.hh subdir/position.hh],
-               [], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])])
+AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose %locations],
+                [-o subdir/foo.cc],
+                [subdir/foo.cc subdir/foo.hh subdir/foo.output subdir/location.hh subdir/position.hh subdir/stack.hh],
+                [], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])])

 
 AT_CHECK_OUTPUT([gram_dir/foo.yy],
                 [%skeleton "lalr1.cc" %defines %verbose %file-prefix "output_dir/foo"],
                 [],
 
 AT_CHECK_OUTPUT([gram_dir/foo.yy],
                 [%skeleton "lalr1.cc" %defines %verbose %file-prefix "output_dir/foo"],
                 [],

-               [output_dir/foo.tab.cc output_dir/foo.tab.hh output_dir/foo.output output_dir/location.hh output_dir/stack.hh output_dir/position.hh])
+                [output_dir/foo.output output_dir/foo.tab.cc output_dir/foo.tab.hh output_dir/stack.hh])
+
+AT_CHECK_OUTPUT([gram_dir/foo.yy],
+                [%skeleton "lalr1.cc" %defines %locations %verbose %file-prefix "output_dir/foo"],
+                [],
+                [output_dir/foo.output output_dir/foo.tab.cc output_dir/foo.tab.hh output_dir/location.hh output_dir/position.hh output_dir/stack.hh])

 
 
 # AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR,
 
 
 # AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR,


@@ -157,22 +202,22 @@ AT_CLEANUP
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [], [--graph="foo.tab.c"],
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [], [--graph="foo.tab.c"],

-[foo.y: warning: conflicting outputs to file 'foo.tab.c'
-])
+[[foo.y: warning: conflicting outputs to file 'foo.tab.c' [-Wother]
+]])

 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [%defines "foo.output"], [-v],
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [%defines "foo.output"], [-v],

-[foo.y: warning: conflicting outputs to file 'foo.output'
-])
+[[foo.y: warning: conflicting outputs to file 'foo.output' [-Wother]
+]])

 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],

-[%skeleton "lalr1.cc" %defines], [--graph="location.hh"],
-[foo.y: warning: conflicting outputs to file 'location.hh'
-])
+[%skeleton "lalr1.cc" %defines %locations], [--graph="location.hh"],
+[[foo.y: warning: conflicting outputs to file 'location.hh' [-Wother]
+]])

 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],

-[foo.y: error: refusing to overwrite the input file 'foo.y'
-], 1)
+[[foo.y: error: refusing to overwrite the input file 'foo.y'
+]], 1)

 
 
 # AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS])
 
 
 # AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS])


@@ -205,9 +250,9 @@ AT_DATA_GRAMMAR([cxx.y],
 %%
 start: {};
 ]])
 %%
 start: {};
 ]])

-AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y])
-AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
-AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"])
+AT_BISON_CHECK([-o "AS_ESCAPE([$1.cc])" --defines="AS_ESCAPE([$1.hh])" cxx.y])
+AT_CHECK([ls "AS_ESCAPE([$1.cc])" "AS_ESCAPE([$1.hh])"], [], [ignore])
+AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.cc])"])

 $2
 
 AT_BISON_OPTION_POPDEFS
 $2
 
 AT_BISON_OPTION_POPDEFS


@@ -264,27 +309,27 @@ a: ;
 b: 'b';
 ]],
 [[
 b: 'b';
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . exp $end\l  1 exp: . a '?' b\l  2 a: .\l"]
-  0 -> "0R2e" [style = solid]
- "0R2e" [style = filled, shape = diamond, fillcolor = 3, label = "R2"]
+  0 [label="State 0\n\l  0 $accept: . exp $end\l  1 exp: . a '?' b\l  2 a: . %empty\l"]

   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]
   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]

-  1 [label="State 1\n  0 $accept: exp . $end\l"]
+  0 -> "0R2" [style=solid]
+ "0R2" [label="R2", fillcolor=3, shape=diamond, style=filled]
+  1 [label="State 1\n\l  0 $accept: exp . $end\l"]

   1 -> 3 [style=solid label="$end"]
   1 -> 3 [style=solid label="$end"]

-  2 [label="State 2\n  1 exp: a . '?' b\l"]
+  2 [label="State 2\n\l  1 exp: a . '?' b\l"]

   2 -> 4 [style=solid label="'?'"]
   2 -> 4 [style=solid label="'?'"]

-  3 [label="State 3\n  0 $accept: exp $end .\l"]
-  3 -> "3R0e" [style = solid]
- "3R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
-  4 [label="State 4\n  1 exp: a '?' . b\l  3 b: . 'b'\l"]
+  3 [label="State 3\n\l  0 $accept: exp $end .\l"]
+  3 -> "3R0" [style=solid]
+ "3R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]
+  4 [label="State 4\n\l  1 exp: a '?' . b\l  3 b: . 'b'\l"]

   4 -> 5 [style=solid label="'b'"]
   4 -> 6 [style=dashed label="b"]
   4 -> 5 [style=solid label="'b'"]
   4 -> 6 [style=dashed label="b"]

-  5 [label="State 5\n  3 b: 'b' .\l"]
-  5 -> "5R3e" [style = solid]
- "5R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  6 [label="State 6\n  1 exp: a '?' b .\l"]
-  6 -> "6R1e" [style = solid]
- "6R1e" [style = filled, shape = diamond, fillcolor = 3, label = "R1"]
+  5 [label="State 5\n\l  3 b: 'b' .\l"]
+  5 -> "5R3" [style=solid]
+ "5R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  6 [label="State 6\n\l  1 exp: a '?' b .\l"]
+  6 -> "6R1" [style=solid]
+ "6R1" [label="R1", fillcolor=3, shape=diamond, style=filled]

 ]])
 
 ## ------------------------ ##
 ]])
 
 ## ------------------------ ##


@@ -306,13 +351,7 @@ empty_b: %prec 'b';
 empty_c: %prec 'c';
 ]],
 [[
 empty_c: %prec 'c';
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . start $end\l  1 start: . 'a'\l  2      | . empty_a 'a'\l  3      | . 'b'\l  4      | . empty_b 'b'\l  5      | . 'c'\l  6      | . empty_c 'c'\l  7 empty_a: .  ['a']\l  8 empty_b: .  ['b']\l  9 empty_c: .  ['c']\l"]
-  0 -> "0R7d" [label = "['a']" style = solid]
- "0R7d" [style = filled, shape = diamond, fillcolor = 5, label = "R7"]
-  0 -> "0R8d" [label = "['b']" style = solid]
- "0R8d" [style = filled, shape = diamond, fillcolor = 5, label = "R8"]
-  0 -> "0R9d" [label = "['c']" style = solid]
- "0R9d" [style = filled, shape = diamond, fillcolor = 5, label = "R9"]
+  0 [label="State 0\n\l  0 $accept: . start $end\l  1 start: . 'a'\l  2      | . empty_a 'a'\l  3      | . 'b'\l  4      | . empty_b 'b'\l  5      | . 'c'\l  6      | . empty_c 'c'\l  7 empty_a: . %empty  ['a']\l  8 empty_b: . %empty  ['b']\l  9 empty_c: . %empty  ['c']\l"]

   0 -> 1 [style=solid label="'a'"]
   0 -> 2 [style=solid label="'b'"]
   0 -> 3 [style=solid label="'c'"]
   0 -> 1 [style=solid label="'a'"]
   0 -> 2 [style=solid label="'b'"]
   0 -> 3 [style=solid label="'c'"]


@@ -320,35 +359,41 @@ empty_c: %prec 'c';
   0 -> 5 [style=dashed label="empty_a"]
   0 -> 6 [style=dashed label="empty_b"]
   0 -> 7 [style=dashed label="empty_c"]
   0 -> 5 [style=dashed label="empty_a"]
   0 -> 6 [style=dashed label="empty_b"]
   0 -> 7 [style=dashed label="empty_c"]

-  1 [label="State 1\n  1 start: 'a' .\l"]
-  1 -> "1R1e" [style = solid]
- "1R1e" [style = filled, shape = diamond, fillcolor = 3, label = "R1"]
-  2 [label="State 2\n  3 start: 'b' .\l"]
-  2 -> "2R3e" [style = solid]
- "2R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  3 [label="State 3\n  5 start: 'c' .\l"]
-  3 -> "3R5e" [style = solid]
- "3R5e" [style = filled, shape = diamond, fillcolor = 3, label = "R5"]
-  4 [label="State 4\n  0 $accept: start . $end\l"]
+  0 -> "0R7d" [label="['a']", style=solid]
+ "0R7d" [label="R7", fillcolor=5, shape=diamond, style=filled]
+  0 -> "0R8d" [label="['b']", style=solid]
+ "0R8d" [label="R8", fillcolor=5, shape=diamond, style=filled]
+  0 -> "0R9d" [label="['c']", style=solid]
+ "0R9d" [label="R9", fillcolor=5, shape=diamond, style=filled]
+  1 [label="State 1\n\l  1 start: 'a' .\l"]
+  1 -> "1R1" [style=solid]
+ "1R1" [label="R1", fillcolor=3, shape=diamond, style=filled]
+  2 [label="State 2\n\l  3 start: 'b' .\l"]
+  2 -> "2R3" [style=solid]
+ "2R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  3 [label="State 3\n\l  5 start: 'c' .\l"]
+  3 -> "3R5" [style=solid]
+ "3R5" [label="R5", fillcolor=3, shape=diamond, style=filled]
+  4 [label="State 4\n\l  0 $accept: start . $end\l"]

   4 -> 8 [style=solid label="$end"]
   4 -> 8 [style=solid label="$end"]

-  5 [label="State 5\n  2 start: empty_a . 'a'\l"]
+  5 [label="State 5\n\l  2 start: empty_a . 'a'\l"]

   5 -> 9 [style=solid label="'a'"]
   5 -> 9 [style=solid label="'a'"]

-  6 [label="State 6\n  4 start: empty_b . 'b'\l"]
+  6 [label="State 6\n\l  4 start: empty_b . 'b'\l"]

   6 -> 10 [style=solid label="'b'"]
   6 -> 10 [style=solid label="'b'"]

-  7 [label="State 7\n  6 start: empty_c . 'c'\l"]
+  7 [label="State 7\n\l  6 start: empty_c . 'c'\l"]

   7 -> 11 [style=solid label="'c'"]
   7 -> 11 [style=solid label="'c'"]

-  8 [label="State 8\n  0 $accept: start $end .\l"]
-  8 -> "8R0e" [style = solid]
- "8R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
-  9 [label="State 9\n  2 start: empty_a 'a' .\l"]
-  9 -> "9R2e" [style = solid]
- "9R2e" [style = filled, shape = diamond, fillcolor = 3, label = "R2"]
-  10 [label="State 10\n  4 start: empty_b 'b' .\l"]
-  10 -> "10R4e" [style = solid]
- "10R4e" [style = filled, shape = diamond, fillcolor = 3, label = "R4"]
-  11 [label="State 11\n  6 start: empty_c 'c' .\l"]
-  11 -> "11R6e" [style = solid]
- "11R6e" [style = filled, shape = diamond, fillcolor = 3, label = "R6"]
+  8 [label="State 8\n\l  0 $accept: start $end .\l"]
+  8 -> "8R0" [style=solid]
+ "8R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]
+  9 [label="State 9\n\l  2 start: empty_a 'a' .\l"]
+  9 -> "9R2" [style=solid]
+ "9R2" [label="R2", fillcolor=3, shape=diamond, style=filled]
+  10 [label="State 10\n\l  4 start: empty_b 'b' .\l"]
+  10 -> "10R4" [style=solid]
+ "10R4" [label="R4", fillcolor=3, shape=diamond, style=filled]
+  11 [label="State 11\n\l  6 start: empty_c 'c' .\l"]
+  11 -> "11R6" [style=solid]
+ "11R6" [label="R6", fillcolor=3, shape=diamond, style=filled]

 ]])
 
 ## ---------------------- ##
 ]])
 
 ## ---------------------- ##


@@ -373,41 +418,41 @@ empty_b: %prec 'b';
 empty_c: %prec 'c';
 ]],
 [[
 empty_c: %prec 'c';
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . start $end\l  1 start: . 'a'\l  2      | . empty_a 'a'\l  3      | . 'b'\l  4      | . empty_b 'b'\l  5      | . 'c'\l  6      | . empty_c 'c'\l  7 empty_a: .  ['a']\l  8 empty_b: .  []\l  9 empty_c: .  []\l"]
-  0 -> "0R7e" [style = solid]
- "0R7e" [style = filled, shape = diamond, fillcolor = 3, label = "R7"]
+  0 [label="State 0\n\l  0 $accept: . start $end\l  1 start: . 'a'\l  2      | . empty_a 'a'\l  3      | . 'b'\l  4      | . empty_b 'b'\l  5      | . 'c'\l  6      | . empty_c 'c'\l  7 empty_a: . %empty  ['a']\l  8 empty_b: . %empty  []\l  9 empty_c: . %empty  []\l"]

   0 -> 1 [style=solid label="'b'"]
   0 -> 2 [style=solid label="'c'"]
   0 -> 3 [style=dashed label="start"]
   0 -> 4 [style=dashed label="empty_a"]
   0 -> 5 [style=dashed label="empty_b"]
   0 -> 6 [style=dashed label="empty_c"]
   0 -> 1 [style=solid label="'b'"]
   0 -> 2 [style=solid label="'c'"]
   0 -> 3 [style=dashed label="start"]
   0 -> 4 [style=dashed label="empty_a"]
   0 -> 5 [style=dashed label="empty_b"]
   0 -> 6 [style=dashed label="empty_c"]

-  1 [label="State 1\n  3 start: 'b' .\l"]
-  1 -> "1R3e" [style = solid]
- "1R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  2 [label="State 2\n  5 start: 'c' .\l"]
-  2 -> "2R5e" [style = solid]
- "2R5e" [style = filled, shape = diamond, fillcolor = 3, label = "R5"]
-  3 [label="State 3\n  0 $accept: start . $end\l"]
+  0 -> "0R7" [style=solid]
+ "0R7" [label="R7", fillcolor=3, shape=diamond, style=filled]
+  1 [label="State 1\n\l  3 start: 'b' .\l"]
+  1 -> "1R3" [style=solid]
+ "1R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  2 [label="State 2\n\l  5 start: 'c' .\l"]
+  2 -> "2R5" [style=solid]
+ "2R5" [label="R5", fillcolor=3, shape=diamond, style=filled]
+  3 [label="State 3\n\l  0 $accept: start . $end\l"]

   3 -> 7 [style=solid label="$end"]
   3 -> 7 [style=solid label="$end"]

-  4 [label="State 4\n  2 start: empty_a . 'a'\l"]
+  4 [label="State 4\n\l  2 start: empty_a . 'a'\l"]

   4 -> 8 [style=solid label="'a'"]
   4 -> 8 [style=solid label="'a'"]

-  5 [label="State 5\n  4 start: empty_b . 'b'\l"]
+  5 [label="State 5\n\l  4 start: empty_b . 'b'\l"]

   5 -> 9 [style=solid label="'b'"]
   5 -> 9 [style=solid label="'b'"]

-  6 [label="State 6\n  6 start: empty_c . 'c'\l"]
+  6 [label="State 6\n\l  6 start: empty_c . 'c'\l"]

   6 -> 10 [style=solid label="'c'"]
   6 -> 10 [style=solid label="'c'"]

-  7 [label="State 7\n  0 $accept: start $end .\l"]
-  7 -> "7R0e" [style = solid]
- "7R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
-  8 [label="State 8\n  2 start: empty_a 'a' .\l"]
-  8 -> "8R2e" [style = solid]
- "8R2e" [style = filled, shape = diamond, fillcolor = 3, label = "R2"]
-  9 [label="State 9\n  4 start: empty_b 'b' .\l"]
-  9 -> "9R4e" [style = solid]
- "9R4e" [style = filled, shape = diamond, fillcolor = 3, label = "R4"]
-  10 [label="State 10\n  6 start: empty_c 'c' .\l"]
-  10 -> "10R6e" [style = solid]
- "10R6e" [style = filled, shape = diamond, fillcolor = 3, label = "R6"]
+  7 [label="State 7\n\l  0 $accept: start $end .\l"]
+  7 -> "7R0" [style=solid]
+ "7R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]
+  8 [label="State 8\n\l  2 start: empty_a 'a' .\l"]
+  8 -> "8R2" [style=solid]
+ "8R2" [label="R2", fillcolor=3, shape=diamond, style=filled]
+  9 [label="State 9\n\l  4 start: empty_b 'b' .\l"]
+  9 -> "9R4" [style=solid]
+ "9R4" [label="R4", fillcolor=3, shape=diamond, style=filled]
+  10 [label="State 10\n\l  6 start: empty_c 'c' .\l"]
+  10 -> "10R6" [style=solid]
+ "10R6" [label="R6", fillcolor=3, shape=diamond, style=filled]

 ]])
 
 ## ---------------- ##
 ]])
 
 ## ---------------- ##


@@ -421,25 +466,25 @@ a: ;
 b: ;
 ]],
 [[
 b: ;
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . exp $end\l  1 exp: . a\l  2    | . b\l  3 a: .  [$end]\l  4 b: .  [$end]\l"]
-  0 -> "0R3e" [style = solid]
- "0R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  0 -> "0R4d" [label = "[$end]" style = solid]
- "0R4d" [style = filled, shape = diamond, fillcolor = 5, label = "R4"]
+  0 [label="State 0\n\l  0 $accept: . exp $end\l  1 exp: . a\l  2    | . b\l  3 a: . %empty  [$end]\l  4 b: . %empty  [$end]\l"]

   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]
   0 -> 3 [style=dashed label="b"]
   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]
   0 -> 3 [style=dashed label="b"]

-  1 [label="State 1\n  0 $accept: exp . $end\l"]
+  0 -> "0R3" [style=solid]
+ "0R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  0 -> "0R4d" [label="[$end]", style=solid]
+ "0R4d" [label="R4", fillcolor=5, shape=diamond, style=filled]
+  1 [label="State 1\n\l  0 $accept: exp . $end\l"]

   1 -> 4 [style=solid label="$end"]
   1 -> 4 [style=solid label="$end"]

-  2 [label="State 2\n  1 exp: a .\l"]
-  2 -> "2R1e" [style = solid]
- "2R1e" [style = filled, shape = diamond, fillcolor = 3, label = "R1"]
-  3 [label="State 3\n  2 exp: b .\l"]
-  3 -> "3R2e" [style = solid]
- "3R2e" [style = filled, shape = diamond, fillcolor = 3, label = "R2"]
-  4 [label="State 4\n  0 $accept: exp $end .\l"]
-  4 -> "4R0e" [style = solid]
- "4R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
+  2 [label="State 2\n\l  1 exp: a .\l"]
+  2 -> "2R1" [style=solid]
+ "2R1" [label="R1", fillcolor=3, shape=diamond, style=filled]
+  3 [label="State 3\n\l  2 exp: b .\l"]
+  3 -> "3R2" [style=solid]
+ "3R2" [label="R2", fillcolor=3, shape=diamond, style=filled]
+  4 [label="State 4\n\l  0 $accept: exp $end .\l"]
+  4 -> "4R0" [style=solid]
+ "4R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]

 ]])
 
 ## ---------------------------------------- ##
 ]])
 
 ## ---------------------------------------- ##


@@ -454,51 +499,51 @@ b: ;
 c: ;
 ]],
 [[
 c: ;
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . exp $end\l  1 exp: . a ';'\l  2    | . a ';'\l  3    | . a '.'\l  4    | . b '?'\l  5    | . b '!'\l  6    | . c '?'\l  7    | . c ';'\l  8 a: .  [';', '.']\l  9 b: .  ['?', '!']\l 10 c: .  [';', '?']\l"]
-  0 -> "0R8e" [style = solid]
- "0R8e" [style = filled, shape = diamond, fillcolor = 3, label = "R8"]
-  0 -> "0R9e" [label = "['?', '!']" style = solid]
- "0R9e" [style = filled, shape = diamond, fillcolor = 3, label = "R9"]
-  0 -> "0R10d" [label = "[';', '?']" style = solid]
- "0R10d" [style = filled, shape = diamond, fillcolor = 5, label = "R10"]
+  0 [label="State 0\n\l  0 $accept: . exp $end\l  1 exp: . a ';'\l  2    | . a ';'\l  3    | . a '.'\l  4    | . b '?'\l  5    | . b '!'\l  6    | . c '?'\l  7    | . c ';'\l  8 a: . %empty  [';', '.']\l  9 b: . %empty  ['?', '!']\l 10 c: . %empty  [';', '?']\l"]

   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]
   0 -> 3 [style=dashed label="b"]
   0 -> 4 [style=dashed label="c"]
   0 -> 1 [style=dashed label="exp"]
   0 -> 2 [style=dashed label="a"]
   0 -> 3 [style=dashed label="b"]
   0 -> 4 [style=dashed label="c"]

-  1 [label="State 1\n  0 $accept: exp . $end\l"]
+  0 -> "0R8" [style=solid]
+ "0R8" [label="R8", fillcolor=3, shape=diamond, style=filled]
+  0 -> "0R9" [label="['?', '!']", style=solid]
+ "0R9" [label="R9", fillcolor=3, shape=diamond, style=filled]
+  0 -> "0R10d" [label="[';', '?']", style=solid]
+ "0R10d" [label="R10", fillcolor=5, shape=diamond, style=filled]
+  1 [label="State 1\n\l  0 $accept: exp . $end\l"]

   1 -> 5 [style=solid label="$end"]
   1 -> 5 [style=solid label="$end"]

-  2 [label="State 2\n  1 exp: a . ';'\l  2    | a . ';'\l  3    | a . '.'\l"]
+  2 [label="State 2\n\l  1 exp: a . ';'\l  2    | a . ';'\l  3    | a . '.'\l"]

   2 -> 6 [style=solid label="';'"]
   2 -> 7 [style=solid label="'.'"]
   2 -> 6 [style=solid label="';'"]
   2 -> 7 [style=solid label="'.'"]

-  3 [label="State 3\n  4 exp: b . '?'\l  5    | b . '!'\l"]
+  3 [label="State 3\n\l  4 exp: b . '?'\l  5    | b . '!'\l"]

   3 -> 8 [style=solid label="'?'"]
   3 -> 9 [style=solid label="'!'"]
   3 -> 8 [style=solid label="'?'"]
   3 -> 9 [style=solid label="'!'"]

-  4 [label="State 4\n  6 exp: c . '?'\l  7    | c . ';'\l"]
+  4 [label="State 4\n\l  6 exp: c . '?'\l  7    | c . ';'\l"]

   4 -> 10 [style=solid label="';'"]
   4 -> 11 [style=solid label="'?'"]
   4 -> 10 [style=solid label="';'"]
   4 -> 11 [style=solid label="'?'"]

-  5 [label="State 5\n  0 $accept: exp $end .\l"]
-  5 -> "5R0e" [style = solid]
- "5R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
-  6 [label="State 6\n  1 exp: a ';' .  [$end]\l  2    | a ';' .  [$end]\l"]
-  6 -> "6R1e" [style = solid]
- "6R1e" [style = filled, shape = diamond, fillcolor = 3, label = "R1"]
-  6 -> "6R2d" [label = "[$end]" style = solid]
- "6R2d" [style = filled, shape = diamond, fillcolor = 5, label = "R2"]
-  7 [label="State 7\n  3 exp: a '.' .\l"]
-  7 -> "7R3e" [style = solid]
- "7R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  8 [label="State 8\n  4 exp: b '?' .\l"]
-  8 -> "8R4e" [style = solid]
- "8R4e" [style = filled, shape = diamond, fillcolor = 3, label = "R4"]
-  9 [label="State 9\n  5 exp: b '!' .\l"]
-  9 -> "9R5e" [style = solid]
- "9R5e" [style = filled, shape = diamond, fillcolor = 3, label = "R5"]
-  10 [label="State 10\n  7 exp: c ';' .\l"]
-  10 -> "10R7e" [style = solid]
- "10R7e" [style = filled, shape = diamond, fillcolor = 3, label = "R7"]
-  11 [label="State 11\n  6 exp: c '?' .\l"]
-  11 -> "11R6e" [style = solid]
- "11R6e" [style = filled, shape = diamond, fillcolor = 3, label = "R6"]
+  5 [label="State 5\n\l  0 $accept: exp $end .\l"]
+  5 -> "5R0" [style=solid]
+ "5R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]
+  6 [label="State 6\n\l  1 exp: a ';' .  [$end]\l  2    | a ';' .  [$end]\l"]
+  6 -> "6R1" [style=solid]
+ "6R1" [label="R1", fillcolor=3, shape=diamond, style=filled]
+  6 -> "6R2d" [label="[$end]", style=solid]
+ "6R2d" [label="R2", fillcolor=5, shape=diamond, style=filled]
+  7 [label="State 7\n\l  3 exp: a '.' .\l"]
+  7 -> "7R3" [style=solid]
+ "7R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  8 [label="State 8\n\l  4 exp: b '?' .\l"]
+  8 -> "8R4" [style=solid]
+ "8R4" [label="R4", fillcolor=3, shape=diamond, style=filled]
+  9 [label="State 9\n\l  5 exp: b '!' .\l"]
+  9 -> "9R5" [style=solid]
+ "9R5" [label="R5", fillcolor=3, shape=diamond, style=filled]
+  10 [label="State 10\n\l  7 exp: c ';' .\l"]
+  10 -> "10R7" [style=solid]
+ "10R7" [label="R7", fillcolor=3, shape=diamond, style=filled]
+  11 [label="State 11\n\l  6 exp: c '?' .\l"]
+  11 -> "11R6" [style=solid]
+ "11R6" [label="R6", fillcolor=3, shape=diamond, style=filled]

 ]])
 
 ## ------------------------------------------------------ ##
 ]])
 
 ## ------------------------------------------------------ ##


@@ -514,85 +559,85 @@ opexp: exp '+' exp;
 imm: '0';
 ]],
 [[
 imm: '0';
 ]],
 [[

-  0 [label="State 0\n  0 $accept: . exp $end\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]
+  0 [label="State 0\n\l  0 $accept: . exp $end\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]

   0 -> 1 [style=solid label="\"if\""]
   0 -> 2 [style=solid label="'0'"]
   0 -> 3 [style=dashed label="exp"]
   0 -> 4 [style=dashed label="ifexp"]
   0 -> 5 [style=dashed label="opexp"]
   0 -> 6 [style=dashed label="imm"]
   0 -> 1 [style=solid label="\"if\""]
   0 -> 2 [style=solid label="'0'"]
   0 -> 3 [style=dashed label="exp"]
   0 -> 4 [style=dashed label="ifexp"]
   0 -> 5 [style=dashed label="opexp"]
   0 -> 6 [style=dashed label="imm"]

-  1 [label="State 1\n  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  4      | \"if\" . exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]
+  1 [label="State 1\n\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  4      | \"if\" . exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]

   1 -> 1 [style=solid label="\"if\""]
   1 -> 2 [style=solid label="'0'"]
   1 -> 7 [style=dashed label="exp"]
   1 -> 4 [style=dashed label="ifexp"]
   1 -> 5 [style=dashed label="opexp"]
   1 -> 6 [style=dashed label="imm"]
   1 -> 1 [style=solid label="\"if\""]
   1 -> 2 [style=solid label="'0'"]
   1 -> 7 [style=dashed label="exp"]
   1 -> 4 [style=dashed label="ifexp"]
   1 -> 5 [style=dashed label="opexp"]
   1 -> 6 [style=dashed label="imm"]

-  2 [label="State 2\n  8 imm: '0' .\l"]
-  2 -> "2R8e" [style = solid]
- "2R8e" [style = filled, shape = diamond, fillcolor = 3, label = "R8"]
-  3 [label="State 3\n  0 $accept: exp . $end\l  7 opexp: exp . '+' exp\l"]
+  2 [label="State 2\n\l  8 imm: '0' .\l"]
+  2 -> "2R8" [style=solid]
+ "2R8" [label="R8", fillcolor=3, shape=diamond, style=filled]
+  3 [label="State 3\n\l  0 $accept: exp . $end\l  7 opexp: exp . '+' exp\l"]

   3 -> 8 [style=solid label="$end"]
   3 -> 9 [style=solid label="'+'"]
   3 -> 8 [style=solid label="$end"]
   3 -> 9 [style=solid label="'+'"]

-  4 [label="State 4\n  1 exp: ifexp .\l"]
-  4 -> "4R1e" [style = solid]
- "4R1e" [style = filled, shape = diamond, fillcolor = 3, label = "R1"]
-  5 [label="State 5\n  2 exp: opexp .\l"]
-  5 -> "5R2e" [style = solid]
- "5R2e" [style = filled, shape = diamond, fillcolor = 3, label = "R2"]
-  6 [label="State 6\n  3 exp: imm .\l"]
-  6 -> "6R3e" [style = solid]
- "6R3e" [style = filled, shape = diamond, fillcolor = 3, label = "R3"]
-  7 [label="State 7\n  4 ifexp: \"if\" exp . \"then\" exp elseexp\l  7 opexp: exp . '+' exp\l"]
+  4 [label="State 4\n\l  1 exp: ifexp .\l"]
+  4 -> "4R1" [style=solid]
+ "4R1" [label="R1", fillcolor=3, shape=diamond, style=filled]
+  5 [label="State 5\n\l  2 exp: opexp .\l"]
+  5 -> "5R2" [style=solid]
+ "5R2" [label="R2", fillcolor=3, shape=diamond, style=filled]
+  6 [label="State 6\n\l  3 exp: imm .\l"]
+  6 -> "6R3" [style=solid]
+ "6R3" [label="R3", fillcolor=3, shape=diamond, style=filled]
+  7 [label="State 7\n\l  4 ifexp: \"if\" exp . \"then\" exp elseexp\l  7 opexp: exp . '+' exp\l"]

   7 -> 10 [style=solid label="\"then\""]
   7 -> 9 [style=solid label="'+'"]
   7 -> 10 [style=solid label="\"then\""]
   7 -> 9 [style=solid label="'+'"]

-  8 [label="State 8\n  0 $accept: exp $end .\l"]
-  8 -> "8R0e" [style = solid]
- "8R0e" [style = filled, shape = diamond, fillcolor = 1, label = "Acc"]
-  9 [label="State 9\n  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  7      | exp '+' . exp\l  8 imm: . '0'\l"]
+  8 [label="State 8\n\l  0 $accept: exp $end .\l"]
+  8 -> "8R0" [style=solid]
+ "8R0" [label="Acc", fillcolor=1, shape=diamond, style=filled]
+  9 [label="State 9\n\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  7 opexp: . exp '+' exp\l  7      | exp '+' . exp\l  8 imm: . '0'\l"]

   9 -> 1 [style=solid label="\"if\""]
   9 -> 2 [style=solid label="'0'"]
   9 -> 11 [style=dashed label="exp"]
   9 -> 4 [style=dashed label="ifexp"]
   9 -> 5 [style=dashed label="opexp"]
   9 -> 6 [style=dashed label="imm"]
   9 -> 1 [style=solid label="\"if\""]
   9 -> 2 [style=solid label="'0'"]
   9 -> 11 [style=dashed label="exp"]
   9 -> 4 [style=dashed label="ifexp"]
   9 -> 5 [style=dashed label="opexp"]
   9 -> 6 [style=dashed label="imm"]

-  10 [label="State 10\n  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  4      | \"if\" exp \"then\" . exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]
+  10 [label="State 10\n\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  4      | \"if\" exp \"then\" . exp elseexp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]

   10 -> 1 [style=solid label="\"if\""]
   10 -> 2 [style=solid label="'0'"]
   10 -> 12 [style=dashed label="exp"]
   10 -> 4 [style=dashed label="ifexp"]
   10 -> 5 [style=dashed label="opexp"]
   10 -> 6 [style=dashed label="imm"]
   10 -> 1 [style=solid label="\"if\""]
   10 -> 2 [style=solid label="'0'"]
   10 -> 12 [style=dashed label="exp"]
   10 -> 4 [style=dashed label="ifexp"]
   10 -> 5 [style=dashed label="opexp"]
   10 -> 6 [style=dashed label="imm"]

-  11 [label="State 11\n  7 opexp: exp . '+' exp\l  7      | exp '+' exp .  [$end, \"then\", \"else\", '+']\l"]
-  11 -> "11R7e" [style = solid]
- "11R7e" [style = filled, shape = diamond, fillcolor = 3, label = "R7"]
-  11 -> "11R7d" [label = "['+']" style = solid]
- "11R7d" [style = filled, shape = diamond, fillcolor = 5, label = "R7"]
+  11 [label="State 11\n\l  7 opexp: exp . '+' exp\l  7      | exp '+' exp .  [$end, \"then\", \"else\", '+']\l"]

   11 -> 9 [style=solid label="'+'"]
   11 -> 9 [style=solid label="'+'"]

-  12 [label="State 12\n  4 ifexp: \"if\" exp \"then\" exp . elseexp\l  5 elseexp: . \"else\" exp\l  6        | .  [$end, \"then\", \"else\", '+']\l  7 opexp: exp . '+' exp\l"]
-  12 -> "12R6e" [style = solid]
- "12R6e" [style = filled, shape = diamond, fillcolor = 3, label = "R6"]
-  12 -> "12R6d" [label = "[\"else\", '+']" style = solid]
- "12R6d" [style = filled, shape = diamond, fillcolor = 5, label = "R6"]
+  11 -> "11R7d" [label="['+']", style=solid]
+ "11R7d" [label="R7", fillcolor=5, shape=diamond, style=filled]
+  11 -> "11R7" [style=solid]
+ "11R7" [label="R7", fillcolor=3, shape=diamond, style=filled]
+  12 [label="State 12\n\l  4 ifexp: \"if\" exp \"then\" exp . elseexp\l  5 elseexp: . \"else\" exp\l  6        | . %empty  [$end, \"then\", \"else\", '+']\l  7 opexp: exp . '+' exp\l"]

   12 -> 13 [style=solid label="\"else\""]
   12 -> 9 [style=solid label="'+'"]
   12 -> 14 [style=dashed label="elseexp"]
   12 -> 13 [style=solid label="\"else\""]
   12 -> 9 [style=solid label="'+'"]
   12 -> 14 [style=dashed label="elseexp"]

-  13 [label="State 13\n  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  5 elseexp: \"else\" . exp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]
+  12 -> "12R6d" [label="[\"else\", '+']", style=solid]
+ "12R6d" [label="R6", fillcolor=5, shape=diamond, style=filled]
+  12 -> "12R6" [style=solid]
+ "12R6" [label="R6", fillcolor=3, shape=diamond, style=filled]
+  13 [label="State 13\n\l  1 exp: . ifexp\l  2    | . opexp\l  3    | . imm\l  4 ifexp: . \"if\" exp \"then\" exp elseexp\l  5 elseexp: \"else\" . exp\l  7 opexp: . exp '+' exp\l  8 imm: . '0'\l"]

   13 -> 1 [style=solid label="\"if\""]
   13 -> 2 [style=solid label="'0'"]
   13 -> 15 [style=dashed label="exp"]
   13 -> 4 [style=dashed label="ifexp"]
   13 -> 5 [style=dashed label="opexp"]
   13 -> 6 [style=dashed label="imm"]
   13 -> 1 [style=solid label="\"if\""]
   13 -> 2 [style=solid label="'0'"]
   13 -> 15 [style=dashed label="exp"]
   13 -> 4 [style=dashed label="ifexp"]
   13 -> 5 [style=dashed label="opexp"]
   13 -> 6 [style=dashed label="imm"]

-  14 [label="State 14\n  4 ifexp: \"if\" exp \"then\" exp elseexp .\l"]
-  14 -> "14R4e" [style = solid]
- "14R4e" [style = filled, shape = diamond, fillcolor = 3, label = "R4"]
-  15 [label="State 15\n  5 elseexp: \"else\" exp .  [$end, \"then\", \"else\", '+']\l  7 opexp: exp . '+' exp\l"]
-  15 -> "15R5e" [style = solid]
- "15R5e" [style = filled, shape = diamond, fillcolor = 3, label = "R5"]
-  15 -> "15R5d" [label = "['+']" style = solid]
- "15R5d" [style = filled, shape = diamond, fillcolor = 5, label = "R5"]
+  14 [label="State 14\n\l  4 ifexp: \"if\" exp \"then\" exp elseexp .\l"]
+  14 -> "14R4" [style=solid]
+ "14R4" [label="R4", fillcolor=3, shape=diamond, style=filled]
+  15 [label="State 15\n\l  5 elseexp: \"else\" exp .  [$end, \"then\", \"else\", '+']\l  7 opexp: exp . '+' exp\l"]

   15 -> 9 [style=solid label="'+'"]
   15 -> 9 [style=solid label="'+'"]

+  15 -> "15R5d" [label="['+']", style=solid]
+ "15R5d" [label="R5", fillcolor=5, shape=diamond, style=filled]
+  15 -> "15R5" [style=solid]
+ "15R5" [label="R5", fillcolor=3, shape=diamond, style=filled]

 ]])
 
 m4_popdef([AT_TEST])
 ]])
 
 m4_popdef([AT_TEST])