mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: add import builtin stub

Browse Source
This commit is contained in:
Vexu 2020-09-04 23:34:44 +03:00
parent fe117d9961
commit 20ae15917c
No known key found for this signature in database
GPG Key ID: 59AEB8936E16A6AC
6 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module.zig
View File

@ -2381,6 +2381,11 @@ pub fn analyzeSlice(self: *Module, scope: *Scope, src: usize, array_ptr: *Inst,
return self.fail(scope, src, "TODO implement analysis of slice", .{}); return self.fail(scope, src, "TODO implement analysis of slice", .{});
} }
pub fn analyzeImport(self: *Module, scope: *Scope, src: usize, target_string: []const u8) InnerError!*Inst {
// TODO actually try to import
return self.constType(scope, src, Type.initTag(.empty_struct));
}
/// Asserts that lhs and rhs types are both numeric. /// Asserts that lhs and rhs types are both numeric.
pub fn cmpNumeric( pub fn cmpNumeric(
self: *Module, self: *Module,

11
src/astgen.zig
View File

@ -1973,6 +1973,15 @@ fn bitCast(mod: *Module, scope: *Scope, rl: ResultLoc, call: *ast.Node.BuiltinCa
} }
} }
fn import(mod: *Module, scope: *Scope, call: *ast.Node.BuiltinCall) InnerError!*zir.Inst {
try ensureBuiltinParamCount(mod, scope, call, 1);
const tree = scope.tree();
const src = tree.token_locs[call.builtin_token].start;
const params = call.params();
const target = try expr(mod, scope, .none, params[0]);
return addZIRUnOp(mod, scope, src, .import, target);
}
fn builtinCall(mod: *Module, scope: *Scope, rl: ResultLoc, call: *ast.Node.BuiltinCall) InnerError!*zir.Inst { fn builtinCall(mod: *Module, scope: *Scope, rl: ResultLoc, call: *ast.Node.BuiltinCall) InnerError!*zir.Inst {
const tree = scope.tree(); const tree = scope.tree();
const builtin_name = tree.tokenSlice(call.builtin_token); const builtin_name = tree.tokenSlice(call.builtin_token);
@ -1995,6 +2004,8 @@ fn builtinCall(mod: *Module, scope: *Scope, rl: ResultLoc, call: *ast.Node.Built
} else if (mem.eql(u8, builtin_name, "@breakpoint")) { } else if (mem.eql(u8, builtin_name, "@breakpoint")) {
const src = tree.token_locs[call.builtin_token].start; const src = tree.token_locs[call.builtin_token].start;
return rlWrap(mod, scope, rl, try addZIRNoOp(mod, scope, src, .breakpoint)); return rlWrap(mod, scope, rl, try addZIRNoOp(mod, scope, src, .breakpoint));
} else if (mem.eql(u8, builtin_name, "@import")) {
return rlWrap(mod, scope, rl, try import(mod, scope, call));
} else { } else {
return mod.failTok(scope, call.builtin_token, "invalid builtin function: '{}'", .{builtin_name}); return mod.failTok(scope, call.builtin_token, "invalid builtin function: '{}'", .{builtin_name});
} }

29
src/type.zig
View File

@ -89,6 +89,8 @@ pub const Type = extern union {
.anyerror_void_error_union, .error_union => return .ErrorUnion, .anyerror_void_error_union, .error_union => return .ErrorUnion,
.anyframe_T, .@"anyframe" => return .AnyFrame, .anyframe_T, .@"anyframe" => return .AnyFrame,
.empty_struct => return .Struct,
} }
} }
@ -352,6 +354,7 @@ pub const Type = extern union {
.enum_literal, .enum_literal,
.anyerror_void_error_union, .anyerror_void_error_union,
.@"anyframe", .@"anyframe",
.empty_struct,
=> unreachable, => unreachable,
.array_u8_sentinel_0 => return self.copyPayloadShallow(allocator, Payload.Array_u8_Sentinel0), .array_u8_sentinel_0 => return self.copyPayloadShallow(allocator, Payload.Array_u8_Sentinel0),
@ -505,6 +508,7 @@ pub const Type = extern union {
.@"null" => return out_stream.writeAll("@Type(.Null)"), .@"null" => return out_stream.writeAll("@Type(.Null)"),
.@"undefined" => return out_stream.writeAll("@Type(.Undefined)"), .@"undefined" => return out_stream.writeAll("@Type(.Undefined)"),
.empty_struct => return out_stream.writeAll("struct {}"),
.@"anyframe" => return out_stream.writeAll("anyframe"), .@"anyframe" => return out_stream.writeAll("anyframe"),
.anyerror_void_error_union => return out_stream.writeAll("anyerror!void"), .anyerror_void_error_union => return out_stream.writeAll("anyerror!void"),
.const_slice_u8 => return out_stream.writeAll("[]const u8"), .const_slice_u8 => return out_stream.writeAll("[]const u8"),
@ -788,6 +792,7 @@ pub const Type = extern union {
.@"null", .@"null",
.@"undefined", .@"undefined",
.enum_literal, .enum_literal,
.empty_struct,
=> false, => false,
}; };
} }
@ -910,6 +915,7 @@ pub const Type = extern union {
.@"null", .@"null",
.@"undefined", .@"undefined",
.enum_literal, .enum_literal,
.empty_struct,
=> unreachable, => unreachable,
}; };
} }
@ -932,6 +938,7 @@ pub const Type = extern union {
.@"undefined" => unreachable, .@"undefined" => unreachable,
.enum_literal => unreachable, .enum_literal => unreachable,
.single_const_pointer_to_comptime_int => unreachable, .single_const_pointer_to_comptime_int => unreachable,
.empty_struct => unreachable,
.u8, .u8,
.i8, .i8,
@ -1107,6 +1114,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.single_const_pointer, .single_const_pointer,
@ -1181,6 +1189,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.const_slice, .const_slice,
@ -1252,6 +1261,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.single_const_pointer, .single_const_pointer,
@ -1332,6 +1342,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.pointer => { .pointer => {
@ -1407,6 +1418,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.pointer => { .pointer => {
@ -1524,6 +1536,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
.array => self.cast(Payload.Array).?.elem_type, .array => self.cast(Payload.Array).?.elem_type,
@ -1651,6 +1664,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
.array => self.cast(Payload.Array).?.len, .array => self.cast(Payload.Array).?.len,
@ -1716,6 +1730,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
.single_const_pointer, .single_const_pointer,
@ -1798,6 +1813,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.int_signed, .int_signed,
@ -1872,6 +1888,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.int_unsigned, .int_unsigned,
@ -1936,6 +1953,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
.int_unsigned => .{ .signed = false, .bits = self.cast(Payload.IntUnsigned).?.bits }, .int_unsigned => .{ .signed = false, .bits = self.cast(Payload.IntUnsigned).?.bits },
@ -2018,6 +2036,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
.usize, .usize,
@ -2129,6 +2148,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
}; };
} }
@ -2206,6 +2226,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
} }
} }
@ -2282,6 +2303,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
} }
} }
@ -2358,6 +2380,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
}; };
} }
@ -2431,6 +2454,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
}; };
} }
@ -2504,6 +2528,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> unreachable, => unreachable,
}; };
} }
@ -2577,6 +2602,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> false, => false,
}; };
} }
@ -2636,6 +2662,7 @@ pub const Type = extern union {
.error_set_single, .error_set_single,
=> return null, => return null,
.empty_struct => return Value.initTag(.empty_struct_value),
.void => return Value.initTag(.void_value), .void => return Value.initTag(.void_value),
.noreturn => return Value.initTag(.unreachable_value), .noreturn => return Value.initTag(.unreachable_value),
.@"null" => return Value.initTag(.null_value), .@"null" => return Value.initTag(.null_value),
@ -2743,6 +2770,7 @@ pub const Type = extern union {
.anyerror_void_error_union, .anyerror_void_error_union,
.error_set, .error_set,
.error_set_single, .error_set_single,
.empty_struct,
=> return false, => return false,
.c_const_pointer, .c_const_pointer,
@ -2809,6 +2837,7 @@ pub const Type = extern union {
single_const_pointer_to_comptime_int, single_const_pointer_to_comptime_int,
anyerror_void_error_union, anyerror_void_error_union,
@"anyframe", @"anyframe",
empty_struct,
const_slice_u8, // See last_no_payload_tag below. const_slice_u8, // See last_no_payload_tag below.
// After this, the tag requires a payload. // After this, the tag requires a payload.

14
src/value.zig
View File

@ -68,6 +68,7 @@ pub const Value = extern union {
one, one,
void_value, void_value,
unreachable_value, unreachable_value,
empty_struct_value,
empty_array, empty_array,
null_value, null_value,
bool_true, bool_true,
@ -182,6 +183,7 @@ pub const Value = extern union {
.null_value, .null_value,
.bool_true, .bool_true,
.bool_false, .bool_false,
.empty_struct_value,
=> unreachable, => unreachable,
.ty => { .ty => {
@ -312,6 +314,7 @@ pub const Value = extern union {
.enum_literal_type => return out_stream.writeAll("@Type(.EnumLiteral)"), .enum_literal_type => return out_stream.writeAll("@Type(.EnumLiteral)"),
.anyframe_type => return out_stream.writeAll("anyframe"), .anyframe_type => return out_stream.writeAll("anyframe"),
.empty_struct_value => return out_stream.writeAll("struct {}{}"),
.null_value => return out_stream.writeAll("null"), .null_value => return out_stream.writeAll("null"),
.undef => return out_stream.writeAll("undefined"), .undef => return out_stream.writeAll("undefined"),
.zero => return out_stream.writeAll("0"), .zero => return out_stream.writeAll("0"),
@ -475,6 +478,7 @@ pub const Value = extern union {
.float_128, .float_128,
.enum_literal, .enum_literal,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
}; };
} }
@ -543,6 +547,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.undef => unreachable, .undef => unreachable,
@ -626,6 +631,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.undef => unreachable, .undef => unreachable,
@ -709,6 +715,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.undef => unreachable, .undef => unreachable,
@ -820,6 +827,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.zero, .zero,
@ -907,6 +915,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.zero, .zero,
@ -1078,6 +1087,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.zero, .zero,
@ -1152,6 +1162,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.zero, .zero,
@ -1300,6 +1311,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.ref_val => self.cast(Payload.RefVal).?.val, .ref_val => self.cast(Payload.RefVal).?.val,
@ -1383,6 +1395,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> unreachable, => unreachable,
.empty_array => unreachable, // out of bounds array index .empty_array => unreachable, // out of bounds array index
@ -1483,6 +1496,7 @@ pub const Value = extern union {
.enum_literal, .enum_literal,
.error_set, .error_set,
.@"error", .@"error",
.empty_struct_value,
=> false, => false,
.undef => unreachable, .undef => unreachable,

4
src/zir.zig
View File

@ -161,6 +161,8 @@ pub const Inst = struct {
@"fn", @"fn",
/// Returns a function type. /// Returns a function type.
fntype, fntype,
/// @import(operand)
import,
/// Integer literal. /// Integer literal.
int, int,
/// Convert an integer value to another integer type, asserting that the destination type /// Convert an integer value to another integer type, asserting that the destination type
@ -315,6 +317,7 @@ pub const Inst = struct {
.ensure_err_payload_void, .ensure_err_payload_void,
.anyframe_type, .anyframe_type,
.bitnot, .bitnot,
.import,
=> UnOp, => UnOp,
.add, .add,
@ -489,6 +492,7 @@ pub const Inst = struct {
.error_set, .error_set,
.slice, .slice,
.slice_start, .slice_start,
.import,
=> false, => false,
.@"break", .@"break",

7
src/zir_sema.zig
View File

@ -134,6 +134,7 @@ pub fn analyzeInst(mod: *Module, scope: *Scope, old_inst: *zir.Inst) InnerError!
.error_set => return analyzeInstErrorSet(mod, scope, old_inst.castTag(.error_set).?), .error_set => return analyzeInstErrorSet(mod, scope, old_inst.castTag(.error_set).?),
.slice => return analyzeInstSlice(mod, scope, old_inst.castTag(.slice).?), .slice => return analyzeInstSlice(mod, scope, old_inst.castTag(.slice).?),
.slice_start => return analyzeInstSliceStart(mod, scope, old_inst.castTag(.slice_start).?), .slice_start => return analyzeInstSliceStart(mod, scope, old_inst.castTag(.slice_start).?),
.import => return analyzeInstImport(mod, scope, old_inst.castTag(.import).?),
} }
} }
@ -1190,6 +1191,12 @@ fn analyzeInstSliceStart(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) Inn
return mod.analyzeSlice(scope, inst.base.src, array_ptr, start, null, null); return mod.analyzeSlice(scope, inst.base.src, array_ptr, start, null, null);
} }
fn analyzeInstImport(mod: *Module, scope: *Scope, inst: *zir.Inst.UnOp) InnerError!*Inst {
const operand = try resolveConstString(mod, scope, inst.positionals.operand);
return mod.analyzeImport(scope, inst.base.src, operand);
}
fn analyzeInstShl(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerError!*Inst { fn analyzeInstShl(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerError!*Inst {
return mod.fail(scope, inst.base.src, "TODO implement analyzeInstShl", .{}); return mod.fail(scope, inst.base.src, "TODO implement analyzeInstShl", .{});
} }