From 35d6e536aee56f4bd8ed9256d4996f0118905882 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 29 Sep 2010 20:55:02 +0000 Subject: [PATCH] removed optional negative sign preceding number literals in lexer since it was interfering with minus operator with no whitespace git-svn-id: svn://anubis/fart/branches/scene-file-scripting@324 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- parser/nodes.h | 1 + parser/parser.lex | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parser/nodes.h b/parser/nodes.h index 978bfd0..6b55bf2 100644 --- a/parser/nodes.h +++ b/parser/nodes.h @@ -105,6 +105,7 @@ class VectorNode : public Node bool m_direct; }; + class AmbientNode : public VectorNode { public: diff --git a/parser/parser.lex b/parser/parser.lex index 79cc0c7..d1a3707 100644 --- a/parser/parser.lex +++ b/parser/parser.lex @@ -36,8 +36,8 @@ \< return LESS; \> return GREATER; --?[0-9]+ *yylval = new IntegerNode(atoi(yytext)); return DEC_NUMBER; --?[0-9]*\.[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; +[0-9]+ *yylval = new IntegerNode(atoi(yytext)); return DEC_NUMBER; +[0-9]*\.[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; ambient return AMBIENT; ambient_occlusion return AMBIENT_OCCLUSION;