Added a catch-rule for invalid numbers.

src/compiler/preprocessor/new/Token.h

@@ -17,6 +17,13 @@ struct Token
 {
     enum Type
     {
+        // Token IDs for error conditions are negative.
+        INVALID_CHARACTER = -1,
+        INVALID_NUMBER = -2,
+
+        // Indicates EOF.
+        LAST = 0,
+
         IDENTIFIER = 258,
 
         CONST_INT,

src/compiler/preprocessor/new/pp.l

@@ -77,6 +77,13 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
     return pp::Token::CONST_FLOAT;
 }
 
+    /* Anything that starts with a {DIGIT} or .{DIGIT} must be a number. */
+    /* Rule to catch all invalid integers and floats. */
+({DIGIT}+[_a-zA-Z0-9.]*)|("."{DIGIT}+[_a-zA-Z0-9.]*) {
+    yylval->assign(yytext, yyleng);
+    return pp::Token::INVALID_NUMBER;
+}
+
 "++"  { return pp::Token::OP_INC; }
 "--"  { return pp::Token::OP_DEC; }
 "<<"  { return pp::Token::OP_LEFT; }
@@ -103,6 +110,11 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
 [ \t\v\f]+   { return ' '; }
 \n           { return yytext[0]; }
 
+. {
+    yylval->push_back(yytext[0]);
+    return pp::Token::INVALID_CHARACTER;
+}
+
 <*><<EOF>>   { yyterminate(); }
 
 %%

tests/preprocessor_tests/number_test.cpp

@@ -8,6 +8,33 @@
 #include "Preprocessor.h"
 #include "Token.h"
 
+#if GTEST_HAS_PARAM_TEST
+
+class InvalidNumberTest : public testing::TestWithParam<const char*>
+{
+};
+
+TEST_P(InvalidNumberTest, InvalidNumberIdentified)
+{
+    const char* str = GetParam();
+
+    pp::Token token;
+    pp::Preprocessor preprocessor;
+    ASSERT_TRUE(preprocessor.init(1, &str, 0));
+    EXPECT_EQ(pp::Token::INVALID_NUMBER, preprocessor.lex(&token));
+    EXPECT_EQ(pp::Token::INVALID_NUMBER, token.type);
+    EXPECT_STREQ(str, token.value.c_str());
+}
+
+INSTANTIATE_TEST_CASE_P(InvalidIntegers, InvalidNumberTest,
+                        testing::Values("1a", "08", "0xG"));
+
+
+INSTANTIATE_TEST_CASE_P(InvalidFloats, InvalidNumberTest,
+                        testing::Values("1eg", "0.a", "0.1.2", ".0a", ".0.1"));
+
+#endif  // GTEST_HAS_PARAM_TEST
+
 #if GTEST_HAS_COMBINE
 
 typedef std::tr1::tuple<const char*, char> IntegerParams;