From 89296e39625eb8675ff9067f958d79fdd5dbccb5 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Sat, 26 Dec 2020 17:38:47 +0100
Subject: [PATCH] glr2.cc: example: simplify

* examples/c++/glr/c++-types.yy: Formatting changes.
Remove unused support for '@'.
* examples/c/glr/c++-types.y: Ditto.
---
 examples/c++/glr/c++-types.yy | 12 +++++-------
 examples/c/glr/c++-types.y    |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/examples/c++/glr/c++-types.yy b/examples/c++/glr/c++-types.yy
index ce6ae4f1..20020723 100644
--- a/examples/c++/glr/c++-types.yy
+++ b/examples/c++/glr/c++-types.yy
@@ -68,17 +68,15 @@ prog : %empty
      | prog stmt   { std::cout << @2 << ": " << $2 << '\n'; }
      ;
 
-stmt : expr ';'  %merge <stmtMerge>     { $$ = $1; }
+stmt : expr ';'  %merge <stmtMerge>   { $$ = $1; }
      | decl      %merge <stmtMerge>
-     | error ';'        { $$ = Nterm ("<error>"); }
-     | '@'              { $$ = $1; YYACCEPT; }
+     | error ';'                      { $$ = Nterm ("<error>"); }
      ;
 
 expr : ID
-     | TYPENAME '(' expr ')'
-                        { $$ = Nterm ("<cast>", $3, $1); }
-     | expr '+' expr    { $$ = Nterm ("+", $1, $3); }
-     | expr '=' expr    { $$ = Nterm ("=", $1, $3); }
+     | TYPENAME '(' expr ')'  { $$ = Nterm ("<cast>", $3, $1); }
+     | expr '+' expr          { $$ = Nterm ("+", $1, $3); }
+     | expr '=' expr          { $$ = Nterm ("=", $1, $3); }
      ;
 
 decl : TYPENAME declarator ';'
diff --git a/examples/c/glr/c++-types.y b/examples/c/glr/c++-types.y
index 33d1abc6..33bf58a6 100644
--- a/examples/c/glr/c++-types.y
+++ b/examples/c/glr/c++-types.y
@@ -84,7 +84,6 @@ prog : %empty
 stmt : expr ';'  %merge <stmtMerge>     { $$ = $1; }
      | decl      %merge <stmtMerge>
      | error ';'        { $$ = new_nterm ("<error>", NULL, NULL, NULL); }
-     | '@'              { $$ = $1; YYACCEPT; }
      ;
 
 expr : ID