Subject: [Boost-commit] svn:boost r73568 - in trunk/libs/spirit/example/qi/compiler_tutorial: conjure3 conjure_samples
From: joel_at_[hidden]
Date: 2011-08-06 05:18:00
Author: djowel
Date: 2011-08-06 05:17:59 EDT (Sat, 06 Aug 2011)
New Revision: 73568
URL: http://svn.boost.org/trac/boost/changeset/73568
Log:
misc updates
Text files modified:
trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/ast.hpp | 1 +
trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp | 5 +++--
trunk/libs/spirit/example/qi/compiler_tutorial/conjure_samples/operators.cnj | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/ast.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/ast.hpp (original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/ast.hpp 2011-08-06 05:17:59 EDT (Sat, 06 Aug 2011)
@@ -116,6 +116,7 @@
, boost::recursive_wrapper<while_statement>
, boost::recursive_wrapper<return_statement>
, boost::recursive_wrapper<statement_list>
+ , boost::recursive_wrapper<expression>
>
statement;
Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp (original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp 2011-08-06 05:17:59 EDT (Sat, 06 Aug 2011)
@@ -41,13 +41,14 @@
;
statement_ =
- ';'
- | variable_declaration
+ variable_declaration
| assignment
| compound_statement
| if_statement
| while_statement
| return_statement
+ | expr
+ | ';'
;
variable_declaration =
Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure_samples/operators.cnj
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure_samples/operators.cnj (original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure_samples/operators.cnj 2011-08-06 05:17:59 EDT (Sat, 06 Aug 2011)
@@ -129,6 +129,6 @@
int main()
{
- return (assign() ^ binary()) + unary(); // -1
+ return (assign() ^ binary()) + unary(); // 1
}