tint: Lex abstract integers

Check that the parsed number fits in an abstract-integer.

Refactor the unit tests so that they're maintainable. Add missing tests.

Bug: tint:1504
Change-Id: I04b6604820d527da66e3f6fcb47391efc0c3330a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/91701
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>

src/tint/reader/wgsl/lexer.cc

@@ -678,10 +678,19 @@ Token Lexer::try_hex_float() {
 }
 
 Token Lexer::build_token_from_int_if_possible(Source source, size_t start, int32_t base) {
-    int64_t res = strtoll(&at(start), nullptr, base);
+    const char* start_ptr = &at(start);
+    char* end_ptr = nullptr;
+
+    errno = 0;
+    int64_t res = strtoll(start_ptr, &end_ptr, base);
+    const bool overflow = errno == ERANGE;
+
+    if (end_ptr) {
+        advance(end_ptr - start_ptr);
+    }
 
     if (matches(pos(), "u")) {
-        if (CheckedConvert<u32>(AInt(res))) {
+        if (!overflow && CheckedConvert<u32>(AInt(res))) {
             advance(1);
             end_source(source);
             return {Token::Type::kIntLiteral_U, source, res};
@@ -690,7 +699,7 @@ Token Lexer::build_token_from_int_if_possible(Source source, size_t start, int32
     }
 
     if (matches(pos(), "i")) {
-        if (CheckedConvert<i32>(AInt(res))) {
+        if (!overflow && CheckedConvert<i32>(AInt(res))) {
             advance(1);
             end_source(source);
             return {Token::Type::kIntLiteral_I, source, res};
@@ -698,94 +707,59 @@ Token Lexer::build_token_from_int_if_possible(Source source, size_t start, int32
         return {Token::Type::kError, source, "value cannot be represented as 'i32'"};
     }
 
-    // TODO(crbug.com/tint/1504): Properly support abstract int:
+    end_source(source);
-    // Change `AbstractIntType` to `int64_t`, update errors to say 'abstract int'.
+    if (overflow) {
-    using AbstractIntType = i32;
+        return {Token::Type::kError, source, "value cannot be represented as 'abstract-int'"};
-    if (CheckedConvert<AbstractIntType>(AInt(res))) {
-        end_source(source);
-        return {Token::Type::kIntLiteral, source, res};
     }
-    return {Token::Type::kError, source, "value cannot be represented as 'i32'"};
+    return {Token::Type::kIntLiteral, source, res};
 }
 
 Token Lexer::try_hex_integer() {
-    constexpr size_t kMaxDigits = 8;  // Valid for both 32-bit integer types
     auto start = pos();
-    auto end = pos();
+    auto curr = start;
 
     auto source = begin_source();
 
-    if (matches(end, "-")) {
+    if (matches(curr, "-")) {
-        end++;
+        curr++;
     }
 
-    if (matches(end, "0x") || matches(end, "0X")) {
+    if (matches(curr, "0x") || matches(curr, "0X")) {
-        end += 2;
+        curr += 2;
     } else {
         return {};
     }
 
-    auto first = end;
+    if (!is_hex(at(curr))) {
-    while (!is_eol() && is_hex(at(end))) {
-        end++;
-
-        auto digits = end - first;
-        if (digits > kMaxDigits) {
-            return {Token::Type::kError, source,
-                    "integer literal (" + std::string{substr(start, end - 1 - start)} +
-                        "...) has too many digits"};
-        }
-    }
-    if (first == end) {
         return {Token::Type::kError, source,
                 "integer or float hex literal has no significant digits"};
     }
 
-    advance(end - start);
-
     return build_token_from_int_if_possible(source, start, 16);
 }
 
 Token Lexer::try_integer() {
-    constexpr size_t kMaxDigits = 10;  // Valid for both 32-bit integer types
     auto start = pos();
-    auto end = start;
+    auto curr = start;
 
     auto source = begin_source();
 
-    if (matches(end, "-")) {
+    if (matches(curr, "-")) {
-        end++;
+        curr++;
     }
 
-    if (end >= length() || !is_digit(at(end))) {
+    if (curr >= length() || !is_digit(at(curr))) {
         return {};
     }
 
-    auto first = end;
     // If the first digit is a zero this must only be zero as leading zeros
     // are not allowed.
-    auto next = first + 1;
+    if (auto next = curr + 1; next < length()) {
-    if (next < length()) {
+        if (at(curr) == '0' && is_digit(at(next))) {
-        if (at(first) == '0' && is_digit(at(next))) {
+            return {Token::Type::kError, source, "integer literal cannot have leading 0s"};
-            return {Token::Type::kError, source,
-                    "integer literal (" + std::string{substr(start, end - 1 - start)} +
-                        "...) has leading 0s"};
         }
     }
 
-    while (end < length() && is_digit(at(end))) {
-        auto digits = end - first;
-        if (digits > kMaxDigits) {
-            return {Token::Type::kError, source,
-                    "integer literal (" + std::string{substr(start, end - 1 - start)} +
-                        "...) has too many digits"};
-        }
-
-        end++;
-    }
-
-    advance(end - start);
-
     return build_token_from_int_if_possible(source, start, 10);
 }
 

src/tint/reader/wgsl/lexer_test.cc

@@ -15,6 +15,8 @@
 #include "src/tint/reader/wgsl/lexer.h"
 
 #include <limits>
+#include <tuple>
+#include <vector>
 
 #include "gtest/gtest.h"
 
@@ -586,270 +588,218 @@ TEST_F(LexerTest, IdentifierTest_DoesNotStartWithNumber) {
     EXPECT_FALSE(t.IsIdentifier());
 }
 
-struct HexSignedIntData {
+////////////////////////////////////////////////////////////////////////////////
+// ParseIntegerTest
+////////////////////////////////////////////////////////////////////////////////
+struct ParseIntegerCase {
     const char* input;
-    int32_t result;
+    int64_t result;
 };
-inline std::ostream& operator<<(std::ostream& out, HexSignedIntData data) {
+
+inline std::ostream& operator<<(std::ostream& out, ParseIntegerCase data) {
     out << std::string(data.input);
     return out;
 }
 
-using IntegerTest_HexSigned = testing::TestWithParam<HexSignedIntData>;
+using ParseIntegerTest = testing::TestWithParam<std::tuple<char, ParseIntegerCase>>;
-TEST_P(IntegerTest_HexSigned, NoSuffix) {
+TEST_P(ParseIntegerTest, Parse) {
-    auto params = GetParam();
+    auto suffix = std::get<0>(GetParam());
+    auto params = std::get<1>(GetParam());
     Source::File file("", params.input);
-    Lexer l(&file);
 
-    auto t = l.next();
+    auto t = Lexer(&file).next();
-    EXPECT_TRUE(t.Is(Token::Type::kIntLiteral));
+    switch (suffix) {
-    EXPECT_EQ(t.source().range.begin.line, 1u);
+        case 'i':
-    EXPECT_EQ(t.source().range.begin.column, 1u);
+            EXPECT_TRUE(t.Is(Token::Type::kIntLiteral_I));
-    EXPECT_EQ(t.source().range.end.line, 1u);
+            break;
-    EXPECT_EQ(t.source().range.end.column, 1u + strlen(params.input));
+        case 'u':
-    EXPECT_EQ(t.to_i64(), params.result);
+            EXPECT_TRUE(t.Is(Token::Type::kIntLiteral_U));
-}
+            break;
-TEST_P(IntegerTest_HexSigned, ISuffix) {
+        case 0:
-    auto params = GetParam();
+            EXPECT_TRUE(t.Is(Token::Type::kIntLiteral));
-    Source::File file("", std::string(params.input) + "i");
+            break;
-    Lexer l(&file);
-
-    auto t = l.next();
-    EXPECT_TRUE(t.Is(Token::Type::kIntLiteral_I));
-    EXPECT_EQ(t.source().range.begin.line, 1u);
-    EXPECT_EQ(t.source().range.begin.column, 1u);
-    EXPECT_EQ(t.source().range.end.line, 1u);
-    EXPECT_EQ(t.source().range.end.column, 2u + strlen(params.input));
-    EXPECT_EQ(t.to_i64(), params.result);
-}
-INSTANTIATE_TEST_SUITE_P(
-    LexerTest,
-    IntegerTest_HexSigned,
-    testing::Values(HexSignedIntData{"0x0", 0},
-                    HexSignedIntData{"0X0", 0},
-                    HexSignedIntData{"0x42", 66},
-                    HexSignedIntData{"0X42", 66},
-                    HexSignedIntData{"-0x42", -66},
-                    HexSignedIntData{"-0X42", -66},
-                    HexSignedIntData{"0xeF1Abc9", 250719177},
-                    HexSignedIntData{"0XeF1Abc9", 250719177},
-                    HexSignedIntData{"-0x80000000", std::numeric_limits<int32_t>::min()},
-                    HexSignedIntData{"-0X80000000", std::numeric_limits<int32_t>::min()},
-                    HexSignedIntData{"0x7FFFFFFF", std::numeric_limits<int32_t>::max()},
-                    HexSignedIntData{"0X7FFFFFFF", std::numeric_limits<int32_t>::max()}));
-
-TEST_F(LexerTest, HexPrefixOnly_IsError) {
-    // Could be the start of a hex integer or hex float, but is neither.
-    Source::File file("", "0x");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer or float hex literal has no significant digits");
-}
-
-TEST_F(LexerTest, HexPrefixUpperCaseOnly_IsError) {
-    // Could be the start of a hex integer or hex float, but is neither.
-    Source::File file("", "0X");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer or float hex literal has no significant digits");
-}
-
-TEST_F(LexerTest, NegativeHexPrefixOnly_IsError) {
-    // Could be the start of a hex integer or hex float, but is neither.
-    Source::File file("", "-0x");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer or float hex literal has no significant digits");
-}
-
-TEST_F(LexerTest, NegativeHexPrefixUpperCaseOnly_IsError) {
-    // Could be the start of a hex integer or hex float, but is neither.
-    Source::File file("", "-0X");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer or float hex literal has no significant digits");
-}
-
-TEST_F(LexerTest, IntegerTest_HexSignedTooLarge) {
-    Source::File file("", "0x80000000");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "value cannot be represented as 'i32'");
-}
-
-TEST_F(LexerTest, IntegerTest_HexSignedTooSmall) {
-    Source::File file("", "-0x8000000F");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "value cannot be represented as 'i32'");
-}
-
-TEST_F(LexerTest, IntegerTest_HexSignedTooManyDigits) {
-    {
-        Source::File file("", "-0x100000000000000000000000");
-        Lexer l(&file);
-
-        auto t = l.next();
-        ASSERT_TRUE(t.Is(Token::Type::kError));
-        EXPECT_EQ(t.to_str(), "integer literal (-0x10000000...) has too many digits");
     }
-    {
-        Source::File file("", "0x100000000000000");
-        Lexer l(&file);
-
-        auto t = l.next();
-        ASSERT_TRUE(t.Is(Token::Type::kError));
-        EXPECT_EQ(t.to_str(), "integer literal (0x10000000...) has too many digits");
-    }
-}
-
-struct HexUnsignedIntData {
-    const char* input;
-    uint32_t result;
-};
-inline std::ostream& operator<<(std::ostream& out, HexUnsignedIntData data) {
-    out << std::string(data.input);
-    return out;
-}
-using IntegerTest_HexUnsigned = testing::TestWithParam<HexUnsignedIntData>;
-// TODO(crbug.com/tint/1504): Split into NoSuffix and USuffix
-TEST_P(IntegerTest_HexUnsigned, Matches) {
-    auto params = GetParam();
-    Source::File file("", params.input);
-    Lexer l(&file);
-
-    auto t = l.next();
-    EXPECT_TRUE(t.Is(Token::Type::kIntLiteral_U));
     EXPECT_EQ(t.source().range.begin.line, 1u);
     EXPECT_EQ(t.source().range.begin.column, 1u);
     EXPECT_EQ(t.source().range.end.line, 1u);
     EXPECT_EQ(t.source().range.end.column, 1u + strlen(params.input));
+    ASSERT_FALSE(t.IsError()) << t.to_str();
     EXPECT_EQ(t.to_i64(), params.result);
-
-    t = l.next();
-    EXPECT_TRUE(t.IsEof());
-}
-INSTANTIATE_TEST_SUITE_P(
-    LexerTest,
-    IntegerTest_HexUnsigned,
-    testing::Values(HexUnsignedIntData{"0x0u", 0},
-                    HexUnsignedIntData{"0x42u", 66},
-                    HexUnsignedIntData{"0xeF1Abc9u", 250719177},
-                    HexUnsignedIntData{"0x0u", std::numeric_limits<uint32_t>::min()},
-                    HexUnsignedIntData{"0xFFFFFFFFu", std::numeric_limits<uint32_t>::max()}));
-
-TEST_F(LexerTest, IntegerTest_HexUnsignedTooManyDigits) {
-    Source::File file("", "0x1000000000000000000000u");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer literal (0x10000000...) has too many digits");
 }
 
-struct UnsignedIntData {
+INSTANTIATE_TEST_SUITE_P(Dec_AInt,
-    const char* input;
+                         ParseIntegerTest,
-    uint32_t result;
+                         testing::Combine(testing::Values('\0'),  // No suffix
-};
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
-inline std::ostream& operator<<(std::ostream& out, UnsignedIntData data) {
+                                              {"0", 0},
-    out << std::string(data.input);
+                                              {"-2", -2},
-    return out;
+                                              {"2", 2},
+                                              {"123", 123},
+                                              {"2147483647", 2147483647},
+                                              {"-2147483648", -2147483648LL},
+                                              {"-9223372036854775808", -9223372036854775807LL - 1},
+                                          })));
+
+INSTANTIATE_TEST_SUITE_P(Dec_u32,
+                         ParseIntegerTest,
+                         testing::Combine(testing::Values('u'),  // Suffix
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
+                                              {"0u", 0},
+                                              {"123u", 123},
+                                              {"4294967295u", 4294967295ll},
+                                          })));
+
+INSTANTIATE_TEST_SUITE_P(Dec_i32,
+                         ParseIntegerTest,
+                         testing::Combine(testing::Values('i'),  // Suffix
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
+                                              {"0i", 0u},
+                                              {"-0i", 0u},
+                                              {"123i", 123},
+                                              {"-123i", -123},
+                                              {"2147483647i", 2147483647},
+                                              {"-2147483647i", -2147483647ll},
+                                          })));
+
+INSTANTIATE_TEST_SUITE_P(Hex_AInt,
+                         ParseIntegerTest,
+                         testing::Combine(testing::Values('\0'),  // No suffix
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
+                                              {"0x0", 0},
+                                              {"0X0", 0},
+                                              {"0x42", 66},
+                                              {"0X42", 66},
+                                              {"-0x42", -66},
+                                              {"-0X42", -66},
+                                              {"0xeF1Abc9", 0xeF1Abc9},
+                                              {"0XeF1Abc9", 0xeF1Abc9},
+                                              {"-0xeF1Abc9", -0xeF1Abc9},
+                                              {"-0XeF1Abc9", -0xeF1Abc9},
+                                              {"0x80000000", 0x80000000},
+                                              {"0X80000000", 0X80000000},
+                                              {"-0x80000000", -0x80000000ll},
+                                              {"-0X80000000", -0X80000000ll},
+                                              {"0x7FFFFFFF", 0x7fffffff},
+                                              {"0X7FFFFFFF", 0x7fffffff},
+                                              {"0x7fffffff", 0x7fffffff},
+                                              {"0x7fffffff", 0x7fffffff},
+                                              {"0x7FfFfFfF", 0x7fffffff},
+                                              {"0X7FfFfFfF", 0x7fffffff},
+                                              {"0x7fffffffffffffff", 0x7fffffffffffffffll},
+                                              {"-0x7fffffffffffffff", -0x7fffffffffffffffll},
+                                          })));
+
+INSTANTIATE_TEST_SUITE_P(Hex_u32,
+                         ParseIntegerTest,
+                         testing::Combine(testing::Values('u'),  // Suffix
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
+                                              {"0x0u", 0},
+                                              {"0x42u", 66},
+                                              {"0xeF1Abc9u", 250719177},
+                                              {"0xFFFFFFFFu", 0xffffffff},
+                                              {"0XFFFFFFFFu", 0xffffffff},
+                                              {"0xffffffffu", 0xffffffff},
+                                              {"0Xffffffffu", 0xffffffff},
+                                              {"0xfFfFfFfFu", 0xffffffff},
+                                              {"0XfFfFfFfFu", 0xffffffff},
+                                          })));
+
+INSTANTIATE_TEST_SUITE_P(Hex_i32,
+                         ParseIntegerTest,
+                         testing::Combine(testing::Values('i'),  // Suffix
+                                          testing::ValuesIn(std::vector<ParseIntegerCase>{
+                                              {"0x0i", 0},
+                                              {"0x42i", 66},
+                                              {"-0x0i", 0},
+                                              {"-0x42i", -66},
+                                              {"0xeF1Abc9i", 250719177},
+                                              {"-0xeF1Abc9i", -250719177},
+                                              {"0x7FFFFFFFi", 0x7fffffff},
+                                              {"-0x7FFFFFFFi", -0x7fffffff},
+                                              {"0X7FFFFFFFi", 0x7fffffff},
+                                              {"-0X7FFFFFFFi", -0x7fffffff},
+                                              {"0x7fffffffi", 0x7fffffff},
+                                              {"-0x7fffffffi", -0x7fffffff},
+                                              {"0X7fffffffi", 0x7fffffff},
+                                              {"-0X7fffffffi", -0x7fffffff},
+                                              {"0x7FfFfFfFi", 0x7fffffff},
+                                              {"-0x7FfFfFfFi", -0x7fffffff},
+                                              {"0X7FfFfFfFi", 0x7fffffff},
+                                              {"-0X7FfFfFfFi", -0x7fffffff},
+                                          })));
+////////////////////////////////////////////////////////////////////////////////
+// ParseIntegerTest_CannotBeRepresented
+////////////////////////////////////////////////////////////////////////////////
+using ParseIntegerTest_CannotBeRepresented =
+    testing::TestWithParam<std::tuple<const char*, const char*>>;
+TEST_P(ParseIntegerTest_CannotBeRepresented, Parse) {
+    auto type = std::get<0>(GetParam());
+    auto source = std::get<1>(GetParam());
+    Source::File file("", source);
+    auto t = Lexer(&file).next();
+    EXPECT_TRUE(t.Is(Token::Type::kError));
+    auto expect = "value cannot be represented as '" + std::string(type) + "'";
+    EXPECT_EQ(t.to_str(), expect);
 }
-using IntegerTest_Unsigned = testing::TestWithParam<UnsignedIntData>;
+INSTANTIATE_TEST_SUITE_P(AbstractInt,
-TEST_P(IntegerTest_Unsigned, Matches) {
+                         ParseIntegerTest_CannotBeRepresented,
-    auto params = GetParam();
+                         testing::Combine(testing::Values("abstract-int"),
-    Source::File file("", params.input);
+                                          testing::Values("9223372036854775808",
-    Lexer l(&file);
+                                                          "0xFFFFFFFFFFFFFFFF",
+                                                          "0xffffffffffffffff",
+                                                          "0x8000000000000000")));
 
-    auto t = l.next();
+INSTANTIATE_TEST_SUITE_P(i32,
-    EXPECT_TRUE(t.Is(Token::Type::kIntLiteral_U));
+                         ParseIntegerTest_CannotBeRepresented,
-    EXPECT_EQ(t.to_i64(), params.result);
+                         testing::Combine(testing::Values("i32"),  // type
-    EXPECT_EQ(t.source().range.begin.line, 1u);
+                                          testing::Values("2147483648i")));
-    EXPECT_EQ(t.source().range.begin.column, 1u);
-    EXPECT_EQ(t.source().range.end.line, 1u);
-    EXPECT_EQ(t.source().range.end.column, 1u + strlen(params.input));
-}
-INSTANTIATE_TEST_SUITE_P(LexerTest,
-                         IntegerTest_Unsigned,
-                         testing::Values(UnsignedIntData{"0u", 0u},
-                                         UnsignedIntData{"123u", 123u},
-                                         UnsignedIntData{"4294967295u", 4294967295u}));
 
-TEST_F(LexerTest, IntegerTest_UnsignedTooManyDigits) {
+INSTANTIATE_TEST_SUITE_P(u32,
-    Source::File file("", "10000000000000000000000u");
+                         ParseIntegerTest_CannotBeRepresented,
-    Lexer l(&file);
+                         testing::Combine(testing::Values("u32"),         // type
+                                          testing::Values("4294967296u",  //
+                                                          "-1u")));
 
-    auto t = l.next();
+////////////////////////////////////////////////////////////////////////////////
-    ASSERT_TRUE(t.Is(Token::Type::kError));
+// ParseIntegerTest_LeadingZeros
-    EXPECT_EQ(t.to_str(), "integer literal (1000000000...) has too many digits");
+////////////////////////////////////////////////////////////////////////////////
-}
+using ParseIntegerTest_LeadingZeros = testing::TestWithParam<const char*>;
-
+TEST_P(ParseIntegerTest_LeadingZeros, Parse) {
-struct SignedIntData {
-    const char* input;
-    int32_t result;
-};
-inline std::ostream& operator<<(std::ostream& out, SignedIntData data) {
-    out << std::string(data.input);
-    return out;
-}
-using IntegerTest_Signed = testing::TestWithParam<SignedIntData>;
-TEST_P(IntegerTest_Signed, Matches) {
-    auto params = GetParam();
-    Source::File file("", params.input);
-    Lexer l(&file);
-
-    auto t = l.next();
-    EXPECT_TRUE(t.Is(Token::Type::kIntLiteral));
-    EXPECT_EQ(t.to_i64(), params.result);
-    EXPECT_EQ(t.source().range.begin.line, 1u);
-    EXPECT_EQ(t.source().range.begin.column, 1u);
-    EXPECT_EQ(t.source().range.end.line, 1u);
-    EXPECT_EQ(t.source().range.end.column, 1u + strlen(params.input));
-}
-INSTANTIATE_TEST_SUITE_P(LexerTest,
-                         IntegerTest_Signed,
-                         testing::Values(SignedIntData{"0", 0},
-                                         SignedIntData{"-2", -2},
-                                         SignedIntData{"2", 2},
-                                         SignedIntData{"123", 123},
-                                         SignedIntData{"2147483647", 2147483647},
-                                         SignedIntData{"-2147483648", -2147483648LL}));
-
-TEST_F(LexerTest, IntegerTest_SignedTooManyDigits) {
-    Source::File file("", "-10000000000000000");
-    Lexer l(&file);
-
-    auto t = l.next();
-    ASSERT_TRUE(t.Is(Token::Type::kError));
-    EXPECT_EQ(t.to_str(), "integer literal (-1000000000...) has too many digits");
-}
-
-using IntegerTest_Invalid = testing::TestWithParam<const char*>;
-TEST_P(IntegerTest_Invalid, Parses) {
     Source::File file("", GetParam());
-    Lexer l(&file);
+    auto t = Lexer(&file).next();
-
+    EXPECT_TRUE(t.Is(Token::Type::kError));
-    auto t = l.next();
+    EXPECT_EQ(t.to_str(), "integer literal cannot have leading 0s");
-    EXPECT_FALSE(t.Is(Token::Type::kIntLiteral));
-    EXPECT_FALSE(t.Is(Token::Type::kIntLiteral_U));
-    EXPECT_FALSE(t.Is(Token::Type::kIntLiteral_I));
 }
-INSTANTIATE_TEST_SUITE_P(
+
-    LexerTest,
+INSTANTIATE_TEST_SUITE_P(LeadingZero,
-    IntegerTest_Invalid,
+                         ParseIntegerTest_LeadingZeros,
-    testing::Values("2147483648", "4294967296u", "01234", "0000", "-00", "00u"));
+                         testing::Values("01234", "0000", "-00", "00u"));
+
+////////////////////////////////////////////////////////////////////////////////
+// ParseIntegerTest_NoSignificantDigits
+////////////////////////////////////////////////////////////////////////////////
+using ParseIntegerTest_NoSignificantDigits = testing::TestWithParam<const char*>;
+TEST_P(ParseIntegerTest_NoSignificantDigits, Parse) {
+    Source::File file("", GetParam());
+    auto t = Lexer(&file).next();
+    EXPECT_TRUE(t.Is(Token::Type::kError));
+    EXPECT_EQ(t.to_str(), "integer or float hex literal has no significant digits");
+}
+
+INSTANTIATE_TEST_SUITE_P(LeadingZero,
+                         ParseIntegerTest_NoSignificantDigits,
+                         testing::Values("0x",
+                                         "0X",
+                                         "-0x",
+                                         "-0X",
+                                         "0xu",
+                                         "0Xu",
+                                         "-0xu",
+                                         "-0Xu",
+                                         "0xi",
+                                         "0Xi",
+                                         "-0xi",
+                                         "-0Xi"));
 
 struct TokenData {
     const char* input;

webgpu-cts/expectations.txt

@@ -312,6 +312,13 @@ crbug.com/tint/1525 webgpu:shader,validation,parse,literal:u32:val="123" [ Failu
 crbug.com/tint/1525 webgpu:shader,validation,parse,literal:u32:val="2147483647" [ Failure ]
 crbug.com/tint/1525 webgpu:shader,validation,parse,literal:u32:val="4294967295" [ Failure ]
 
+################################################################################
+# Literal unification failures (implementation WIP)
+################################################################################
+crbug.com/tint/1504 webgpu:shader,validation,parse,literal:abstract_int:val="4294967295" [ Failure ]
+crbug.com/tint/1504 webgpu:shader,validation,parse,literal:i32:val="-2147483649" [ Failure ]
+crbug.com/tint/1504 webgpu:shader,validation,parse,literal:i32:val="2147483648" [ Failure ]
+
 ################################################################################
 # untriaged failures
 # KEEP