Commit a45db7e853c2aa04ff7a91dbda975f181aa467bd | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-01-03 18:25:17-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-01-03 18:25:17-05:00
log	a45db7e853c2aa04ff7a91dbda975f181aa467bd
tree	2f89718ec3edb9a2fec29753d60ffcd630af8698
parent	5b156031e92c66c1bea71d5eb6c337b23185d65d

add building the self hosted compiler to the main test suite

3 files changed, 22 insertions(+), 3 deletions(-)

build.zig
src-self-hosted
- main.zig
- tokenizer.zig

build.zig+4-1

 @@ -33,6 +33,8 @@ pub fn build(b: &Builder) {
     docs_step.dependOn(&docgen_cmd.step);
     docs_step.dependOn(&docgen_home_cmd.step);
+    const test_step = b.step("test", "Run all the tests");
     if (findLLVM(b)) |llvm| {
         // find the stage0 build artifacts because we're going to re-use config.h and zig_cpp library
         const build_info = b.exec([][]const u8{b.zig_exe, "BUILD_INFO"});
 @@ -72,15 +74,16 @@ pub fn build(b: &Builder) {
         b.default_step.dependOn(&exe.step);
         b.default_step.dependOn(docs_step);
+        test_step.dependOn(&exe.step);
         b.installArtifact(exe);
         installStdLib(b);
     }
     const test_filter = b.option([]const u8, "test-filter", "Skip tests that do not match filter");
     const with_lldb = b.option(bool, "with-lldb", "Run tests in LLDB to get a backtrace if one fails") ?? false;
-    const test_step = b.step("test", "Run all the tests");
     test_step.dependOn(docs_step);

src-self-hosted/main.zig+5

...	@@ -626,3 +626,8 @@ fn findZigLibDir(allocator: &mem.Allocator) -> %[]u8 {	...	@@ -626,3 +626,8 @@ fn findZigLibDir(allocator: &mem.Allocator) -> %[]u8 {
626		626
627	return error.FileNotFound;	627	return error.FileNotFound;
628	}	628	}
		629
		630	test "import tests" {
		631	_ = @import("tokenizer.zig");
		632	_ = @import("parser.zig");
		633	}

src-self-hosted/tokenizer.zig+13-2

 @@ -204,6 +204,7 @@ pub const Tokenizer = struct {
         LineComment,
         Zero,
         IntegerLiteral,
+        IntegerLiteralWithRadix,
         NumberDot,
         FloatFraction,
         FloatExponentUnsigned,
 @@ -454,7 +455,7 @@ pub const Tokenizer = struct {
                 },
                 State.Zero => switch (c) {
                     'b', 'o', 'x' => {
-                        state = State.IntegerLiteral;
+                        state = State.IntegerLiteralWithRadix;
                     },
                     else => {
                         // reinterpret as a normal number
 @@ -469,6 +470,16 @@ pub const Tokenizer = struct {
                     'p', 'P', 'e', 'E' => {
                         state = State.FloatExponentUnsigned;
                     },
+                    '0'...'9' => {},
+                    else => break,
+                },
+                State.IntegerLiteralWithRadix => switch (c) {
+                    '.' => {
+                        state = State.NumberDot;
+                    },
+                    'p', 'P' => {
+                        state = State.FloatExponentUnsigned;
+                    },
                     '0'...'9', 'a'...'f', 'A'...'F' => {},
                     else => break,
                 },
 @@ -485,7 +496,7 @@ pub const Tokenizer = struct {
                     },
                 },
                 State.FloatFraction => switch (c) {
-                    'p', 'P', 'e', 'E' => {
+                    'p', 'P' => {
                         state = State.FloatExponentUnsigned;
                     },
                     '0'...'9', 'a'...'f', 'A'...'F' => {},