comparison: src/Lexer.cc
src/Lexer.cc
- changeset 108
- 6409ece8297c
- parent 105
- 6dbac3305614
- child 110
- 7a7a53f1d51b
equal
deleted
inserted
replaced
| 107:55c2bcd8ed5c | 108:6409ece8297c |
|---|---|
| 127 if (!okA || !okB || !okC) | 127 if (!okA || !okB || !okC) |
| 128 return false; | 128 return false; |
| 129 | 129 |
| 130 if (VERSION_NUMBER < MAKE_VERSION_NUMBER (major, minor, patch)) | 130 if (VERSION_NUMBER < MAKE_VERSION_NUMBER (major, minor, patch)) |
| 131 Error ("The script file requires " APPNAME " v%1, this is v%2", | 131 Error ("The script file requires " APPNAME " v%1, this is v%2", |
| 132 MakeVersionString (major, minor, patch), GetVersionString (EShortForm)); | 132 MakeVersionString (major, minor, patch), GetVersionString (false)); |
| 133 | 133 |
| 134 return true; | 134 return true; |
| 135 } | 135 } |
| 136 | 136 |
| 137 // ============================================================================ | 137 // ============================================================================ |
| 222 Error ("expected %1, got %2", toknames, DescribeToken (GetToken())); | 222 Error ("expected %1, got %2", toknames, DescribeToken (GetToken())); |
| 223 } | 223 } |
| 224 | 224 |
| 225 // ============================================================================= | 225 // ============================================================================= |
| 226 // | 226 // |
| 227 int Lexer::GetOneSymbol (const StringList& syms) | 227 int Lexer::GEXPRSYM_tOne (const StringList& syms) |
| 228 { | 228 { |
| 229 if (!GetNext()) | 229 if (!GetNext()) |
| 230 Error ("unexpected EOF"); | 230 Error ("unexpected EOF"); |
| 231 | 231 |
| 232 if (GetTokenType() == tkSymbol) | 232 if (GetTokenType() == tkSymbol) |
