[Boost-commit] svn:boost r78178 - in branches/release/libs/spirit: . example example/qi/compiler_tutorial/conjure1 example/qi/compiler_tutorial/mini_c

Subject: [Boost-commit] svn:boost r78178 - in branches/release/libs/spirit: . example example/qi/compiler_tutorial/conjure1 example/qi/compiler_tutorial/mini_c
From: joel_at_[hidden]
Date: 2012-04-23 22:06:02

Author: djowel
Date: 2012-04-23 22:06:01 EDT (Mon, 23 Apr 2012)
New Revision: 78178
URL: http://svn.boost.org/trac/boost/changeset/78178

Log:
Merge from trunk
Properties modified: 
   branches/release/libs/spirit/   (props changed)
   branches/release/libs/spirit/example/   (props changed)
Text files modified: 
   branches/release/libs/spirit/example/qi/compiler_tutorial/conjure1/expression_def.hpp |     2 +-                                      
   branches/release/libs/spirit/example/qi/compiler_tutorial/mini_c/expression_def.hpp   |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/release/libs/spirit/example/qi/compiler_tutorial/conjure1/expression_def.hpp
==============================================================================
--- branches/release/libs/spirit/example/qi/compiler_tutorial/conjure1/expression_def.hpp	(original)
+++ branches/release/libs/spirit/example/qi/compiler_tutorial/conjure1/expression_def.hpp	2012-04-23 22:06:01 EDT (Mon, 23 Apr 2012)
@@ -100,7 +100,7 @@
         argument_list = -(expr % ',');
 
         identifier =
-                !keywords
+                !lexeme[keywords >> !(alnum | '_')]
             >>  raw[lexeme[(alpha | '_') >> *(alnum | '_')]]
             ;
 

Modified: branches/release/libs/spirit/example/qi/compiler_tutorial/mini_c/expression_def.hpp
==============================================================================
--- branches/release/libs/spirit/example/qi/compiler_tutorial/mini_c/expression_def.hpp	(original)
+++ branches/release/libs/spirit/example/qi/compiler_tutorial/mini_c/expression_def.hpp	2012-04-23 22:06:01 EDT (Mon, 23 Apr 2012)
@@ -144,7 +144,7 @@
         argument_list = -(expr % ',');
 
         identifier =
-                !keywords
+                !lexeme[keywords >> !(alnum | '_')]
             >>  raw[lexeme[(alpha | '_') >> *(alnum | '_')]]
             ;