josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed DEC_NUMBER from generating a NumberNode to an IntegerNode in parser.lex

Browse Source 
git-svn-id: svn://anubis/fart/trunk@122 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-17 14:15:34 +00:00
parent 4b0f506522
commit a8e898e445
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
parser/nodes.h
View File

@ -38,6 +38,7 @@ class IntegerNode : public Node
public: public:
IntegerNode(int number) { m_number = number; } IntegerNode(int number) { m_number = number; }
int getInteger() { return m_number; } int getInteger() { return m_number; }
double getNumber() { return m_number; }
protected: protected:
int m_number; int m_number;

2
parser/parser.lex
View File

@ -35,7 +35,7 @@
\< return LESS; \< return LESS;
\> return GREATER; \> return GREATER;
-?[0-9]+ yylval = new NumberNode(atoi(yytext)); return DEC_NUMBER; -?[0-9]+ yylval = new IntegerNode(atoi(yytext)); return DEC_NUMBER;
-?[0-9]*\.[0-9]+ yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; -?[0-9]*\.[0-9]+ yylval = new NumberNode(atof(yytext)); return REAL_NUMBER;
ambient return AMBIENT; ambient return AMBIENT;

6
parser/parser.yy
View File

@ -236,13 +236,13 @@ options_items: /* empty */
; ;
options_item: WIDTH DEC_NUMBER { options_item: WIDTH DEC_NUMBER {
$$ = new WidthNode($2->getNumber()); $$ = new WidthNode($2->getInteger());
} }
| HEIGHT DEC_NUMBER { | HEIGHT DEC_NUMBER {
$$ = new HeightNode($2->getNumber()); $$ = new HeightNode($2->getInteger());
} }
| MULTISAMPLE DEC_NUMBER { | MULTISAMPLE DEC_NUMBER {
$$ = new MultisampleNode($2->getNumber()); $$ = new MultisampleNode($2->getInteger());
} }
; ;