From 42b489196937b2077b32752c3536e0c464dc3e3e Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 5 Jun 2009 12:27:20 +0000 Subject: [PATCH] Fix blocks so they may optionally span lines --- wesley/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wesley/main.cpp b/wesley/main.cpp index 5066ccc..593f220 100644 --- a/wesley/main.cpp +++ b/wesley/main.cpp @@ -391,7 +391,7 @@ Rule build_parser_rules() { fundef = Ign(Str("def")) >> Id(TokenType::Identifier) >> ~(Ign(Id(TokenType::Parens_Open)) >> ~params >> Ign(Id(TokenType::Parens_Close))) >> block >> ~Ign(Id(TokenType::Semicolon)); params = Id(TokenType::Identifier) >> *(Ign(Str(",")) >> Id(TokenType::Identifier)); - block = Ign(Id(TokenType::Curly_Open)) >> ~statements >> Ign(Id(TokenType::Curly_Close)); + block = *(Ign(Id(TokenType::Semicolon))) >> Ign(Id(TokenType::Curly_Open)) >> *(Ign(Id(TokenType::Semicolon))) >> ~statements >> Ign(Id(TokenType::Curly_Close)); equation = *(Id(TokenType::Identifier) >> Ign(Str("="))) >> boolean; boolean = comparison >> *((Str("&&") >> comparison) | (Str("||") >> comparison)); comparison = expression >> *((Str("==") >> expression) | (Str("!=") >> expression) | (Str("<") >> expression) |