From a8fb111275b7e8ad1829be30ba29f2172f1e1654 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 5 Jun 2009 12:08:36 +0000 Subject: [PATCH] Fixed or boolean. Let if block return value (that makes sense), but keep while void. --- wesley/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wesley/main.cpp b/wesley/main.cpp index f3d832c..1fc28e1 100644 --- a/wesley/main.cpp +++ b/wesley/main.cpp @@ -263,7 +263,6 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) { } } } - retval = Boxed_Value(); } break; case(TokenType::While_Block) : { @@ -399,7 +398,7 @@ Lexer build_lexer() { lexer << Pattern("[A-Za-z_]+", TokenType::Identifier); lexer << Pattern("[0-9]+(\\.[0-9]+)?", TokenType::Number); - lexer << Pattern("[!@#$%^&*\\-+=<>.]+|/[!@#$%^&\\-+=<>]*", TokenType::Operator); + lexer << Pattern("[!@#$%^&*|\\-+=<>.]+|/[!@#$%^&|\\-+=<>]*", TokenType::Operator); lexer << Pattern("\\(", TokenType::Parens_Open); lexer << Pattern("\\)", TokenType::Parens_Close); lexer << Pattern("\\[", TokenType::Square_Open);