From: Bernd Schmidt <bernds@codesourcery.com>
Date: Fri, 27 Aug 2010 22:08:37 +0000 (+0000)
Subject: genautomata.c (gen_regexp_repeat, [...]): Use the string found in vector element... 
X-Git-Tag: releases/gcc-4.6.0~4808
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cb371a2fbe5bd89cb59db557a394e836fa1963;p=thirdparty%2Fgcc.git

genautomata.c (gen_regexp_repeat, [...]): Use the string found in vector element 0 rather than the original string when...

	* genautomata.c (gen_regexp_repeat, gen_regexp_allof,
	gen_regexp_oneof, gen_regexp_sequence): Use the string found
	in vector element 0 rather than the original string when there's
	only one element.
	(gen_regexp): Remove extra semicolon.

From-SVN: r163600
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2410225ccb6..a83c84d95c8f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-28  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* genautomata.c (gen_regexp_repeat, gen_regexp_allof,
+	gen_regexp_oneof, gen_regexp_sequence): Use the string found
+	in vector element 0 rather than the original string when there's
+	only one element.
+	(gen_regexp): Remove extra semicolon.
+
 2010-08-23  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	* config/rs6000/rs6000-protos.h (rs6000_address_for_fpconvert):
diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index 88d358cb86f4..ff024b64ff82 100644
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -1603,7 +1603,7 @@ gen_regexp_repeat (const char *str)
       return regexp;
     }
   else
-    return gen_regexp_el (str);
+    return gen_regexp_el (repeat_vect[0]);
 }
 
 /* Parse reservation STR which possibly contains separator '+'.  */
@@ -1629,7 +1629,7 @@ gen_regexp_allof (const char *str)
       return allof;
     }
   else
-    return gen_regexp_repeat (str);
+    return gen_regexp_repeat (allof_vect[0]);
 }
 
 /* Parse reservation STR which possibly contains separator '|'.  */
@@ -1655,7 +1655,7 @@ gen_regexp_oneof (const char *str)
       return oneof;
     }
   else
-    return gen_regexp_allof (str);
+    return gen_regexp_allof (oneof_vect[0]);
 }
 
 /* Parse reservation STR which possibly contains separator ','.  */
@@ -1680,7 +1680,7 @@ gen_regexp_sequence (const char *str)
       return sequence;
     }
   else
-    return gen_regexp_oneof (str);
+    return gen_regexp_oneof (sequence_vect[0]);
 }
 
 /* Parse construction reservation STR.  */
@@ -1688,7 +1688,7 @@ static regexp_t
 gen_regexp (const char *str)
 {
   reserv_str = str;
-  return gen_regexp_sequence (str);;
+  return gen_regexp_sequence (str);
 }
 
 /* Process a DEFINE_RESERVATION.