From f54446bd6af40b0050321ebb165e758242322e42 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 29 Sep 2010 20:16:33 +0000 Subject: [PATCH] fixed Ngon using an expression for n_sides and implementing getInteger() git-svn-id: svn://anubis/fart/branches/scene-file-scripting@322 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- parser/nodes.h | 1 + parser/parser.yy | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/parser/nodes.h b/parser/nodes.h index fe3b634..cae46da 100644 --- a/parser/nodes.h +++ b/parser/nodes.h @@ -236,6 +236,7 @@ class NGonNode : public NumberNode { public: NGonNode(refptr e) : NumberNode(e) {} + int getInteger() { return getNumber(); } }; class OffsetNode : public NumberNode diff --git a/parser/parser.yy b/parser/parser.yy index 657ff98..f029932 100644 --- a/parser/parser.yy +++ b/parser/parser.yy @@ -314,7 +314,7 @@ number: DEC_NUMBER { $$ = $1; } | REAL_NUMBER { $$ = $1; } ; -ngon: NGON DEC_NUMBER COMMA expression { +ngon: NGON expression COMMA expression { $$ = new NGonNode($2); $$->addChild(new RadiusNode($4)); }