From c05ec36dd0d441b3da820e31b331f7364d5ca6f7 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Sun, 30 Sep 2012 22:21:32 +0200
Subject: [PATCH] * src/neverparse/neverclaimparse.yy: Prefer accepting labels
 in aliases.

---
 src/neverparse/neverclaimparse.yy | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/neverparse/neverclaimparse.yy b/src/neverparse/neverclaimparse.yy
index acc8a6b95..2308188ef 100644
--- a/src/neverparse/neverclaimparse.yy
+++ b/src/neverparse/neverclaimparse.yy
@@ -114,8 +114,17 @@ ident_list:
   | ident_list IDENT ':'
     {
       result->add_state_alias(*$2, *$1);
-      delete $1;
-      $$ = $2;
+      // Keep any identifier that start with accept.
+      if (strncmp("accept", $1->c_str(), 6))
+        {
+          delete $1;
+          $$ = $2;
+        }
+      else
+        {
+	  delete $2;
+	  $$ = $1;
+        }
     }
 
 state:
@@ -137,7 +146,7 @@ state:
       for (it = $3->begin(); it != $3->end(); ++it)
       {
 	spot::state_explicit_string::transition* t =
-	  result->create_transition(*$1,*it->second);
+	  result->create_transition(*$1, *it->second);
 
 	result->add_condition(t, it->first);
 	if (acc)