From bdb1c76b7f51e3c376f87982e061626366ad7add Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Wed, 10 Jun 2009 18:25:50 +0000 Subject: [PATCH] Small change to allow embedded equations --- wesley/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wesley/main.cpp b/wesley/main.cpp index 63afa05..0d28c6a 100644 --- a/wesley/main.cpp +++ b/wesley/main.cpp @@ -232,7 +232,7 @@ Rule build_parser_rules() { negate = Ign(Str("-")) >> boolean; prefix = (Str("++") >> (boolean | arraycall)) | (Str("--") >> (boolean | arraycall)); arraycall = value >> +((Ign(Id(TokenType::Square_Open)) >> boolean >> Ign(Id(TokenType::Square_Close)))); - value = vardecl | arrayinit | block | (Ign(Id(TokenType::Parens_Open)) >> boolean >> Ign(Id(TokenType::Parens_Close))) | return_statement | break_statement | + value = vardecl | arrayinit | block | (Ign(Id(TokenType::Parens_Open)) >> equation >> Ign(Id(TokenType::Parens_Close))) | return_statement | break_statement | funcall | Id(TokenType::Identifier) | Id(TokenType::Real_Number) | Id(TokenType::Integer) | Id(TokenType::Quoted_String) | Id(TokenType::Single_Quoted_String) ; arrayinit = Ign(Id(TokenType::Square_Open)) >> ~(boolean >> *(Ign(Str(",")) >> boolean)) >> Ign(Id(TokenType::Square_Close));