Commit 4cb203db9242cb477027b92d866c4dccece64d38 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-04-19 00:02:03-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-04-19 19:31:50-04:00
log	4cb203db9242cb477027b92d866c4dccece64d38
tree	6c9753cf8495bb9cdaa5f978408b5704f5f7a7d4
parent	7127c07f688ca80af78847de647cdd2499ea02f4

ir: parsing integer literals

2 files changed, 38 insertions(+), 10 deletions(-)

src-self-hosted
- ir.zig
- type.zig

src-self-hosted/ir.zig+37-10

 @@ -219,8 +219,8 @@ fn parseOptionalType(ctx: *ParseContext) !?Type {
 fn parseInstruction(ctx: *ParseContext, opt_type: ?Type) error{ OutOfMemory, ParseFailure }!*Inst {
     switch (ctx.source[ctx.i]) {
-        '"' => return parseStringLiteralConst(ctx),
+        '"' => return parseStringLiteralConst(ctx, opt_type),
-        '0'...'9' => return parseIntegerLiteralConst(ctx),
+        '0'...'9' => return parseIntegerLiteralConst(ctx, opt_type),
         else => {},
     }
     const fn_name = try skipToAndOver(ctx, '(');
 @@ -327,7 +327,7 @@ fn parseBody(ctx: *ParseContext) !Inst.Fn.Body {
     };
 }
-fn parseStringLiteralConst(ctx: *ParseContext) !*Inst {
+fn parseStringLiteralConst(ctx: *ParseContext, opt_type: ?Type) !*Inst {
     const start = ctx.i;
     ctx.i += 1; // skip over '"'
 @@ -344,17 +344,21 @@ fn parseStringLiteralConst(ctx: *ParseContext) !*Inst {
                 },
                 else => |e| return e,
             };
+            const const_inst = try ctx.allocator.create(Inst.Constant);
+            errdefer ctx.allocator.destroy(const_inst);
             const bytes_payload = try ctx.allocator.create(Value.Payload.Bytes);
             errdefer ctx.allocator.destroy(bytes_payload);
             bytes_payload.* = .{ .data = parsed };
-            const ty_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
+            const ty = opt_type orelse blk: {
-            errdefer ctx.allocator.destroy(ty_payload);
+                const ty_payload = try ctx.allocator.create(Type.Payload.Array_u8_Sentinel0);
-            ty_payload.* = .{ .len = parsed.len };
+                ty_payload.* = .{ .len = parsed.len };
+                break :blk Type.initPayload(&ty_payload.base);
+            };
-            const const_inst = try ctx.allocator.create(Inst.Constant);
             const_inst.* = .{
-                .ty = Type.initPayload(&ty_payload.base),
+                .ty = ty,
                 .positionals = .{ .value = Value.initPayload(&bytes_payload.base) },
                 .kw_args = .{},
             };
 @@ -370,8 +374,31 @@ fn parseStringLiteralConst(ctx: *ParseContext) !*Inst {
     return parseError(ctx, "unexpected EOF in string literal", .{});
 }
-fn parseIntegerLiteralConst(ctx: *ParseContext) !*Inst {
+fn parseIntegerLiteralConst(ctx: *ParseContext, opt_type: ?Type) !*Inst {
-    return parseError(ctx, "TODO parse integer literal", .{});
+    const start = ctx.i;
+    while (ctx.i < ctx.source.len) : (ctx.i += 1) switch (ctx.source[ctx.i]) {
+        '0'...'9' => continue,
+        else => break,
+    };
+    const number_text = ctx.source[start..ctx.i];
+    const number = std.fmt.parseInt(u64, number_text, 10) catch |err| switch (err) {
+        error.Overflow => return parseError(ctx, "TODO handle big integers", .{}),
+        error.InvalidCharacter => return parseError(ctx, "invalid integer literal", .{}),
+    };
+    const int_payload = try ctx.allocator.create(Value.Payload.Int_u64);
+    errdefer ctx.allocator.destroy(int_payload);
+    int_payload.* = .{ .int = number };
+    const const_inst = try ctx.allocator.create(Inst.Constant);
+    errdefer ctx.allocator.destroy(const_inst);
+    const_inst.* = .{
+        .ty = opt_type orelse Type.initTag(.int_comptime),
+        .positionals = .{ .value = Value.initPayload(&int_payload.base) },
+        .kw_args = .{},
+    };
+    return &const_inst.base;
 }
 pub fn main() anyerror!void {

src-self-hosted/type.zig+1

...	@@ -75,6 +75,7 @@ pub const Type = extern union {	...	@@ -75,6 +75,7 @@ pub const Type = extern union {
75	/// See `zigTypeTag` for the function that corresponds to `std.builtin.TypeId`.	75	/// See `zigTypeTag` for the function that corresponds to `std.builtin.TypeId`.
76	pub const Tag = enum {	76	pub const Tag = enum {
77	// The first section of this enum are tags that require no payload.	77	// The first section of this enum are tags that require no payload.
		78	int_comptime,
78	int_u8,	79	int_u8,
79	int_usize,	80	int_usize,
80	// Bump this when adding items above.	81	// Bump this when adding items above.