diff options
Diffstat (limited to 'Stars45/Parser.cpp')
| -rw-r--r-- | Stars45/Parser.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Stars45/Parser.cpp b/Stars45/Parser.cpp index e65059e..cb96f3e 100644 --- a/Stars45/Parser.cpp +++ b/Stars45/Parser.cpp @@ -85,9 +85,9 @@ Parser::ParseTerm() { Term* t = ParseTermBase(); if (t == 0) return t; - + Term* t2 = ParseTermRest(t); - + return t2; } @@ -95,7 +95,7 @@ Term* Parser::ParseTermRest(Term* base) { Token t = lexer->Get(); - + switch (t.type()) { default: lexer->PutBack(); @@ -129,7 +129,7 @@ Parser::ParseTermRest(Term* base) } break; } - + return base; } @@ -160,7 +160,7 @@ Parser::ParseTermBase() Token t = lexer->Get(); int n = 0; double d = 0.0; - + switch (t.type()) { case Token::IntLiteral: { if (dump_tokens) @@ -171,7 +171,7 @@ Parser::ParseTermBase() if (t.symbol()[i] != '_') *p++ = t.symbol()[i]; *p++ = '\0'; - + // handle hex notation: if (nstr[1] == 'x') n = xtol(nstr+2); @@ -191,7 +191,7 @@ Parser::ParseTermBase() if (t.symbol()[i] != '_') *p++ = t.symbol()[i]; *p++ = '\0'; - + d = atof(nstr); return new(__FILE__, __LINE__) TermNumber(d); } @@ -215,7 +215,7 @@ Parser::ParseTermBase() switch (t.key()) { case KEY_FALSE: return new(__FILE__, __LINE__) TermBool(0); case KEY_TRUE: return new(__FILE__, __LINE__) TermBool(1); - + case KEY_MINUS: { Token next = lexer->Get(); if (next.type() == Token::IntLiteral) { @@ -227,7 +227,7 @@ Parser::ParseTermBase() if (next.symbol()[i] != '_') *p++ = next.symbol()[i]; *p++ = '\0'; - + n = -1 * atol(nstr); return new(__FILE__, __LINE__) TermNumber(n); } @@ -240,7 +240,7 @@ Parser::ParseTermBase() if (next.symbol()[i] != '_') *p++ = next.symbol()[i]; *p++ = '\0'; - + d = -1.0 * atof(nstr); return new(__FILE__, __LINE__) TermNumber(d); } @@ -250,7 +250,7 @@ Parser::ParseTermBase() } } break; - + default: lexer->PutBack(); return 0; @@ -297,7 +297,7 @@ TermList* Parser::ParseTermList(int for_struct) { TermList* tlist = new(__FILE__, __LINE__) TermList; - + Term* term = ParseTerm(); while (term) { if (for_struct && !term->isDef()) { @@ -326,7 +326,7 @@ Parser::ParseTermList(int for_struct) term = ParseTerm(); } - + return tlist; } |