From 904f774563c69feae9f73a8ee9637e3b760ecd3a Mon Sep 17 00:00:00 2001
From: Veikka Tuominen <git@vexu.eu>
Date: Wed, 3 Mar 2021 11:58:09 +0200
Subject: [PATCH] translate-c: fix c tokenizer giving invalid tokens

---
 lib/std/c/tokenizer.zig      | 32 ++++++++++++++++++++++++++++++--
 lib/std/multi_array_list.zig |  2 +-
 test/run_translated_c.zig    |  2 ++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/std/c/tokenizer.zig b/lib/std/c/tokenizer.zig
index 2e1969e269..4399d3dc6c 100644
--- a/lib/std/c/tokenizer.zig
+++ b/lib/std/c/tokenizer.zig
@@ -401,7 +401,9 @@ pub const Tokenizer = struct {
             Zero,
             IntegerLiteralOct,
             IntegerLiteralBinary,
+            IntegerLiteralBinaryFirst,
             IntegerLiteralHex,
+            IntegerLiteralHexFirst,
             IntegerLiteral,
             IntegerSuffix,
             IntegerSuffixU,
@@ -1046,10 +1048,10 @@ pub const Tokenizer = struct {
                         state = .IntegerLiteralOct;
                     },
                     'b', 'B' => {
-                        state = .IntegerLiteralBinary;
+                        state = .IntegerLiteralBinaryFirst;
                     },
                     'x', 'X' => {
-                        state = .IntegerLiteralHex;
+                        state = .IntegerLiteralHexFirst;
                     },
                     '.' => {
                         state = .FloatFraction;
@@ -1066,6 +1068,13 @@ pub const Tokenizer = struct {
                         self.index -= 1;
                     },
                 },
+                .IntegerLiteralBinaryFirst => switch (c) {
+                    '0'...'7' => state = .IntegerLiteralBinary,
+                    else => {
+                        result.id = .Invalid;
+                        break;
+                    },
+                },
                 .IntegerLiteralBinary => switch (c) {
                     '0', '1' => {},
                     else => {
@@ -1073,6 +1082,19 @@ pub const Tokenizer = struct {
                         self.index -= 1;
                     },
                 },
+                .IntegerLiteralHexFirst => switch (c) {
+                    '0'...'9', 'a'...'f', 'A'...'F' => state = .IntegerLiteralHex,
+                    '.' => {
+                        state = .FloatFractionHex;
+                    },
+                    'p', 'P' => {
+                        state = .FloatExponent;
+                    },
+                    else => {
+                        result.id = .Invalid;
+                        break;
+                    },
+                },
                 .IntegerLiteralHex => switch (c) {
                     '0'...'9', 'a'...'f', 'A'...'F' => {},
                     '.' => {
@@ -1238,6 +1260,8 @@ pub const Tokenizer = struct {
                 .MultiLineCommentAsterisk,
                 .FloatExponent,
                 .MacroString,
+                .IntegerLiteralBinaryFirst,
+                .IntegerLiteralHexFirst,
                 => result.id = .Invalid,
 
                 .FloatExponentDigits => result.id = if (counter == 0) .Invalid else .{ .FloatLiteral = .none },
@@ -1523,6 +1547,7 @@ test "num suffixes" {
         \\ 1.0f 1.0L 1.0 .0 1.
         \\ 0l 0lu 0ll 0llu 0
         \\ 1u 1ul 1ull 1
+        \\ 0x 0b
         \\
     , &[_]Token.Id{
         .{ .FloatLiteral = .f },
@@ -1542,6 +1567,9 @@ test "num suffixes" {
         .{ .IntegerLiteral = .llu },
         .{ .IntegerLiteral = .none },
         .Nl,
+        .Invalid,
+        .Invalid,
+        .Nl,
     });
 }
 
diff --git a/lib/std/multi_array_list.zig b/lib/std/multi_array_list.zig
index 3306fd3ef0..99a9fff7f0 100644
--- a/lib/std/multi_array_list.zig
+++ b/lib/std/multi_array_list.zig
@@ -136,7 +136,7 @@ pub fn MultiArrayList(comptime S: type) type {
             const slices = self.slice();
             var result: S = undefined;
             inline for (fields) |field_info, i| {
-                @field(elem, field_info.name) = slices.items(@intToEnum(Field, i))[index];
+                @field(result, field_info.name) = slices.items(@intToEnum(Field, i))[index];
             }
             return result;
         }
diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig
index 4eb0f1e50a..07e449733f 100644
--- a/test/run_translated_c.zig
+++ b/test/run_translated_c.zig
@@ -27,6 +27,8 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void {
         \\#define FOO =
         \\#define PtrToPtr64(p) ((void *POINTER_64) p)
         \\#define STRUC_ALIGNED_STACK_COPY(t,s) ((CONST t *)(s))
+        \\#define bar = 0x
+        \\#define baz = 0b
         \\int main(void) {}
     , "");