diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 5e94a83a3a..79dfab50c8 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -13,28 +13,28 @@ tasks:
- test: |
cd zig/build
bin/zig test ../test/stage1/behavior.zig
- bin/zig test ../std/special/compiler_rt/index.zig
+ bin/zig test ../std/special/compiler_rt.zig
bin/zig test ../test/stage1/behavior.zig --library c
- bin/zig test ../std/special/compiler_rt/index.zig --library c
+ bin/zig test ../std/special/compiler_rt.zig --library c
bin/zig test ../test/stage1/behavior.zig --release-fast
- bin/zig test ../std/special/compiler_rt/index.zig --release-fast
+ bin/zig test ../std/special/compiler_rt.zig --release-fast
bin/zig test ../test/stage1/behavior.zig --release-fast --library c
- bin/zig test ../std/special/compiler_rt/index.zig --release-fast --library c
+ bin/zig test ../std/special/compiler_rt.zig --release-fast --library c
bin/zig test ../test/stage1/behavior.zig --release-small --library c
- bin/zig test ../std/special/compiler_rt/index.zig --release-small --library c
+ bin/zig test ../std/special/compiler_rt.zig --release-small --library c
bin/zig test ../test/stage1/behavior.zig --release-small
- bin/zig test ../std/special/compiler_rt/index.zig --release-small
+ bin/zig test ../std/special/compiler_rt.zig --release-small
bin/zig test ../test/stage1/behavior.zig --release-safe
- bin/zig test ../std/special/compiler_rt/index.zig --release-safe
+ bin/zig test ../std/special/compiler_rt.zig --release-safe
bin/zig test ../test/stage1/behavior.zig --release-safe --library c
- bin/zig test ../std/special/compiler_rt/index.zig --release-safe --library c
+ bin/zig test ../std/special/compiler_rt.zig --release-safe --library c
# TODO enable all tests
#bin/zig build --build-file ../build.zig test
# TODO integrate with the download page updater and make a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e2cb5b9d4..881f432c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,7 +442,7 @@ set(ZIG_CPP_SOURCES
set(ZIG_STD_FILES
"array_list.zig"
- "atomic/index.zig"
+ "atomic.zig"
"atomic/int.zig"
"atomic/queue.zig"
"atomic/stack.zig"
@@ -452,17 +452,17 @@ set(ZIG_STD_FILES
"buffer.zig"
"build.zig"
"build/fmt.zig"
+ "c.zig"
"c/darwin.zig"
"c/freebsd.zig"
- "c/index.zig"
"c/linux.zig"
"c/netbsd.zig"
"c/windows.zig"
"coff.zig"
+ "crypto.zig"
"crypto/blake2.zig"
"crypto/chacha20.zig"
"crypto/hmac.zig"
- "crypto/index.zig"
"crypto/md5.zig"
"crypto/poly1305.zig"
"crypto/sha1.zig"
@@ -470,8 +470,8 @@ set(ZIG_STD_FILES
"crypto/sha3.zig"
"crypto/x25519.zig"
"cstr.zig"
+ "debug.zig"
"debug/failing_allocator.zig"
- "debug/index.zig"
"dwarf.zig"
"dynamic_library.zig"
"elf.zig"
@@ -488,25 +488,25 @@ set(ZIG_STD_FILES
"event/net.zig"
"event/rwlock.zig"
"event/rwlocked.zig"
+ "fmt.zig"
+ "fmt/errol.zig"
"fmt/errol/enum3.zig"
- "fmt/errol/index.zig"
"fmt/errol/lookup.zig"
- "fmt/index.zig"
"fmt/parse_float.zig"
+ "hash.zig"
"hash/adler.zig"
"hash/crc.zig"
"hash/fnv.zig"
- "hash/index.zig"
"hash/siphash.zig"
"hash_map.zig"
"heap.zig"
- "index.zig"
"io.zig"
"io/seekable_stream.zig"
"json.zig"
"lazy_init.zig"
"linked_list.zig"
"macho.zig"
+ "math.zig"
"math/acos.zig"
"math/acosh.zig"
"math/asin.zig"
@@ -514,10 +514,11 @@ set(ZIG_STD_FILES
"math/atan.zig"
"math/atan2.zig"
"math/atanh.zig"
- "math/big/index.zig"
+ "math/big.zig"
"math/big/int.zig"
"math/cbrt.zig"
"math/ceil.zig"
+ "math/complex.zig"
"math/complex/abs.zig"
"math/complex/acos.zig"
"math/complex/acosh.zig"
@@ -530,7 +531,6 @@ set(ZIG_STD_FILES
"math/complex/cos.zig"
"math/complex/cosh.zig"
"math/complex/exp.zig"
- "math/complex/index.zig"
"math/complex/ldexp.zig"
"math/complex/log.zig"
"math/complex/pow.zig"
@@ -553,7 +553,6 @@ set(ZIG_STD_FILES
"math/frexp.zig"
"math/hypot.zig"
"math/ilogb.zig"
- "math/index.zig"
"math/inf.zig"
"math/isfinite.zig"
"math/isinf.zig"
@@ -578,50 +577,51 @@ set(ZIG_STD_FILES
"math/tanh.zig"
"math/trunc.zig"
"mem.zig"
- "meta/index.zig"
+ "meta.zig"
"meta/trait.zig"
"mutex.zig"
"net.zig"
+ "os.zig"
"os/child_process.zig"
"os/darwin.zig"
"os/darwin/errno.zig"
"os/epoch.zig"
"os/file.zig"
+ "os/freebsd.zig"
"os/freebsd/errno.zig"
- "os/freebsd/index.zig"
"os/get_app_data_dir.zig"
"os/get_user_id.zig"
- "os/index.zig"
+ "os/linux.zig"
"os/linux/arm64.zig"
"os/linux/errno.zig"
- "os/linux/index.zig"
"os/linux/vdso.zig"
"os/linux/x86_64.zig"
+ "os/netbsd.zig"
"os/netbsd/errno.zig"
- "os/netbsd/index.zig"
"os/path.zig"
"os/time.zig"
"os/uefi.zig"
+ "os/windows.zig"
"os/windows/advapi32.zig"
"os/windows/error.zig"
- "os/windows/index.zig"
"os/windows/kernel32.zig"
"os/windows/ntdll.zig"
"os/windows/ole32.zig"
"os/windows/shell32.zig"
- "os/windows/tls.zig"
"os/windows/util.zig"
"os/zen.zig"
"pdb.zig"
"priority_queue.zig"
- "rand/index.zig"
+ "rand.zig"
"rand/ziggurat.zig"
"segmented_list.zig"
"sort.zig"
"special/bootstrap.zig"
"special/bootstrap_lib.zig"
+ "special/bootstrap_windows_tls.zig"
"special/build_runner.zig"
"special/builtin.zig"
+ "special/compiler_rt.zig"
"special/compiler_rt/addXf3.zig"
"special/compiler_rt/aulldiv.zig"
"special/compiler_rt/aullrem.zig"
@@ -656,7 +656,6 @@ set(ZIG_STD_FILES
"special/compiler_rt/floatuntidf.zig"
"special/compiler_rt/floatuntisf.zig"
"special/compiler_rt/floatuntitf.zig"
- "special/compiler_rt/index.zig"
"special/compiler_rt/muloti4.zig"
"special/compiler_rt/multi3.zig"
"special/compiler_rt/truncXfYf2.zig"
@@ -674,10 +673,11 @@ set(ZIG_STD_FILES
"special/test_runner.zig"
"spinlock.zig"
"statically_initialized_mutex.zig"
+ "std.zig"
"testing.zig"
"unicode.zig"
+ "zig.zig"
"zig/ast.zig"
- "zig/index.zig"
"zig/parse.zig"
"zig/parse_string_literal.zig"
"zig/render.zig"
diff --git a/build.zig b/build.zig
index 756ec53708..6acf08a0e5 100644
--- a/build.zig
+++ b/build.zig
@@ -115,9 +115,9 @@ pub fn build(b: *Builder) !void {
test_step.dependOn(tests.addPkgTests(b, test_filter, "test/stage1/behavior.zig", "behavior", "Run the behavior tests", modes));
- test_step.dependOn(tests.addPkgTests(b, test_filter, "std/index.zig", "std", "Run the standard library tests", modes));
+ test_step.dependOn(tests.addPkgTests(b, test_filter, "std/std.zig", "std", "Run the standard library tests", modes));
- test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests", modes));
+ test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", modes));
test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
test_step.dependOn(tests.addBuildExampleTests(b, test_filter, modes));
diff --git a/doc/langref.html.in b/doc/langref.html.in
index 9dc0a31b23..b816d65289 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -6116,7 +6116,7 @@ test "main" {
{#header_close#}
{#header_open|@frameAddress#}
- {#syntax#}@frameAddress(){#endsyntax#}
+ {#syntax#}@frameAddress() usize{#endsyntax#}
This function returns the base pointer of the current stack frame.
@@ -6482,17 +6482,18 @@ test "call foo" {
{#header_close#}
{#header_open|@returnAddress#}
- {#syntax#}@returnAddress(){#endsyntax#}
+ {#syntax#}@returnAddress() usize{#endsyntax#}
- This function returns a pointer to the return address of the current stack
- frame.
+ This function returns the address of the next machine code instruction that will be executed
+ when the current function returns.
The implications of this are target specific and not consistent across
all platforms.
- This function is only valid within function scope.
+ This function is only valid within function scope. If the function gets inlined into
+ a calling function, the returned address will apply to the calling function.
{#header_close#}
{#header_open|@setAlignStack#}
@@ -6785,7 +6786,6 @@ pub const TypeId = enum {
Enum,
Union,
Fn,
- Namespace,
Block,
BoundFn,
ArgTuple,
@@ -6820,7 +6820,6 @@ pub const TypeInfo = union(TypeId) {
Enum: Enum,
Union: Union,
Fn: Fn,
- Namespace: void,
BoundFn: Fn,
ArgTuple: void,
Opaque: void,
@@ -6829,18 +6828,18 @@ pub const TypeInfo = union(TypeId) {
pub const Int = struct {
is_signed: bool,
- bits: u8,
+ bits: comptime_int,
};
pub const Float = struct {
- bits: u8,
+ bits: comptime_int,
};
pub const Pointer = struct {
size: Size,
is_const: bool,
is_volatile: bool,
- alignment: u32,
+ alignment: comptime_int,
child: type,
pub const Size = enum {
@@ -6851,7 +6850,7 @@ pub const TypeInfo = union(TypeId) {
};
pub const Array = struct {
- len: usize,
+ len: comptime_int,
child: type,
};
@@ -6863,7 +6862,7 @@ pub const TypeInfo = union(TypeId) {
pub const StructField = struct {
name: []const u8,
- offset: ?usize,
+ offset: ?comptime_int,
field_type: type,
};
@@ -6884,7 +6883,7 @@ pub const TypeInfo = union(TypeId) {
pub const Error = struct {
name: []const u8,
- value: usize,
+ value: comptime_int,
};
pub const ErrorSet = struct {
@@ -6893,7 +6892,7 @@ pub const TypeInfo = union(TypeId) {
pub const EnumField = struct {
name: []const u8,
- value: usize,
+ value: comptime_int,
};
pub const Enum = struct {
@@ -8167,17 +8166,18 @@ coding style.
-
- If {#syntax#}x{#endsyntax#} is a {#syntax#}struct{#endsyntax#} (or an alias of a {#syntax#}struct{#endsyntax#}),
- then {#syntax#}x{#endsyntax#} should be {#syntax#}TitleCase{#endsyntax#}.
+ If {#syntax#}x{#endsyntax#} is a {#syntax#}type{#endsyntax#}
+ then {#syntax#}x{#endsyntax#} should be {#syntax#}TitleCase{#endsyntax#}, unless it
+ is a {#syntax#}struct{#endsyntax#} with 0 fields and is never meant to be instantiated,
+ in which case it is considered to be a "namespace" and uses {#syntax#}snake_case{#endsyntax#}.
-
- If {#syntax#}x{#endsyntax#} otherwise identifies a type, {#syntax#}x{#endsyntax#} should have {#syntax#}snake_case{#endsyntax#}.
+ If {#syntax#}x{#endsyntax#} is callable, and {#syntax#}x{#endsyntax#}'s return type is
+ {#syntax#}type{#endsyntax#}, then {#syntax#}x{#endsyntax#} should be {#syntax#}TitleCase{#endsyntax#}.
-
- If {#syntax#}x{#endsyntax#} is callable, and {#syntax#}x{#endsyntax#}'s return type is {#syntax#}type{#endsyntax#}, then {#syntax#}x{#endsyntax#} should be {#syntax#}TitleCase{#endsyntax#}.
-
- -
- If {#syntax#}x{#endsyntax#} is otherwise callable, then {#syntax#}x{#endsyntax#} should be {#syntax#}camelCase{#endsyntax#}.
+ If {#syntax#}x{#endsyntax#} is otherwise callable, then {#syntax#}x{#endsyntax#} should
+ be {#syntax#}camelCase{#endsyntax#}.
-
Otherwise, {#syntax#}x{#endsyntax#} should be {#syntax#}snake_case{#endsyntax#}.
@@ -8203,7 +8203,9 @@ const const_name = 42;
const primitive_type_alias = f32;
const string_alias = []u8;
-const StructName = struct {};
+const StructName = struct {
+ field: i32,
+};
const StructAlias = StructName;
fn functionName(param_name: TypeName) void {
@@ -8231,7 +8233,9 @@ const xml_document =
\\
\\
;
-const XmlParser = struct {};
+const XmlParser = struct {
+ field: i32,
+};
// The initials BE (Big Endian) are just another word in Zig identifier names.
fn readU32Be() u32 {}
diff --git a/src-self-hosted/compilation.zig b/src-self-hosted/compilation.zig
index de956f1525..478edce020 100644
--- a/src-self-hosted/compilation.zig
+++ b/src-self-hosted/compilation.zig
@@ -47,7 +47,7 @@ pub const ZigCompiler = struct {
var lazy_init_targets = std.lazyInit(void);
- fn init(loop: *event.Loop) !ZigCompiler {
+ pub fn init(loop: *event.Loop) !ZigCompiler {
lazy_init_targets.get() orelse {
Target.initializeAll();
lazy_init_targets.resolve();
@@ -533,7 +533,7 @@ pub const Compilation = struct {
const basename = std.os.path.basename(root_src);
comp.root_package = try Package.create(comp.arena(), dirname, basename);
- comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "index.zig");
+ comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "std.zig");
try comp.root_package.add("std", comp.std_package);
} else {
comp.root_package = try Package.create(comp.arena(), ".", "");
diff --git a/src-self-hosted/introspect.zig b/src-self-hosted/introspect.zig
index 0a7f63b4f1..8f859a82ce 100644
--- a/src-self-hosted/introspect.zig
+++ b/src-self-hosted/introspect.zig
@@ -11,7 +11,7 @@ pub fn testZigInstallPrefix(allocator: *mem.Allocator, test_path: []const u8) ![
const test_zig_dir = try os.path.join(allocator, [][]const u8{ test_path, "lib", "zig" });
errdefer allocator.free(test_zig_dir);
- const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "index.zig" });
+ const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "std.zig" });
defer allocator.free(test_index_file);
var file = try os.File.openRead(test_index_file);
diff --git a/src-self-hosted/type.zig b/src-self-hosted/type.zig
index 7d611bb787..4c9fb58a18 100644
--- a/src-self-hosted/type.zig
+++ b/src-self-hosted/type.zig
@@ -39,7 +39,6 @@ pub const Type = struct {
Id.ErrorSet => @fieldParentPtr(ErrorSet, "base", base).destroy(comp),
Id.Enum => @fieldParentPtr(Enum, "base", base).destroy(comp),
Id.Union => @fieldParentPtr(Union, "base", base).destroy(comp),
- Id.Namespace => @fieldParentPtr(Namespace, "base", base).destroy(comp),
Id.BoundFn => @fieldParentPtr(BoundFn, "base", base).destroy(comp),
Id.ArgTuple => @fieldParentPtr(ArgTuple, "base", base).destroy(comp),
Id.Opaque => @fieldParentPtr(Opaque, "base", base).destroy(comp),
@@ -73,7 +72,6 @@ pub const Type = struct {
Id.ErrorSet => return @fieldParentPtr(ErrorSet, "base", base).getLlvmType(allocator, llvm_context),
Id.Enum => return @fieldParentPtr(Enum, "base", base).getLlvmType(allocator, llvm_context),
Id.Union => return @fieldParentPtr(Union, "base", base).getLlvmType(allocator, llvm_context),
- Id.Namespace => unreachable,
Id.BoundFn => return @fieldParentPtr(BoundFn, "base", base).getLlvmType(allocator, llvm_context),
Id.ArgTuple => unreachable,
Id.Opaque => return @fieldParentPtr(Opaque, "base", base).getLlvmType(allocator, llvm_context),
@@ -89,7 +87,6 @@ pub const Type = struct {
Id.ComptimeInt,
Id.Undefined,
Id.Null,
- Id.Namespace,
Id.BoundFn,
Id.ArgTuple,
Id.Opaque,
@@ -123,7 +120,6 @@ pub const Type = struct {
Id.ComptimeInt,
Id.Undefined,
Id.Null,
- Id.Namespace,
Id.BoundFn,
Id.ArgTuple,
Id.Opaque,
@@ -1020,14 +1016,6 @@ pub const Type = struct {
}
};
- pub const Namespace = struct {
- base: Type,
-
- pub fn destroy(self: *Namespace, comp: *Compilation) void {
- comp.gpa().destroy(self);
- }
- };
-
pub const BoundFn = struct {
base: Type,
diff --git a/src/all_types.hpp b/src/all_types.hpp
index 902c6e13c2..9501e9d5e3 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -21,7 +21,6 @@
#include "libc_installation.hpp"
struct AstNode;
-struct ImportTableEntry;
struct ZigFn;
struct Scope;
struct ScopeBlock;
@@ -317,7 +316,6 @@ struct ConstExprValue {
ConstUnionValue x_union;
ConstArrayValue x_array;
ConstPtrValue x_ptr;
- ImportTableEntry *x_import;
ConstArgTuple x_arg_tuple;
// populated if special == ConstValSpecialRuntime
@@ -369,10 +367,8 @@ struct Tld {
VisibMod visib_mod;
AstNode *source_node;
- ImportTableEntry *import;
+ ZigType *import;
Scope *parent_scope;
- // set this flag temporarily to detect infinite loops
- bool dep_loop_flag;
TldResolution resolution;
};
@@ -382,6 +378,7 @@ struct TldVar {
ZigVar *var;
Buf *extern_lib_name;
Buf *section_name;
+ bool analyzing_type; // flag to detect dependency loops
};
struct TldFn {
@@ -700,7 +697,7 @@ struct AstNodeUse {
AstNode *expr;
TldResolution resolution;
- ConstExprValue *value;
+ ConstExprValue *using_namespace_value;
};
struct AstNodeIfBoolExpr {
@@ -937,7 +934,7 @@ struct AstNode {
enum NodeType type;
size_t line;
size_t column;
- ImportTableEntry *owner;
+ ZigType *owner;
union {
AstNodeFnDef fn_def;
AstNodeFnProto fn_proto;
@@ -1075,12 +1072,32 @@ enum ResolveStatus {
ResolveStatusSizeKnown,
};
+struct ZigPackage {
+ Buf root_src_dir;
+ Buf root_src_path; // relative to root_src_dir
+ Buf pkg_path; // a.b.c.d which follows the package dependency chain from the root package
+
+ // reminder: hash tables must be initialized before use
+ HashMap package_table;
+};
+
+// Stuff that only applies to a struct which is the implicit root struct of a file
+struct RootStruct {
+ ZigPackage *package;
+ Buf *path; // relative to root_package->root_src_dir
+ ZigList *line_offsets;
+ Buf *source_code;
+ AstNode *c_import_node;
+ ZigLLVMDIFile *di_file;
+};
+
struct ZigTypeStruct {
AstNode *decl_node;
TypeStructField *fields;
ScopeDecls *decls_scope;
uint64_t size_bytes;
HashMap fields_by_name;
+ RootStruct *root_struct;
uint32_t src_field_count;
uint32_t gen_field_count;
@@ -1232,7 +1249,6 @@ enum ZigTypeId {
ZigTypeIdEnum,
ZigTypeIdUnion,
ZigTypeIdFn,
- ZigTypeIdNamespace,
ZigTypeIdBoundFn,
ZigTypeIdArgTuple,
ZigTypeIdOpaque,
@@ -1246,6 +1262,10 @@ enum OnePossibleValue {
OnePossibleValueYes,
};
+struct ZigTypeOpaque {
+ Buf *bare_name;
+};
+
struct ZigType {
ZigTypeId id;
Buf name;
@@ -1268,6 +1288,7 @@ struct ZigType {
ZigTypeBoundFn bound_fn;
ZigTypePromise promise;
ZigTypeVector vector;
+ ZigTypeOpaque opaque;
} data;
// use these fields to make sure we don't duplicate type table entries for the same type
@@ -1285,29 +1306,6 @@ struct ZigType {
bool gen_h_loop_flag;
};
-struct PackageTableEntry {
- Buf root_src_dir;
- Buf root_src_path; // relative to root_src_dir
-
- // reminder: hash tables must be initialized before use
- HashMap package_table;
-};
-
-struct ImportTableEntry {
- AstNode *root;
- Buf *path; // relative to root_package->root_src_dir
- PackageTableEntry *package;
- ZigLLVMDIFile *di_file;
- Buf *source_code;
- ZigList *line_offsets;
- ScopeDecls *decls_scope;
- AstNode *c_import_node;
- bool any_imports_failed;
- bool scanned;
-
- ZigList use_decls;
-};
-
enum FnAnalState {
FnAnalStateReady,
FnAnalStateProbing,
@@ -1670,7 +1668,7 @@ struct CodeGen {
LLVMValueRef return_err_fn;
// reminder: hash tables must be initialized before use
- HashMap import_table;
+ HashMap import_table;
HashMap builtin_fn_table;
HashMap primitive_type_table;
HashMap type_table;
@@ -1684,8 +1682,6 @@ struct CodeGen {
HashMap string_literals_table;
HashMap type_info_cache;
- ZigList import_queue;
- size_t import_queue_index;
ZigList resolve_queue;
size_t resolve_queue_index;
ZigList use_queue;
@@ -1699,14 +1695,14 @@ struct CodeGen {
ZigList errors_by_index;
size_t largest_err_name_len;
- PackageTableEntry *std_package;
- PackageTableEntry *panic_package;
- PackageTableEntry *test_runner_package;
- PackageTableEntry *compile_var_package;
- ImportTableEntry *compile_var_import;
- ImportTableEntry *root_import;
- ImportTableEntry *bootstrap_import;
- ImportTableEntry *test_runner_import;
+ ZigPackage *std_package;
+ ZigPackage *panic_package;
+ ZigPackage *test_runner_package;
+ ZigPackage *compile_var_package;
+ ZigType *compile_var_import;
+ ZigType *root_import;
+ ZigType *bootstrap_import;
+ ZigType *test_runner_import;
struct {
ZigType *entry_bool;
@@ -1731,7 +1727,6 @@ struct CodeGen {
ZigType *entry_unreachable;
ZigType *entry_type;
ZigType *entry_invalid;
- ZigType *entry_namespace;
ZigType *entry_block;
ZigType *entry_num_lit_int;
ZigType *entry_num_lit_float;
@@ -1851,7 +1846,7 @@ struct CodeGen {
Buf *root_out_name;
Buf *test_filter;
Buf *test_name_prefix;
- PackageTableEntry *root_package;
+ ZigPackage *root_package;
Buf *zig_lib_dir;
Buf *zig_std_dir;
@@ -1945,13 +1940,17 @@ struct ScopeDecls {
Scope base;
HashMap decl_table;
- bool safety_off;
+ ZigList use_decls;
AstNode *safety_set_node;
- bool fast_math_on;
AstNode *fast_math_set_node;
- ImportTableEntry *import;
+ ZigType *import;
// If this is a scope from a container, this is the type entry, otherwise null
ZigType *container_type;
+ Buf *bare_name;
+
+ bool safety_off;
+ bool fast_math_on;
+ bool any_imports_failed;
};
// This scope comes from a block expression in user code.
@@ -3463,7 +3462,8 @@ static const size_t err_union_err_index = 0;
static const size_t err_union_payload_index = 1;
// TODO call graph analysis to find out what this number needs to be for every function
-static const size_t stack_trace_ptr_count = 30;
+// MUST BE A POWER OF TWO.
+static const size_t stack_trace_ptr_count = 32;
// these belong to the async function
#define RETURN_ADDRESSES_FIELD_NAME "return_addresses"
@@ -3476,6 +3476,8 @@ static const size_t stack_trace_ptr_count = 30;
#define ERR_RET_TRACE_PTR_FIELD_NAME "err_ret_trace_ptr"
#define RESULT_PTR_FIELD_NAME "result_ptr"
+#define NAMESPACE_SEP_CHAR '.'
+#define NAMESPACE_SEP_STR "."
enum FloatMode {
FloatModeStrict,
@@ -3507,7 +3509,7 @@ struct FnWalkTypes {
};
struct FnWalkVars {
- ImportTableEntry *import;
+ ZigType *import;
LLVMValueRef llvm_fn;
ZigFn *fn;
ZigVar *var;
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 3ceda41934..366bb2963e 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -28,10 +28,14 @@ static Error ATTRIBUTE_MUST_USE resolve_enum_zero_bits(CodeGen *g, ZigType *enum
static Error ATTRIBUTE_MUST_USE resolve_union_zero_bits(CodeGen *g, ZigType *union_type);
static void analyze_fn_body(CodeGen *g, ZigFn *fn_table_entry);
-static ErrorMsg *add_error_note_token(CodeGen *g, ErrorMsg *parent_msg, ImportTableEntry *owner, Token *token,
- Buf *msg)
-{
- if (owner->c_import_node != nullptr) {
+static bool is_top_level_struct(ZigType *import) {
+ return import->id == ZigTypeIdStruct && import->data.structure.root_struct != nullptr;
+}
+
+static ErrorMsg *add_error_note_token(CodeGen *g, ErrorMsg *parent_msg, ZigType *owner, Token *token, Buf *msg) {
+ assert(is_top_level_struct(owner));
+ RootStruct *root_struct = owner->data.structure.root_struct;
+ if (root_struct->c_import_node != nullptr) {
// if this happens, then translate_c generated code that
// failed semantic analysis, which isn't supposed to happen
@@ -46,18 +50,20 @@ static ErrorMsg *add_error_note_token(CodeGen *g, ErrorMsg *parent_msg, ImportTa
return note;
}
- ErrorMsg *err = err_msg_create_with_line(owner->path, token->start_line, token->start_column,
- owner->source_code, owner->line_offsets, msg);
+ ErrorMsg *err = err_msg_create_with_line(root_struct->path, token->start_line, token->start_column,
+ root_struct->source_code, root_struct->line_offsets, msg);
err_msg_add_note(parent_msg, err);
return err;
}
-ErrorMsg *add_token_error(CodeGen *g, ImportTableEntry *owner, Token *token, Buf *msg) {
- if (owner->c_import_node != nullptr) {
+ErrorMsg *add_token_error(CodeGen *g, ZigType *owner, Token *token, Buf *msg) {
+ assert(is_top_level_struct(owner));
+ RootStruct *root_struct = owner->data.structure.root_struct;
+ if (root_struct->c_import_node != nullptr) {
// if this happens, then translate_c generated code that
// failed semantic analysis, which isn't supposed to happen
- ErrorMsg *err = add_node_error(g, owner->c_import_node,
+ ErrorMsg *err = add_node_error(g, root_struct->c_import_node,
buf_sprintf("compiler bug: @cImport generated invalid zig code"));
add_error_note_token(g, err, owner, token, msg);
@@ -65,8 +71,8 @@ ErrorMsg *add_token_error(CodeGen *g, ImportTableEntry *owner, Token *token, Buf
g->errors.append(err);
return err;
}
- ErrorMsg *err = err_msg_create_with_line(owner->path, token->start_line, token->start_column,
- owner->source_code, owner->line_offsets, msg);
+ ErrorMsg *err = err_msg_create_with_line(root_struct->path, token->start_line, token->start_column,
+ root_struct->source_code, root_struct->line_offsets, msg);
g->errors.append(err);
return err;
@@ -114,13 +120,16 @@ void init_scope(CodeGen *g, Scope *dest, ScopeId id, AstNode *source_node, Scope
dest->parent = parent;
}
-ScopeDecls *create_decls_scope(CodeGen *g, AstNode *node, Scope *parent, ZigType *container_type, ImportTableEntry *import) {
+static ScopeDecls *create_decls_scope(CodeGen *g, AstNode *node, Scope *parent, ZigType *container_type,
+ ZigType *import, Buf *bare_name)
+{
assert(node == nullptr || node->type == NodeTypeContainerDecl || node->type == NodeTypeFnCallExpr);
ScopeDecls *scope = allocate(1);
init_scope(g, &scope->base, ScopeIdDecls, node, parent);
scope->decl_table.init(4);
scope->container_type = container_type;
scope->import = import;
+ scope->bare_name = bare_name;
return scope;
}
@@ -207,11 +216,11 @@ Scope *create_coro_prelude_scope(CodeGen *g, AstNode *node, Scope *parent) {
return &scope->base;
}
-ImportTableEntry *get_scope_import(Scope *scope) {
+ZigType *get_scope_import(Scope *scope) {
while (scope) {
if (scope->id == ScopeIdDecls) {
ScopeDecls *decls_scope = (ScopeDecls *)scope;
- assert(decls_scope->import);
+ assert(is_top_level_struct(decls_scope->import));
return decls_scope->import;
}
scope = scope->parent;
@@ -219,9 +228,12 @@ ImportTableEntry *get_scope_import(Scope *scope) {
zig_unreachable();
}
-static ZigType *new_container_type_entry(CodeGen *g, ZigTypeId id, AstNode *source_node, Scope *parent_scope) {
+static ZigType *new_container_type_entry(CodeGen *g, ZigTypeId id, AstNode *source_node, Scope *parent_scope,
+ Buf *bare_name)
+{
ZigType *entry = new_type_table_entry(id);
- *get_container_scope_ptr(entry) = create_decls_scope(g, source_node, parent_scope, entry, get_scope_import(parent_scope));
+ *get_container_scope_ptr(entry) = create_decls_scope(g, source_node, parent_scope, entry,
+ get_scope_import(parent_scope), bare_name);
return entry;
}
@@ -261,7 +273,6 @@ AstNode *type_decl_node(ZigType *type_entry) {
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -323,7 +334,6 @@ bool type_is_resolved(ZigType *type_entry, ResolveStatus status) {
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -616,7 +626,7 @@ ZigType *get_optional_type(CodeGen *g, ZigType *child_type) {
if (child_type->zero_bits) {
entry->type_ref = LLVMInt1Type();
entry->di_type = g->builtin_types.entry_bool->di_type;
- } else if (type_is_codegen_pointer(child_type) || child_type->id == ZigTypeIdErrorSet) {
+ } else if (type_is_non_optional_pointer(child_type) || child_type->id == ZigTypeIdErrorSet) {
assert(child_type->di_type);
// this is an optimization but also is necessary for calling C
// functions where all pointers are maybe pointers
@@ -1005,21 +1015,22 @@ ZigType *get_slice_type(CodeGen *g, ZigType *ptr_type) {
return entry;
}
-ZigType *get_opaque_type(CodeGen *g, Scope *scope, AstNode *source_node, const char *name) {
+ZigType *get_opaque_type(CodeGen *g, Scope *scope, AstNode *source_node, const char *full_name, Buf *bare_name) {
ZigType *entry = new_type_table_entry(ZigTypeIdOpaque);
- buf_init_from_str(&entry->name, name);
+ buf_init_from_str(&entry->name, full_name);
- ImportTableEntry *import = scope ? get_scope_import(scope) : nullptr;
+ ZigType *import = scope ? get_scope_import(scope) : nullptr;
unsigned line = source_node ? (unsigned)(source_node->line + 1) : 0;
entry->type_ref = LLVMInt8Type();
entry->di_type = ZigLLVMCreateDebugForwardDeclType(g->dbuilder,
- ZigLLVMTag_DW_structure_type(), buf_ptr(&entry->name),
- import ? ZigLLVMFileToScope(import->di_file) : nullptr,
- import ? import->di_file : nullptr,
+ ZigLLVMTag_DW_structure_type(), full_name,
+ import ? ZigLLVMFileToScope(import->data.structure.root_struct->di_file) : nullptr,
+ import ? import->data.structure.root_struct->di_file : nullptr,
line);
entry->zero_bits = false;
+ entry->data.opaque.bare_name = bare_name;
return entry;
}
@@ -1288,11 +1299,32 @@ static ZigTypeId container_to_type(ContainerKind kind) {
zig_unreachable();
}
+// This is like get_partial_container_type except it's for the implicit root struct of files.
+ZigType *get_root_container_type(CodeGen *g, const char *full_name, Buf *bare_name,
+ RootStruct *root_struct)
+{
+ ZigType *entry = new_type_table_entry(ZigTypeIdStruct);
+ entry->data.structure.decls_scope = create_decls_scope(g, nullptr, nullptr, entry, entry, bare_name);
+ entry->data.structure.root_struct = root_struct;
+ entry->data.structure.layout = ContainerLayoutAuto;
+ entry->type_ref = LLVMStructCreateNamed(LLVMGetGlobalContext(), full_name);
+
+ size_t line = 0; // root therefore first line
+ unsigned dwarf_kind = ZigLLVMTag_DW_structure_type();
+
+ entry->di_type = ZigLLVMCreateReplaceableCompositeType(g->dbuilder,
+ dwarf_kind, full_name,
+ ZigLLVMFileToScope(root_struct->di_file), root_struct->di_file, (unsigned)(line + 1));
+
+ buf_init_from_str(&entry->name, full_name);
+ return entry;
+}
+
ZigType *get_partial_container_type(CodeGen *g, Scope *scope, ContainerKind kind,
- AstNode *decl_node, const char *name, ContainerLayout layout)
+ AstNode *decl_node, const char *full_name, Buf *bare_name, ContainerLayout layout)
{
ZigTypeId type_id = container_to_type(kind);
- ZigType *entry = new_container_type_entry(g, type_id, decl_node, scope);
+ ZigType *entry = new_container_type_entry(g, type_id, decl_node, scope, bare_name);
switch (kind) {
case ContainerKindStruct:
@@ -1312,13 +1344,14 @@ ZigType *get_partial_container_type(CodeGen *g, Scope *scope, ContainerKind kind
size_t line = decl_node ? decl_node->line : 0;
unsigned dwarf_kind = ZigLLVMTag_DW_structure_type();
- ImportTableEntry *import = get_scope_import(scope);
- entry->type_ref = LLVMStructCreateNamed(LLVMGetGlobalContext(), name);
+ ZigType *import = get_scope_import(scope);
+ entry->type_ref = LLVMStructCreateNamed(LLVMGetGlobalContext(), full_name);
entry->di_type = ZigLLVMCreateReplaceableCompositeType(g->dbuilder,
- dwarf_kind, name,
- ZigLLVMFileToScope(import->di_file), import->di_file, (unsigned)(line + 1));
+ dwarf_kind, full_name,
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
+ import->data.structure.root_struct->di_file, (unsigned)(line + 1));
- buf_init_from_str(&entry->name, name);
+ buf_init_from_str(&entry->name, full_name);
return entry;
}
@@ -1459,7 +1492,6 @@ static Error emit_error_unless_type_allowed_in_packed_struct(CodeGen *g, ZigType
case ZigTypeIdNull:
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -1547,7 +1579,6 @@ bool type_allowed_in_extern(CodeGen *g, ZigType *type_entry) {
case ZigTypeIdNull:
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -1706,7 +1737,6 @@ static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_sc
return g->builtin_types.entry_invalid;
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdMetaType:
case ZigTypeIdVoid:
@@ -1801,7 +1831,6 @@ static ZigType *analyze_fn_type(CodeGen *g, AstNode *proto_node, Scope *child_sc
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdMetaType:
case ZigTypeIdUnreachable:
@@ -1880,7 +1909,9 @@ static Error resolve_enum_type(CodeGen *g, ZigType *enum_type) {
if (!enum_type->data.enumeration.reported_infinite_err) {
enum_type->data.enumeration.is_invalid = true;
enum_type->data.enumeration.reported_infinite_err = true;
- add_node_error(g, decl_node, buf_sprintf("enum '%s' contains itself", buf_ptr(&enum_type->name)));
+ ErrorMsg *msg = add_node_error(g, decl_node,
+ buf_sprintf("enum '%s' contains itself", buf_ptr(&enum_type->name)));
+ emit_error_notes_for_ref_stack(g, msg);
}
return ErrorSemanticAnalyzeFail;
}
@@ -1895,7 +1926,7 @@ static Error resolve_enum_type(CodeGen *g, ZigType *enum_type) {
ZigLLVMDIEnumerator **di_enumerators = allocate(field_count);
Scope *scope = &enum_type->data.enumeration.decls_scope->base;
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
// set temporary flag
enum_type->data.enumeration.embedded_in_current = true;
@@ -1924,9 +1955,9 @@ static Error resolve_enum_type(CodeGen *g, ZigType *enum_type) {
ZigLLVMDIType **di_root_members = nullptr;
size_t debug_member_count = 0;
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
buf_ptr(&enum_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
0, nullptr, di_root_members, (int)debug_member_count, 0, nullptr, "");
@@ -1942,8 +1973,8 @@ static Error resolve_enum_type(CodeGen *g, ZigType *enum_type) {
uint64_t tag_debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, tag_int_type->type_ref);
uint64_t tag_debug_align_in_bits = 8*LLVMABIAlignmentOfType(g->target_data_ref, tag_int_type->type_ref);
ZigLLVMDIType *tag_di_type = ZigLLVMCreateDebugEnumerationType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file), buf_ptr(&enum_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file), buf_ptr(&enum_type->name),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
tag_debug_size_in_bits,
tag_debug_align_in_bits,
di_enumerators, field_count,
@@ -2051,8 +2082,9 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
if (struct_type->data.structure.resolve_loop_flag) {
if (struct_type->data.structure.resolve_status != ResolveStatusInvalid) {
struct_type->data.structure.resolve_status = ResolveStatusInvalid;
- add_node_error(g, decl_node,
+ ErrorMsg *msg = add_node_error(g, decl_node,
buf_sprintf("struct '%s' contains itself", buf_ptr(&struct_type->name)));
+ emit_error_notes_for_ref_stack(g, msg);
}
return ErrorSemanticAnalyzeFail;
}
@@ -2159,15 +2191,15 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
if (struct_type->zero_bits) {
struct_type->type_ref = LLVMVoidType();
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
uint64_t debug_size_in_bits = 0;
uint64_t debug_align_in_bits = 0;
ZigLLVMDIType **di_element_types = nullptr;
size_t debug_field_count = 0;
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
buf_ptr(&struct_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
0, nullptr, di_element_types, (int)debug_field_count, 0, nullptr, "");
@@ -2191,7 +2223,7 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
ZigLLVMDIType **di_element_types = allocate(debug_field_count);
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
size_t debug_field_index = 0;
for (size_t i = 0; i < field_count; i += 1) {
AstNode *field_node = decl_node->data.container_decl.fields.at(i);
@@ -2234,7 +2266,7 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
}
di_element_types[debug_field_index] = ZigLLVMCreateDebugMemberType(g->dbuilder,
ZigLLVMTypeToScope(struct_type->di_type), buf_ptr(type_struct_field->name),
- import->di_file, (unsigned)(field_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(field_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
debug_offset_in_bits,
@@ -2247,9 +2279,9 @@ static Error resolve_struct_type(CodeGen *g, ZigType *struct_type) {
uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, struct_type->type_ref);
uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(g->target_data_ref, struct_type->type_ref);
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
buf_ptr(&struct_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
0, nullptr, di_element_types, (int)debug_field_count, 0, nullptr, "");
@@ -2276,7 +2308,9 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
if (!union_type->data.unionation.reported_infinite_err) {
union_type->data.unionation.reported_infinite_err = true;
union_type->data.unionation.is_invalid = true;
- add_node_error(g, decl_node, buf_sprintf("union '%s' contains itself", buf_ptr(&union_type->name)));
+ ErrorMsg *msg = add_node_error(g, decl_node,
+ buf_sprintf("union '%s' contains itself", buf_ptr(&union_type->name)));
+ emit_error_notes_for_ref_stack(g, msg);
}
return ErrorSemanticAnalyzeFail;
}
@@ -2298,7 +2332,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
uint64_t biggest_size_in_bits = 0;
Scope *scope = &union_type->data.unionation.decls_scope->base;
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
// set temporary flag
union_type->data.unionation.embedded_in_current = true;
@@ -2325,7 +2359,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
union_inner_di_types[union_field->gen_index] = ZigLLVMCreateDebugMemberType(g->dbuilder,
ZigLLVMTypeToScope(union_type->di_type), buf_ptr(union_field->enum_field->name),
- import->di_file, (unsigned)(field_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(field_node->line + 1),
store_size_in_bits,
abi_align_in_bits,
0,
@@ -2358,9 +2392,9 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
ZigLLVMDIType **di_root_members = nullptr;
size_t debug_member_count = 0;
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugUnionType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
buf_ptr(&union_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
0, di_root_members, (int)debug_member_count, 0, "");
@@ -2396,8 +2430,8 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
// create debug type for union
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugUnionType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file), buf_ptr(&union_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file), buf_ptr(&union_type->name),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
biggest_size_in_bits, biggest_align_in_bits, 0, union_inner_di_types,
gen_field_count, 0, "");
@@ -2452,7 +2486,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
// create debug type for union
ZigLLVMDIType *union_di_type = ZigLLVMCreateDebugUnionType(g->dbuilder,
ZigLLVMTypeToScope(union_type->di_type), "AnonUnion",
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
biggest_size_in_bits, biggest_align_in_bits, 0, union_inner_di_types,
gen_field_count, 0, "");
@@ -2463,7 +2497,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
ZigLLVMDIType *union_member_di_type = ZigLLVMCreateDebugMemberType(g->dbuilder,
ZigLLVMTypeToScope(union_type->di_type), "payload",
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
biggest_size_in_bits,
biggest_align_in_bits,
union_offset_in_bits,
@@ -2474,7 +2508,7 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
ZigLLVMDIType *tag_member_di_type = ZigLLVMCreateDebugMemberType(g->dbuilder,
ZigLLVMTypeToScope(union_type->di_type), "tag",
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
tag_debug_size_in_bits,
tag_debug_align_in_bits,
tag_offset_in_bits,
@@ -2487,9 +2521,9 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) {
uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, union_type->type_ref);
uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(g->target_data_ref, union_type->type_ref);
ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file),
buf_ptr(&union_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
debug_size_in_bits,
debug_align_in_bits,
0, nullptr, di_root_members, 2, 0, nullptr, "");
@@ -2507,8 +2541,9 @@ static Error resolve_enum_zero_bits(CodeGen *g, ZigType *enum_type) {
return ErrorNone;
if (enum_type->data.enumeration.zero_bits_loop_flag) {
- add_node_error(g, enum_type->data.enumeration.decl_node,
+ ErrorMsg *msg = add_node_error(g, enum_type->data.enumeration.decl_node,
buf_sprintf("'%s' depends on itself", buf_ptr(&enum_type->name)));
+ emit_error_notes_for_ref_stack(g, msg);
enum_type->data.enumeration.is_invalid = true;
return ErrorSemanticAnalyzeFail;
}
@@ -2780,8 +2815,9 @@ static Error resolve_struct_alignment(CodeGen *g, ZigType *struct_type) {
if (struct_type->data.structure.resolve_loop_flag) {
if (struct_type->data.structure.resolve_status != ResolveStatusInvalid) {
struct_type->data.structure.resolve_status = ResolveStatusInvalid;
- add_node_error(g, decl_node,
+ ErrorMsg *msg = add_node_error(g, decl_node,
buf_sprintf("struct '%s' contains itself", buf_ptr(&struct_type->name)));
+ emit_error_notes_for_ref_stack(g, msg);
}
return ErrorSemanticAnalyzeFail;
}
@@ -3185,15 +3221,15 @@ static Error resolve_union_zero_bits(CodeGen *g, ZigType *union_type) {
}
if (create_enum_type) {
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
uint64_t tag_debug_size_in_bits = tag_type->zero_bits ? 0 :
8*LLVMStoreSizeOfType(g->target_data_ref, tag_type->type_ref);
uint64_t tag_debug_align_in_bits = tag_type->zero_bits ? 0 :
8*LLVMABIAlignmentOfType(g->target_data_ref, tag_type->type_ref);
// TODO get a more accurate debug scope
ZigLLVMDIType *tag_di_type = ZigLLVMCreateDebugEnumerationType(g->dbuilder,
- ZigLLVMFileToScope(import->di_file), buf_ptr(&tag_type->name),
- import->di_file, (unsigned)(decl_node->line + 1),
+ ZigLLVMFileToScope(import->data.structure.root_struct->di_file), buf_ptr(&tag_type->name),
+ import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1),
tag_debug_size_in_bits, tag_debug_align_in_bits, di_enumerators, field_count,
tag_type->di_type, "");
tag_type->di_type = tag_di_type;
@@ -3210,27 +3246,16 @@ static Error resolve_union_zero_bits(CodeGen *g, ZigType *union_type) {
return ErrorNone;
}
-static void get_fully_qualified_decl_name_internal(Buf *buf, Scope *scope, uint8_t sep) {
- if (!scope)
- return;
-
- if (scope->id == ScopeIdDecls) {
- get_fully_qualified_decl_name_internal(buf, scope->parent, sep);
-
- ScopeDecls *scope_decls = (ScopeDecls *)scope;
- if (scope_decls->container_type) {
- buf_append_buf(buf, &scope_decls->container_type->name);
- buf_append_char(buf, sep);
- }
- return;
- }
-
- get_fully_qualified_decl_name_internal(buf, scope->parent, sep);
-}
-
-static void get_fully_qualified_decl_name(Buf *buf, Tld *tld, uint8_t sep) {
+static void get_fully_qualified_decl_name(Buf *buf, Tld *tld) {
buf_resize(buf, 0);
- get_fully_qualified_decl_name_internal(buf, tld->parent_scope, sep);
+
+ Scope *scope = tld->parent_scope;
+ while (scope->id != ScopeIdDecls) {
+ scope = scope->parent;
+ }
+ ScopeDecls *decls_scope = reinterpret_cast(scope);
+ buf_append_buf(buf, &decls_scope->container_type->name);
+ if (buf_len(buf) != 0) buf_append_char(buf, NAMESPACE_SEP_CHAR);
buf_append_buf(buf, tld->name);
}
@@ -3265,7 +3290,7 @@ static bool scope_is_root_decls(Scope *scope) {
while (scope) {
if (scope->id == ScopeIdDecls) {
ScopeDecls *scope_decls = (ScopeDecls *)scope;
- return (scope_decls->container_type == nullptr);
+ return is_top_level_struct(scope_decls->container_type);
}
scope = scope->parent;
}
@@ -3281,7 +3306,7 @@ void typecheck_panic_fn(CodeGen *g, TldFn *tld_fn, ZigFn *panic_fn) {
AstNode *fake_decl = allocate(1);
*fake_decl = *panic_fn->proto_node;
fake_decl->type = NodeTypeSymbol;
- fake_decl->data.symbol_expr.symbol = &panic_fn->symbol_name;
+ fake_decl->data.symbol_expr.symbol = tld_fn->base.name;
// call this for the side effects of casting to panic_fn_type
analyze_const_value(g, tld_fn->base.parent_scope, fake_decl, panic_fn_type, nullptr);
@@ -3326,7 +3351,7 @@ void add_fn_export(CodeGen *g, ZigFn *fn_table_entry, Buf *symbol_name, GlobalLi
}
static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
- ImportTableEntry *import = tld_fn->base.import;
+ ZigType *import = tld_fn->base.import;
AstNode *source_node = tld_fn->base.source_node;
if (source_node->type == NodeTypeFnProto) {
AstNodeFnProto *fn_proto = &source_node->data.fn_proto;
@@ -3334,16 +3359,21 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
AstNode *fn_def_node = fn_proto->fn_def_node;
ZigFn *fn_table_entry = create_fn(g, source_node);
- get_fully_qualified_decl_name(&fn_table_entry->symbol_name, &tld_fn->base, '_');
+ tld_fn->fn_entry = fn_table_entry;
+
+ bool is_extern = (fn_table_entry->body_node == nullptr);
+ if (fn_proto->is_export || is_extern) {
+ buf_init_from_buf(&fn_table_entry->symbol_name, tld_fn->base.name);
+ } else {
+ get_fully_qualified_decl_name(&fn_table_entry->symbol_name, &tld_fn->base);
+ }
if (fn_proto->is_export) {
bool ccc = (fn_proto->cc == CallingConventionUnspecified || fn_proto->cc == CallingConventionC);
add_fn_export(g, fn_table_entry, &fn_table_entry->symbol_name, GlobalLinkageIdStrong, ccc);
}
- tld_fn->fn_entry = fn_table_entry;
-
- if (fn_table_entry->body_node) {
+ if (!is_extern) {
fn_table_entry->fndef_scope = create_fndef_scope(g,
fn_table_entry->body_node, tld_fn->base.parent_scope, fn_table_entry);
@@ -3382,12 +3412,12 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
}
if (scope_is_root_decls(tld_fn->base.parent_scope) &&
- (import == g->root_import || import->package == g->panic_package))
+ (import == g->root_import || import->data.structure.root_struct->package == g->panic_package))
{
- if (g->have_pub_main && buf_eql_str(&fn_table_entry->symbol_name, "main")) {
+ if (g->have_pub_main && buf_eql_str(tld_fn->base.name, "main")) {
g->main_fn = fn_table_entry;
- } else if ((import->package == g->panic_package || g->have_pub_panic) &&
- buf_eql_str(&fn_table_entry->symbol_name, "panic"))
+ } else if ((import->data.structure.root_struct->package == g->panic_package || g->have_pub_panic) &&
+ buf_eql_str(tld_fn->base.name, "panic"))
{
g->panic_fn = fn_table_entry;
g->panic_tld_fn = tld_fn;
@@ -3396,7 +3426,7 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
} else if (source_node->type == NodeTypeTestDecl) {
ZigFn *fn_table_entry = create_fn_raw(g, FnInlineAuto);
- get_fully_qualified_decl_name(&fn_table_entry->symbol_name, &tld_fn->base, '_');
+ get_fully_qualified_decl_name(&fn_table_entry->symbol_name, &tld_fn->base);
tld_fn->fn_entry = fn_table_entry;
@@ -3473,8 +3503,8 @@ static void preview_test_decl(CodeGen *g, AstNode *node, ScopeDecls *decls_scope
if (!g->is_test_build)
return;
- ImportTableEntry *import = get_scope_import(&decls_scope->base);
- if (import->package != g->root_package)
+ ZigType *import = get_scope_import(&decls_scope->base);
+ if (import->data.structure.root_struct->package != g->root_package)
return;
Buf *decl_name_buf = node->data.test_decl.name;
@@ -3511,8 +3541,8 @@ void init_tld(Tld *tld, TldId id, Buf *name, VisibMod visib_mod, AstNode *source
}
void update_compile_var(CodeGen *g, Buf *name, ConstExprValue *value) {
- Tld *tld = g->compile_var_import->decls_scope->decl_table.get(name);
- resolve_top_level_decl(g, tld, false, tld->source_node);
+ Tld *tld = get_container_scope(g->compile_var_import)->decl_table.get(name);
+ resolve_top_level_decl(g, tld, tld->source_node);
assert(tld->id == TldIdVar);
TldVar *tld_var = (TldVar *)tld;
tld_var->var->const_value = value;
@@ -3561,8 +3591,7 @@ void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node) {
case NodeTypeUse:
{
g->use_queue.append(node);
- ImportTableEntry *import = get_scope_import(&decls_scope->base);
- import->use_decls.append(node);
+ decls_scope->use_decls.append(node);
break;
}
case NodeTypeTestDecl:
@@ -3654,7 +3683,6 @@ ZigType *validate_var_type(CodeGen *g, AstNode *source_node, ZigType *type_entry
return g->builtin_types.entry_invalid;
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
- case ZigTypeIdNamespace:
case ZigTypeIdMetaType:
case ZigTypeIdVoid:
case ZigTypeIdBool:
@@ -3763,8 +3791,16 @@ static void resolve_decl_var(CodeGen *g, TldVar *tld_var) {
ZigType *explicit_type = nullptr;
if (var_decl->type) {
- ZigType *proposed_type = analyze_type_expr(g, tld_var->base.parent_scope, var_decl->type);
- explicit_type = validate_var_type(g, var_decl->type, proposed_type);
+ if (tld_var->analyzing_type) {
+ ErrorMsg *msg = add_node_error(g, var_decl->type,
+ buf_sprintf("type of '%s' depends on itself", buf_ptr(tld_var->base.name)));
+ emit_error_notes_for_ref_stack(g, msg);
+ explicit_type = g->builtin_types.entry_invalid;
+ } else {
+ tld_var->analyzing_type = true;
+ ZigType *proposed_type = analyze_type_expr(g, tld_var->base.parent_scope, var_decl->type);
+ explicit_type = validate_var_type(g, var_decl->type, proposed_type);
+ }
}
assert(!is_export || !is_extern);
@@ -3847,17 +3883,12 @@ static void resolve_decl_var(CodeGen *g, TldVar *tld_var) {
g->global_vars.append(tld_var);
}
-void resolve_top_level_decl(CodeGen *g, Tld *tld, bool pointer_only, AstNode *source_node) {
+void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node) {
if (tld->resolution != TldResolutionUnresolved)
return;
- if (tld->dep_loop_flag) {
- add_node_error(g, tld->source_node, buf_sprintf("'%s' depends on itself", buf_ptr(tld->name)));
- tld->resolution = TldResolutionInvalid;
- return;
- }
-
- tld->dep_loop_flag = true;
+ assert(tld->resolution != TldResolutionResolving);
+ tld->resolution = TldResolutionResolving;
g->tld_ref_source_node_stack.append(source_node);
switch (tld->id) {
@@ -3888,27 +3919,31 @@ void resolve_top_level_decl(CodeGen *g, Tld *tld, bool pointer_only, AstNode *so
}
tld->resolution = TldResolutionOk;
- tld->dep_loop_flag = false;
g->tld_ref_source_node_stack.pop();
}
-Tld *find_decl(CodeGen *g, Scope *scope, Buf *name) {
- // we must resolve all the use decls
- ImportTableEntry *import = get_scope_import(scope);
- for (size_t i = 0; i < import->use_decls.length; i += 1) {
- AstNode *use_decl_node = import->use_decls.at(i);
+Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) {
+ // resolve all the use decls
+ for (size_t i = 0; i < decls_scope->use_decls.length; i += 1) {
+ AstNode *use_decl_node = decls_scope->use_decls.at(i);
if (use_decl_node->data.use.resolution == TldResolutionUnresolved) {
preview_use_decl(g, use_decl_node);
resolve_use_decl(g, use_decl_node);
}
}
+ auto entry = decls_scope->decl_table.maybe_get(name);
+ return (entry == nullptr) ? nullptr : entry->value;
+}
+
+Tld *find_decl(CodeGen *g, Scope *scope, Buf *name) {
while (scope) {
if (scope->id == ScopeIdDecls) {
ScopeDecls *decls_scope = (ScopeDecls *)scope;
- auto entry = decls_scope->decl_table.maybe_get(name);
- if (entry)
- return entry->value;
+
+ Tld *result = find_container_decl(g, decls_scope, name);
+ if (result != nullptr)
+ return result;
}
scope = scope->parent;
}
@@ -3959,6 +3994,12 @@ ZigFn *scope_fn_entry(Scope *scope) {
return nullptr;
}
+ZigPackage *scope_package(Scope *scope) {
+ ZigType *import = get_scope_import(scope);
+ assert(is_top_level_struct(import));
+ return import->data.structure.root_struct->package;
+}
+
TypeEnumField *find_enum_type_field(ZigType *enum_type, Buf *name) {
assert(enum_type->id == ZigTypeIdEnum);
if (enum_type->data.enumeration.src_field_count == 0)
@@ -4039,7 +4080,6 @@ static bool is_container(ZigType *type_entry) {
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -4098,7 +4138,6 @@ void resolve_container_type(CodeGen *g, ZigType *type_entry) {
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdInvalid:
case ZigTypeIdArgTuple:
@@ -4131,10 +4170,10 @@ ZigType *get_codegen_ptr_type(ZigType *type) {
}
bool type_is_nonnull_ptr(ZigType *type) {
- return type_is_codegen_pointer(type) && !ptr_allows_addr_zero(type);
+ return type_is_non_optional_pointer(type) && !ptr_allows_addr_zero(type);
}
-bool type_is_codegen_pointer(ZigType *type) {
+bool type_is_non_optional_pointer(ZigType *type) {
return get_codegen_ptr_type(type) == type;
}
@@ -4342,9 +4381,9 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
preview_use_decl(g, src_use_node);
}
- ConstExprValue *use_target_value = src_use_node->data.use.value;
+ ConstExprValue *use_target_value = src_use_node->data.use.using_namespace_value;
if (type_is_invalid(use_target_value->type)) {
- dst_use_node->owner->any_imports_failed = true;
+ get_container_scope(dst_use_node->owner)->any_imports_failed = true;
return;
}
@@ -4352,14 +4391,14 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
assert(use_target_value->special != ConstValSpecialRuntime);
- ImportTableEntry *target_import = use_target_value->data.x_import;
+ ZigType *target_import = use_target_value->data.x_type;
assert(target_import);
- if (target_import->any_imports_failed) {
- dst_use_node->owner->any_imports_failed = true;
+ if (get_container_scope(target_import)->any_imports_failed) {
+ get_container_scope(dst_use_node->owner)->any_imports_failed = true;
}
- auto it = target_import->decls_scope->decl_table.entry_iterator();
+ auto it = get_container_scope(target_import)->decl_table.entry_iterator();
for (;;) {
auto *entry = it.next();
if (!entry)
@@ -4374,7 +4413,7 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
Buf *target_tld_name = entry->key;
- auto existing_entry = dst_use_node->owner->decls_scope->decl_table.put_unique(target_tld_name, target_tld);
+ auto existing_entry = get_container_scope(dst_use_node->owner)->decl_table.put_unique(target_tld_name, target_tld);
if (existing_entry) {
Tld *existing_decl = existing_entry->value;
if (existing_decl != target_tld) {
@@ -4387,8 +4426,8 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
}
}
- for (size_t i = 0; i < target_import->use_decls.length; i += 1) {
- AstNode *use_decl_node = target_import->use_decls.at(i);
+ for (size_t i = 0; i < get_container_scope(target_import)->use_decls.length; i += 1) {
+ AstNode *use_decl_node = get_container_scope(target_import)->use_decls.at(i);
if (use_decl_node->data.use.visib_mod != VisibModPrivate)
add_symbols_from_import(g, use_decl_node, dst_use_node);
}
@@ -4415,16 +4454,18 @@ void preview_use_decl(CodeGen *g, AstNode *node) {
}
node->data.use.resolution = TldResolutionResolving;
- ConstExprValue *result = analyze_const_value(g, &node->owner->decls_scope->base,
- node->data.use.expr, g->builtin_types.entry_namespace, nullptr);
+ ConstExprValue *result = analyze_const_value(g, &get_container_scope(node->owner)->base,
+ node->data.use.expr, g->builtin_types.entry_type, nullptr);
if (type_is_invalid(result->type))
- node->owner->any_imports_failed = true;
+ get_container_scope(node->owner)->any_imports_failed = true;
- node->data.use.value = result;
+ node->data.use.using_namespace_value = result;
}
-ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package, Buf *resolved_path, Buf *source_code) {
+ZigType *add_source_file(CodeGen *g, ZigPackage *package, Buf *resolved_path, Buf *source_code,
+ SourceKind source_kind)
+{
if (g->verbose_tokenize) {
fprintf(stderr, "\nOriginal Source (%s):\n", buf_ptr(resolved_path));
fprintf(stderr, "----------------\n");
@@ -4452,87 +4493,102 @@ ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package, Buf *r
fprintf(stderr, "------\n");
}
- ImportTableEntry *import_entry = allocate(1);
- import_entry->package = package;
- import_entry->source_code = source_code;
- import_entry->line_offsets = tokenization.line_offsets;
- import_entry->path = resolved_path;
-
- import_entry->root = ast_parse(source_code, tokenization.tokens, import_entry, g->err_color);
- assert(import_entry->root);
- if (g->verbose_ast) {
- ast_print(stderr, import_entry->root, 0);
- }
-
Buf *src_dirname = buf_alloc();
Buf *src_basename = buf_alloc();
os_path_split(resolved_path, src_dirname, src_basename);
- import_entry->di_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(src_basename), buf_ptr(src_dirname));
+ Buf noextname = BUF_INIT;
+ os_path_extname(resolved_path, &noextname, nullptr);
+
+ Buf *pkg_root_src_dir = &package->root_src_dir;
+ Buf resolved_root_src_dir = os_path_resolve(&pkg_root_src_dir, 1);
+
+ assert(buf_starts_with_buf(resolved_path, &resolved_root_src_dir));
+
+ Buf namespace_name = BUF_INIT;
+ buf_init_from_buf(&namespace_name, &package->pkg_path);
+ if (source_kind == SourceKindNonRoot) {
+ if (buf_len(&namespace_name) != 0) buf_append_char(&namespace_name, NAMESPACE_SEP_CHAR);
+ buf_append_mem(&namespace_name, buf_ptr(&noextname) + buf_len(&resolved_root_src_dir) + 1,
+ buf_len(&noextname) - (buf_len(&resolved_root_src_dir) + 1));
+ buf_replace(&namespace_name, ZIG_OS_SEP_CHAR, NAMESPACE_SEP_CHAR);
+ }
+ Buf *bare_name = buf_alloc();
+ os_path_extname(src_basename, bare_name, nullptr);
+
+ RootStruct *root_struct = allocate(1);
+ root_struct->package = package;
+ root_struct->source_code = source_code;
+ root_struct->line_offsets = tokenization.line_offsets;
+ root_struct->path = resolved_path;
+ root_struct->di_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(src_basename), buf_ptr(src_dirname));
+ ZigType *import_entry = get_root_container_type(g, buf_ptr(&namespace_name), bare_name, root_struct);
+ if (source_kind == SourceKindRoot) {
+ assert(g->root_import == nullptr);
+ g->root_import = import_entry;
+ }
g->import_table.put(resolved_path, import_entry);
- g->import_queue.append(import_entry);
- import_entry->decls_scope = create_decls_scope(g, import_entry->root, nullptr, nullptr, import_entry);
+ AstNode *root_node = ast_parse(source_code, tokenization.tokens, import_entry, g->err_color);
+ assert(root_node != nullptr);
+ assert(root_node->type == NodeTypeContainerDecl);
+ import_entry->data.structure.decl_node = root_node;
+ import_entry->data.structure.decls_scope->base.source_node = root_node;
+ if (g->verbose_ast) {
+ ast_print(stderr, root_node, 0);
+ }
+ if (source_kind == SourceKindRoot || package == g->panic_package) {
+ // Look for panic and main
+ for (size_t decl_i = 0; decl_i < root_node->data.container_decl.decls.length; decl_i += 1) {
+ AstNode *top_level_decl = root_node->data.container_decl.decls.at(decl_i);
- assert(import_entry->root->type == NodeTypeContainerDecl);
- for (size_t decl_i = 0; decl_i < import_entry->root->data.container_decl.decls.length; decl_i += 1) {
- AstNode *top_level_decl = import_entry->root->data.container_decl.decls.at(decl_i);
+ if (top_level_decl->type == NodeTypeFnDef) {
+ AstNode *proto_node = top_level_decl->data.fn_def.fn_proto;
+ assert(proto_node->type == NodeTypeFnProto);
+ Buf *proto_name = proto_node->data.fn_proto.name;
- if (top_level_decl->type == NodeTypeFnDef) {
- AstNode *proto_node = top_level_decl->data.fn_def.fn_proto;
- assert(proto_node->type == NodeTypeFnProto);
- Buf *proto_name = proto_node->data.fn_proto.name;
-
- bool is_pub = (proto_node->data.fn_proto.visib_mod == VisibModPub);
- bool ok_cc = (proto_node->data.fn_proto.cc == CallingConventionUnspecified ||
- proto_node->data.fn_proto.cc == CallingConventionCold);
-
- if (is_pub && ok_cc) {
- if (buf_eql_str(proto_name, "main")) {
- g->have_pub_main = true;
- g->subsystem = TargetSubsystemConsole;
- } else if (buf_eql_str(proto_name, "panic")) {
- g->have_pub_panic = true;
+ bool is_pub = (proto_node->data.fn_proto.visib_mod == VisibModPub);
+ if (is_pub) {
+ if (buf_eql_str(proto_name, "main")) {
+ g->have_pub_main = true;
+ g->subsystem = TargetSubsystemConsole;
+ } else if (buf_eql_str(proto_name, "panic")) {
+ g->have_pub_panic = true;
+ }
}
}
}
}
+ for (size_t decl_i = 0; decl_i < root_node->data.container_decl.decls.length; decl_i += 1) {
+ AstNode *top_level_decl = root_node->data.container_decl.decls.at(decl_i);
+ scan_decls(g, import_entry->data.structure.decls_scope, top_level_decl);
+ }
+
+ TldContainer *tld_container = allocate(1);
+ init_tld(&tld_container->base, TldIdContainer, &namespace_name, VisibModPub, root_node, nullptr);
+ tld_container->type_entry = import_entry;
+ tld_container->decls_scope = import_entry->data.structure.decls_scope;
+ g->resolve_queue.append(&tld_container->base);
+
return import_entry;
}
-void scan_import(CodeGen *g, ImportTableEntry *import) {
- if (!import->scanned) {
- import->scanned = true;
- scan_decls(g, import->decls_scope, import->root);
- }
-}
-
void semantic_analyze(CodeGen *g) {
- for (; g->import_queue_index < g->import_queue.length; g->import_queue_index += 1) {
- ImportTableEntry *import = g->import_queue.at(g->import_queue_index);
- scan_import(g, import);
- }
-
- for (; g->use_queue_index < g->use_queue.length; g->use_queue_index += 1) {
- AstNode *use_decl_node = g->use_queue.at(g->use_queue_index);
- preview_use_decl(g, use_decl_node);
- }
-
- for (size_t i = 0; i < g->use_queue.length; i += 1) {
- AstNode *use_decl_node = g->use_queue.at(i);
- resolve_use_decl(g, use_decl_node);
- }
-
while (g->resolve_queue_index < g->resolve_queue.length ||
- g->fn_defs_index < g->fn_defs.length)
+ g->fn_defs_index < g->fn_defs.length ||
+ g->use_queue_index < g->use_queue.length)
{
+ for (; g->use_queue_index < g->use_queue.length; g->use_queue_index += 1) {
+ AstNode *use_decl_node = g->use_queue.at(g->use_queue_index);
+ preview_use_decl(g, use_decl_node);
+ resolve_use_decl(g, use_decl_node);
+ }
for (; g->resolve_queue_index < g->resolve_queue.length; g->resolve_queue_index += 1) {
Tld *tld = g->resolve_queue.at(g->resolve_queue_index);
- bool pointer_only = false;
AstNode *source_node = nullptr;
- resolve_top_level_decl(g, tld, pointer_only, source_node);
+ resolve_top_level_decl(g, tld, source_node);
}
for (; g->fn_defs_index < g->fn_defs.length; g->fn_defs_index += 1) {
@@ -4613,7 +4669,6 @@ bool handle_is_ptr(ZigType *type_entry) {
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -4637,7 +4692,7 @@ bool handle_is_ptr(ZigType *type_entry) {
return type_has_bits(type_entry->data.error_union.payload_type);
case ZigTypeIdOptional:
return type_has_bits(type_entry->data.maybe.child_type) &&
- !type_is_codegen_pointer(type_entry->data.maybe.child_type) &&
+ !type_is_non_optional_pointer(type_entry->data.maybe.child_type) &&
type_entry->data.maybe.child_type->id != ZigTypeIdErrorSet;
case ZigTypeIdUnion:
assert(type_entry->data.unionation.zero_bits_known);
@@ -4880,8 +4935,6 @@ static uint32_t hash_const_val(ConstExprValue *const_val) {
return 3415065496;
case ZigTypeIdErrorSet:
return hash_const_val_error_set(const_val);
- case ZigTypeIdNamespace:
- return hash_ptr(const_val->data.x_import);
case ZigTypeIdVector:
// TODO better hashing algorithm
return 3647867726;
@@ -4943,7 +4996,6 @@ static bool can_mutate_comptime_var_state(ConstExprValue *value) {
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdFn:
case ZigTypeIdOpaque:
@@ -5013,7 +5065,6 @@ static bool return_type_is_cacheable(ZigType *return_type) {
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdFn:
case ZigTypeIdOpaque:
@@ -5143,7 +5194,6 @@ OnePossibleValue type_has_one_possible_value(CodeGen *g, ZigType *type_entry) {
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
case ZigTypeIdMetaType:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOptional:
@@ -5209,7 +5259,6 @@ ReqCompTime type_requires_comptime(CodeGen *g, ZigType *type_entry) {
case ZigTypeIdUndefined:
case ZigTypeIdNull:
case ZigTypeIdMetaType:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
return ReqCompTimeYes;
@@ -5797,8 +5846,6 @@ bool const_values_equal(CodeGen *g, ConstExprValue *a, ConstExprValue *b) {
}
case ZigTypeIdErrorUnion:
zig_panic("TODO");
- case ZigTypeIdNamespace:
- return a->data.x_import == b->data.x_import;
case ZigTypeIdArgTuple:
return a->data.x_arg_tuple.start_index == b->data.x_arg_tuple.start_index &&
a->data.x_arg_tuple.end_index == b->data.x_arg_tuple.end_index;
@@ -6072,16 +6119,6 @@ void render_const_value(CodeGen *g, Buf *buf, ConstExprValue *const_val) {
}
return;
}
- case ZigTypeIdNamespace:
- {
- ImportTableEntry *import = const_val->data.x_import;
- if (import->c_import_node) {
- buf_appendf(buf, "(namespace from C import)");
- } else {
- buf_appendf(buf, "(namespace: %s)", buf_ptr(import->path));
- }
- return;
- }
case ZigTypeIdBoundFn:
{
ZigFn *fn_entry = const_val->data.x_bound_fn.fn;
@@ -6203,7 +6240,6 @@ uint32_t type_id_hash(TypeId x) {
case ZigTypeIdEnum:
case ZigTypeIdUnion:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -6252,7 +6288,6 @@ bool type_id_eql(TypeId a, TypeId b) {
case ZigTypeIdEnum:
case ZigTypeIdUnion:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -6419,7 +6454,6 @@ static const ZigTypeId all_type_ids[] = {
ZigTypeIdEnum,
ZigTypeIdUnion,
ZigTypeIdFn,
- ZigTypeIdNamespace,
ZigTypeIdBoundFn,
ZigTypeIdArgTuple,
ZigTypeIdOpaque,
@@ -6480,18 +6514,16 @@ size_t type_id_index(ZigType *entry) {
return 17;
case ZigTypeIdFn:
return 18;
- case ZigTypeIdNamespace:
- return 19;
case ZigTypeIdBoundFn:
- return 20;
+ return 19;
case ZigTypeIdArgTuple:
- return 21;
+ return 20;
case ZigTypeIdOpaque:
- return 22;
+ return 21;
case ZigTypeIdPromise:
- return 23;
+ return 22;
case ZigTypeIdVector:
- return 24;
+ return 23;
}
zig_unreachable();
}
@@ -6538,8 +6570,6 @@ const char *type_id_name(ZigTypeId id) {
return "Union";
case ZigTypeIdFn:
return "Fn";
- case ZigTypeIdNamespace:
- return "Namespace";
case ZigTypeIdBoundFn:
return "BoundFn";
case ZigTypeIdArgTuple:
@@ -6619,8 +6649,8 @@ bool type_ptr_eql(const ZigType *a, const ZigType *b) {
}
ConstExprValue *get_builtin_value(CodeGen *codegen, const char *name) {
- Tld *tld = codegen->compile_var_import->decls_scope->decl_table.get(buf_create_from_str(name));
- resolve_top_level_decl(codegen, tld, false, nullptr);
+ Tld *tld = get_container_scope(codegen->compile_var_import)->decl_table.get(buf_create_from_str(name));
+ resolve_top_level_decl(codegen, tld, nullptr);
assert(tld->id == TldIdVar);
TldVar *tld_var = (TldVar *)tld;
ConstExprValue *var_value = tld_var->var->const_value;
@@ -6812,3 +6842,34 @@ bool ptr_allows_addr_zero(ZigType *ptr_type) {
}
return false;
}
+
+void emit_error_notes_for_ref_stack(CodeGen *g, ErrorMsg *msg) {
+ size_t i = g->tld_ref_source_node_stack.length;
+ for (;;) {
+ if (i == 0)
+ break;
+ i -= 1;
+ AstNode *source_node = g->tld_ref_source_node_stack.at(i);
+ if (source_node) {
+ msg = add_error_note(g, msg, source_node, buf_sprintf("referenced here"));
+ }
+ }
+}
+
+Buf *type_bare_name(ZigType *type_entry) {
+ if (is_slice(type_entry)) {
+ return &type_entry->name;
+ } else if (is_container(type_entry)) {
+ return get_container_scope(type_entry)->bare_name;
+ } else if (type_entry->id == ZigTypeIdOpaque) {
+ return type_entry->data.opaque.bare_name;
+ } else {
+ return &type_entry->name;
+ }
+}
+
+// TODO this will have to be more clever, probably using the full name
+// and replacing '.' with '_' or something like that
+Buf *type_h_name(ZigType *t) {
+ return type_bare_name(t);
+}
diff --git a/src/analyze.hpp b/src/analyze.hpp
index e8838ae57e..aa94f0c2c5 100644
--- a/src/analyze.hpp
+++ b/src/analyze.hpp
@@ -12,8 +12,9 @@
void semantic_analyze(CodeGen *g);
ErrorMsg *add_node_error(CodeGen *g, AstNode *node, Buf *msg);
-ErrorMsg *add_token_error(CodeGen *g, ImportTableEntry *owner, Token *token, Buf *msg);
+ErrorMsg *add_token_error(CodeGen *g, ZigType *owner, Token *token, Buf *msg);
ErrorMsg *add_error_note(CodeGen *g, ErrorMsg *parent_msg, AstNode *node, Buf *msg);
+void emit_error_notes_for_ref_stack(CodeGen *g, ErrorMsg *msg);
ZigType *new_type_table_entry(ZigTypeId id);
ZigType *get_pointer_to_type(CodeGen *g, ZigType *child_type, bool is_const);
ZigType *get_pointer_to_type_extra(CodeGen *g, ZigType *child_type, bool is_const,
@@ -29,11 +30,13 @@ ZigType *get_optional_type(CodeGen *g, ZigType *child_type);
ZigType *get_array_type(CodeGen *g, ZigType *child_type, uint64_t array_size);
ZigType *get_slice_type(CodeGen *g, ZigType *ptr_type);
ZigType *get_partial_container_type(CodeGen *g, Scope *scope, ContainerKind kind,
- AstNode *decl_node, const char *name, ContainerLayout layout);
+ AstNode *decl_node, const char *full_name, Buf *bare_name, ContainerLayout layout);
+ZigType *get_root_container_type(CodeGen *g, const char *full_name, Buf *bare_name,
+ RootStruct *root_struct);
ZigType *get_smallest_unsigned_int_type(CodeGen *g, uint64_t x);
ZigType *get_error_union_type(CodeGen *g, ZigType *err_set_type, ZigType *payload_type);
ZigType *get_bound_fn_type(CodeGen *g, ZigFn *fn_entry);
-ZigType *get_opaque_type(CodeGen *g, Scope *scope, AstNode *source_node, const char *name);
+ZigType *get_opaque_type(CodeGen *g, Scope *scope, AstNode *source_node, const char *full_name, Buf *bare_name);
ZigType *get_struct_type(CodeGen *g, const char *type_name, const char *field_names[],
ZigType *field_types[], size_t field_count);
ZigType *get_promise_type(CodeGen *g, ZigType *result_type);
@@ -46,13 +49,19 @@ bool type_allowed_in_extern(CodeGen *g, ZigType *type_entry);
bool ptr_allows_addr_zero(ZigType *ptr_type);
bool type_is_nonnull_ptr(ZigType *type);
-ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package, Buf *abs_full_path, Buf *source_code);
-
+enum SourceKind {
+ SourceKindRoot,
+ SourceKindPkgMain,
+ SourceKindNonRoot,
+};
+ZigType *add_source_file(CodeGen *g, ZigPackage *package, Buf *abs_full_path, Buf *source_code,
+ SourceKind source_kind);
ZigVar *find_variable(CodeGen *g, Scope *orig_context, Buf *name, ScopeFnDef **crossed_fndef_scope);
Tld *find_decl(CodeGen *g, Scope *scope, Buf *name);
-void resolve_top_level_decl(CodeGen *g, Tld *tld, bool pointer_only, AstNode *source_node);
-bool type_is_codegen_pointer(ZigType *type);
+Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name);
+void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node);
+bool type_is_non_optional_pointer(ZigType *type);
ZigType *get_src_ptr_type(ZigType *type);
ZigType *get_codegen_ptr_type(ZigType *type);
@@ -77,11 +86,11 @@ bool is_array_ref(ZigType *type_entry);
bool is_container_ref(ZigType *type_entry);
bool is_valid_vector_elem_type(ZigType *elem_type);
void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node);
-void scan_import(CodeGen *g, ImportTableEntry *import);
void preview_use_decl(CodeGen *g, AstNode *node);
void resolve_use_decl(CodeGen *g, AstNode *node);
ZigFn *scope_fn_entry(Scope *scope);
-ImportTableEntry *get_scope_import(Scope *scope);
+ZigPackage *scope_package(Scope *scope);
+ZigType *get_scope_import(Scope *scope);
void init_tld(Tld *tld, TldId id, Buf *name, VisibMod visib_mod, AstNode *source_node, Scope *parent_scope);
ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf *name,
bool is_const, ConstExprValue *init_value, Tld *src_tld, ZigType *var_type);
@@ -109,7 +118,6 @@ ScopeCImport *create_cimport_scope(CodeGen *g, AstNode *node, Scope *parent);
ScopeLoop *create_loop_scope(CodeGen *g, AstNode *node, Scope *parent);
ScopeSuspend *create_suspend_scope(CodeGen *g, AstNode *node, Scope *parent);
ScopeFnDef *create_fndef_scope(CodeGen *g, AstNode *node, Scope *parent, ZigFn *fn_entry);
-ScopeDecls *create_decls_scope(CodeGen *g, AstNode *node, Scope *parent, ZigType *container_type, ImportTableEntry *import);
Scope *create_comptime_scope(CodeGen *g, AstNode *node, Scope *parent);
Scope *create_coro_prelude_scope(CodeGen *g, AstNode *node, Scope *parent);
Scope *create_runtime_scope(CodeGen *g, AstNode *node, Scope *parent, IrInstruction *is_comptime);
@@ -186,7 +194,7 @@ LinkLib *add_link_lib(CodeGen *codegen, Buf *lib);
uint32_t get_abi_alignment(CodeGen *g, ZigType *type_entry);
ZigType *get_align_amt_type(CodeGen *g);
-PackageTableEntry *new_anonymous_package(void);
+ZigPackage *new_anonymous_package(void);
Buf *const_value_to_buffer(ConstExprValue *const_val);
void add_fn_export(CodeGen *g, ZigFn *fn_table_entry, Buf *symbol_name, GlobalLinkageId linkage, bool ccc);
@@ -232,4 +240,6 @@ Error ensure_const_val_repr(IrAnalyze *ira, CodeGen *codegen, AstNode *source_no
ConstExprValue *const_val, ZigType *wanted_type);
void typecheck_panic_fn(CodeGen *g, TldFn *tld_fn, ZigFn *panic_fn);
+Buf *type_bare_name(ZigType *t);
+Buf *type_h_name(ZigType *t);
#endif
diff --git a/src/buffer.hpp b/src/buffer.hpp
index e286f7dc63..789abea3e9 100644
--- a/src/buffer.hpp
+++ b/src/buffer.hpp
@@ -59,7 +59,7 @@ static inline void buf_deinit(Buf *buf) {
static inline void buf_init_from_mem(Buf *buf, const char *ptr, size_t len) {
assert(len != SIZE_MAX);
buf->list.resize(len + 1);
- safe_memcpy(buf_ptr(buf), ptr, len);
+ memcpy(buf_ptr(buf), ptr, len);
buf->list.at(buf_len(buf)) = 0;
}
@@ -98,7 +98,7 @@ static inline Buf *buf_slice(Buf *in_buf, size_t start, size_t end) {
assert(end <= buf_len(in_buf));
Buf *out_buf = allocate(1);
out_buf->list.resize(end - start + 1);
- safe_memcpy(buf_ptr(out_buf), buf_ptr(in_buf) + start, end - start);
+ memcpy(buf_ptr(out_buf), buf_ptr(in_buf) + start, end - start);
out_buf->list.at(buf_len(out_buf)) = 0;
return out_buf;
}
@@ -108,7 +108,7 @@ static inline void buf_append_mem(Buf *buf, const char *mem, size_t mem_len) {
assert(mem_len != SIZE_MAX);
size_t old_len = buf_len(buf);
buf_resize(buf, old_len + mem_len);
- safe_memcpy(buf_ptr(buf) + old_len, mem, mem_len);
+ memcpy(buf_ptr(buf) + old_len, mem, mem_len);
buf->list.at(buf_len(buf)) = 0;
}
diff --git a/src/codegen.cpp b/src/codegen.cpp
index ee63318eb8..7b256982ba 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -48,16 +48,17 @@ static void init_darwin_native(CodeGen *g) {
}
}
-static PackageTableEntry *new_package(const char *root_src_dir, const char *root_src_path) {
- PackageTableEntry *entry = allocate(1);
+static ZigPackage *new_package(const char *root_src_dir, const char *root_src_path, const char *pkg_path) {
+ ZigPackage *entry = allocate(1);
entry->package_table.init(4);
buf_init_from_str(&entry->root_src_dir, root_src_dir);
buf_init_from_str(&entry->root_src_path, root_src_path);
+ buf_init_from_str(&entry->pkg_path, pkg_path);
return entry;
}
-PackageTableEntry *new_anonymous_package(void) {
- return new_package("", "");
+ZigPackage *new_anonymous_package() {
+ return new_package("", "", "");
}
static const char *symbols_that_llvm_depends_on[] = {
@@ -87,8 +88,8 @@ static const char *symbols_that_llvm_depends_on[] = {
// TODO probably all of compiler-rt needs to go here
};
-CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out_type, BuildMode build_mode,
- Buf *zig_lib_dir, Buf *override_std_dir, ZigLibCInstallation *libc)
+CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget *target,
+ OutType out_type, BuildMode build_mode, Buf *zig_lib_dir, Buf *override_std_dir, ZigLibCInstallation *libc)
{
CodeGen *g = allocate(1);
@@ -132,20 +133,39 @@ CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out
}
if (root_src_path) {
- Buf *src_basename = buf_alloc();
- Buf *src_dir = buf_alloc();
- os_path_split(root_src_path, src_dir, src_basename);
+ Buf *root_pkg_path;
+ Buf *rel_root_src_path;
+ if (main_pkg_path == nullptr) {
+ Buf *src_basename = buf_alloc();
+ Buf *src_dir = buf_alloc();
+ os_path_split(root_src_path, src_dir, src_basename);
- if (buf_len(src_basename) == 0) {
- fprintf(stderr, "Invalid root source path: %s\n", buf_ptr(root_src_path));
- exit(1);
+ if (buf_len(src_basename) == 0) {
+ fprintf(stderr, "Invalid root source path: %s\n", buf_ptr(root_src_path));
+ exit(1);
+ }
+ root_pkg_path = src_dir;
+ rel_root_src_path = src_basename;
+ } else {
+ Buf resolved_root_src_path = os_path_resolve(&root_src_path, 1);
+ Buf resolved_main_pkg_path = os_path_resolve(&main_pkg_path, 1);
+
+ if (!buf_starts_with_buf(&resolved_root_src_path, &resolved_main_pkg_path)) {
+ fprintf(stderr, "Root source path '%s' outside main package path '%s'",
+ buf_ptr(root_src_path), buf_ptr(main_pkg_path));
+ exit(1);
+ }
+ root_pkg_path = main_pkg_path;
+ rel_root_src_path = buf_create_from_mem(
+ buf_ptr(&resolved_root_src_path) + buf_len(&resolved_main_pkg_path) + 1,
+ buf_len(&resolved_root_src_path) - buf_len(&resolved_main_pkg_path) - 1);
}
- g->root_package = new_package(buf_ptr(src_dir), buf_ptr(src_basename));
- g->std_package = new_package(buf_ptr(g->zig_std_dir), "index.zig");
+ g->root_package = new_package(buf_ptr(root_pkg_path), buf_ptr(rel_root_src_path), "");
+ g->std_package = new_package(buf_ptr(g->zig_std_dir), "std.zig", "std");
g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);
} else {
- g->root_package = new_package(".", "");
+ g->root_package = new_package(".", "", "");
}
g->zig_std_special_dir = buf_alloc();
@@ -621,7 +641,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
if (scope->di_scope)
return scope->di_scope;
- ImportTableEntry *import = get_scope_import(scope);
+ ZigType *import = get_scope_import(scope);
switch (scope->id) {
case ScopeIdCImport:
zig_unreachable();
@@ -644,7 +664,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
assert(fn_di_scope != nullptr);
ZigLLVMDISubprogram *subprogram = ZigLLVMCreateFunction(g->dbuilder,
fn_di_scope, buf_ptr(&fn_table_entry->symbol_name), "",
- import->di_file, line_number,
+ import->data.structure.root_struct->di_file, line_number,
fn_table_entry->type_entry->data.fn.raw_di_type, is_internal_linkage,
is_definition, scope_line, flags, is_optimized, nullptr);
@@ -658,7 +678,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
assert(decls_scope->container_type);
scope->di_scope = ZigLLVMTypeToScope(decls_scope->container_type->di_type);
} else {
- scope->di_scope = ZigLLVMFileToScope(import->di_file);
+ scope->di_scope = ZigLLVMFileToScope(import->data.structure.root_struct->di_file);
}
return scope->di_scope;
case ScopeIdBlock:
@@ -668,7 +688,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
assert(scope->parent);
ZigLLVMDILexicalBlock *di_block = ZigLLVMCreateLexicalBlock(g->dbuilder,
get_di_scope(g, scope->parent),
- import->di_file,
+ import->data.structure.root_struct->di_file,
(unsigned)scope->source_node->line + 1,
(unsigned)scope->source_node->column + 1);
scope->di_scope = ZigLLVMLexicalBlockToScope(di_block);
@@ -1236,7 +1256,7 @@ static LLVMValueRef get_add_error_return_trace_addr_fn(CodeGen *g) {
LLVMTypeRef usize_type_ref = g->builtin_types.entry_usize->type_ref;
- // stack_trace.instruction_addresses[stack_trace.index % stack_trace.instruction_addresses.len] = return_address;
+ // stack_trace.instruction_addresses[stack_trace.index & (stack_trace.instruction_addresses.len - 1)] = return_address;
LLVMValueRef err_ret_trace_ptr = LLVMGetParam(fn_val, 0);
LLVMValueRef address_value = LLVMGetParam(fn_val, 1);
@@ -1254,9 +1274,10 @@ static LLVMValueRef get_add_error_return_trace_addr_fn(CodeGen *g) {
LLVMValueRef len_value = gen_load_untyped(g, len_field_ptr, 0, false, "");
LLVMValueRef index_val = gen_load_untyped(g, index_field_ptr, 0, false, "");
- LLVMValueRef modded_val = LLVMBuildURem(g->builder, index_val, len_value, "");
+ LLVMValueRef len_val_minus_one = LLVMBuildSub(g->builder, len_value, LLVMConstInt(usize_type_ref, 1, false), "");
+ LLVMValueRef masked_val = LLVMBuildAnd(g->builder, index_val, len_val_minus_one, "");
LLVMValueRef address_indices[] = {
- modded_val,
+ masked_val,
};
LLVMValueRef ptr_value = gen_load_untyped(g, ptr_field_ptr, 0, false, "");
@@ -2196,7 +2217,7 @@ var_ok:
if (dest_ty != nullptr && var->decl_node) {
// arg index + 1 because the 0 index is return value
var->di_loc_var = ZigLLVMCreateParameterVariable(g->dbuilder, get_di_scope(g, var->parent_scope),
- buf_ptr(&var->name), fn_walk->data.vars.import->di_file,
+ buf_ptr(&var->name), fn_walk->data.vars.import->data.structure.root_struct->di_file,
(unsigned)(var->decl_node->line + 1),
dest_ty->di_type, !g->strip_debug_symbols, 0, di_arg_index + 1);
}
@@ -3938,7 +3959,7 @@ static LLVMValueRef gen_non_null_bit(CodeGen *g, ZigType *maybe_type, LLVMValueR
if (child_type->zero_bits) {
return maybe_handle;
} else {
- bool is_scalar = type_is_codegen_pointer(child_type) || child_type->id == ZigTypeIdErrorSet;
+ bool is_scalar = type_is_non_optional_pointer(child_type) || child_type->id == ZigTypeIdErrorSet;
if (is_scalar) {
return LLVMBuildICmp(g->builder, LLVMIntNE, maybe_handle, LLVMConstNull(maybe_type->type_ref), "");
} else {
@@ -3978,7 +3999,7 @@ static LLVMValueRef ir_render_optional_unwrap_ptr(CodeGen *g, IrExecutable *exec
if (child_type->zero_bits) {
return nullptr;
} else {
- bool is_scalar = type_is_codegen_pointer(child_type) || child_type->id == ZigTypeIdErrorSet;
+ bool is_scalar = type_is_non_optional_pointer(child_type) || child_type->id == ZigTypeIdErrorSet;
if (is_scalar) {
return maybe_ptr;
} else {
@@ -4549,7 +4570,7 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutable *executable, IrInst
return tmp_struct_ptr;
} else if (array_type->id == ZigTypeIdPointer) {
- assert(array_type->data.pointer.ptr_len == PtrLenUnknown);
+ assert(array_type->data.pointer.ptr_len != PtrLenSingle);
LLVMValueRef start_val = ir_llvm_value(g, instruction->start);
LLVMValueRef end_val = ir_llvm_value(g, instruction->end);
@@ -4640,7 +4661,8 @@ static LLVMValueRef ir_render_return_address(CodeGen *g, IrExecutable *executabl
IrInstructionReturnAddress *instruction)
{
LLVMValueRef zero = LLVMConstNull(g->builtin_types.entry_i32->type_ref);
- return LLVMBuildCall(g->builder, get_return_address_fn_val(g), &zero, 1, "");
+ LLVMValueRef ptr_val = LLVMBuildCall(g->builder, get_return_address_fn_val(g), &zero, 1, "");
+ return LLVMBuildPtrToInt(g->builder, ptr_val, g->builtin_types.entry_usize->type_ref, "");
}
static LLVMValueRef get_frame_address_fn_val(CodeGen *g) {
@@ -4661,7 +4683,8 @@ static LLVMValueRef ir_render_frame_address(CodeGen *g, IrExecutable *executable
IrInstructionFrameAddress *instruction)
{
LLVMValueRef zero = LLVMConstNull(g->builtin_types.entry_i32->type_ref);
- return LLVMBuildCall(g->builder, get_frame_address_fn_val(g), &zero, 1, "");
+ LLVMValueRef ptr_val = LLVMBuildCall(g->builder, get_frame_address_fn_val(g), &zero, 1, "");
+ return LLVMBuildPtrToInt(g->builder, ptr_val, g->builtin_types.entry_usize->type_ref, "");
}
static LLVMValueRef get_handle_fn_val(CodeGen *g) {
@@ -4839,7 +4862,7 @@ static LLVMValueRef ir_render_maybe_wrap(CodeGen *g, IrExecutable *executable, I
}
LLVMValueRef payload_val = ir_llvm_value(g, instruction->value);
- if (type_is_codegen_pointer(child_type) || child_type->id == ZigTypeIdErrorSet) {
+ if (type_is_non_optional_pointer(child_type) || child_type->id == ZigTypeIdErrorSet) {
return payload_val;
}
@@ -5800,7 +5823,6 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Con
case ZigTypeIdNull:
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdVoid:
@@ -6077,9 +6099,9 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c
case ZigTypeIdOptional:
{
ZigType *child_type = type_entry->data.maybe.child_type;
- if (child_type->zero_bits) {
+ if (!type_has_bits(child_type)) {
return LLVMConstInt(LLVMInt1Type(), const_val->data.x_optional ? 1 : 0, false);
- } else if (type_is_codegen_pointer(child_type)) {
+ } else if (get_codegen_ptr_type(type_entry) != nullptr) {
return gen_const_val_ptr(g, const_val, name);
} else if (child_type->id == ZigTypeIdErrorSet) {
return gen_const_val_err_set(g, const_val, name);
@@ -6400,7 +6422,6 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -6506,12 +6527,12 @@ static void gen_global_var(CodeGen *g, ZigVar *var, LLVMValueRef init_val,
assert(var->gen_is_const);
assert(type_entry);
- ImportTableEntry *import = get_scope_import(var->parent_scope);
+ ZigType *import = get_scope_import(var->parent_scope);
assert(import);
bool is_local_to_unit = true;
ZigLLVMCreateGlobalVariable(g->dbuilder, get_di_scope(g, var->parent_scope), buf_ptr(&var->name),
- buf_ptr(&var->name), import->di_file,
+ buf_ptr(&var->name), import->data.structure.root_struct->di_file,
(unsigned)(var->decl_node->line + 1),
type_entry->di_type, is_local_to_unit);
@@ -6767,7 +6788,7 @@ static void do_code_gen(CodeGen *g) {
*slot = build_alloca(g, slot_type, "", alignment_bytes);
}
- ImportTableEntry *import = get_scope_import(&fn_table_entry->fndef_scope->base);
+ ZigType *import = get_scope_import(&fn_table_entry->fndef_scope->base);
unsigned gen_i_init = want_first_arg_sret(g, fn_type_id) ? 1 : 0;
@@ -6799,7 +6820,7 @@ static void do_code_gen(CodeGen *g) {
var->value_ref = build_alloca(g, var->var_type, buf_ptr(&var->name), var->align_bytes);
var->di_loc_var = ZigLLVMCreateAutoVariable(g->dbuilder, get_di_scope(g, var->parent_scope),
- buf_ptr(&var->name), import->di_file, (unsigned)(var->decl_node->line + 1),
+ buf_ptr(&var->name), import->data.structure.root_struct->di_file, (unsigned)(var->decl_node->line + 1),
var->var_type->di_type, !g->strip_debug_symbols, 0);
} else if (is_c_abi) {
@@ -6823,7 +6844,7 @@ static void do_code_gen(CodeGen *g) {
}
if (var->decl_node) {
var->di_loc_var = ZigLLVMCreateParameterVariable(g->dbuilder, get_di_scope(g, var->parent_scope),
- buf_ptr(&var->name), import->di_file,
+ buf_ptr(&var->name), import->data.structure.root_struct->di_file,
(unsigned)(var->decl_node->line + 1),
gen_type->di_type, !g->strip_debug_symbols, 0, (unsigned)(var->gen_arg_index + 1));
}
@@ -6971,12 +6992,6 @@ static void define_builtin_types(CodeGen *g) {
entry->zero_bits = true;
g->builtin_types.entry_invalid = entry;
}
- {
- ZigType *entry = new_type_table_entry(ZigTypeIdNamespace);
- buf_init_from_str(&entry->name, "(namespace)");
- entry->zero_bits = true;
- g->builtin_types.entry_namespace = entry;
- }
{
ZigType *entry = new_type_table_entry(ZigTypeIdComptimeFloat);
buf_init_from_str(&entry->name, "comptime_float");
@@ -7130,7 +7145,8 @@ static void define_builtin_types(CodeGen *g) {
g->builtin_types.entry_i64 = get_int_type(g, true, 64);
{
- g->builtin_types.entry_c_void = get_opaque_type(g, nullptr, nullptr, "c_void");
+ g->builtin_types.entry_c_void = get_opaque_type(g, nullptr, nullptr, "c_void",
+ buf_create_from_str("c_void"));
g->primitive_type_table.put(&g->builtin_types.entry_c_void->name, g->builtin_types.entry_c_void);
}
@@ -7470,7 +7486,6 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
" Enum: Enum,\n"
" Union: Union,\n"
" Fn: Fn,\n"
- " Namespace: void,\n"
" BoundFn: Fn,\n"
" ArgTuple: void,\n"
" Opaque: void,\n"
@@ -7479,18 +7494,18 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
"\n\n"
" pub const Int = struct {\n"
" is_signed: bool,\n"
- " bits: u8,\n"
+ " bits: comptime_int,\n"
" };\n"
"\n"
" pub const Float = struct {\n"
- " bits: u8,\n"
+ " bits: comptime_int,\n"
" };\n"
"\n"
" pub const Pointer = struct {\n"
" size: Size,\n"
" is_const: bool,\n"
" is_volatile: bool,\n"
- " alignment: u32,\n"
+ " alignment: comptime_int,\n"
" child: type,\n"
"\n"
" pub const Size = enum {\n"
@@ -7502,7 +7517,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
" };\n"
"\n"
" pub const Array = struct {\n"
- " len: usize,\n"
+ " len: comptime_int,\n"
" child: type,\n"
" };\n"
"\n"
@@ -7514,7 +7529,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
"\n"
" pub const StructField = struct {\n"
" name: []const u8,\n"
- " offset: ?usize,\n"
+ " offset: ?comptime_int,\n"
" field_type: type,\n"
" };\n"
"\n"
@@ -7535,7 +7550,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
"\n"
" pub const Error = struct {\n"
" name: []const u8,\n"
- " value: usize,\n"
+ " value: comptime_int,\n"
" };\n"
"\n"
" pub const ErrorSet = struct {\n"
@@ -7544,7 +7559,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
"\n"
" pub const EnumField = struct {\n"
" name: []const u8,\n"
- " value: usize,\n"
+ " value: comptime_int,\n"
" };\n"
"\n"
" pub const Enum = struct {\n"
@@ -7596,7 +7611,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
" };\n"
"\n"
" pub const Vector = struct {\n"
- " len: u32,\n"
+ " len: comptime_int,\n"
" child: type,\n"
" };\n"
"\n"
@@ -7751,12 +7766,12 @@ static Error define_builtin_compile_vars(CodeGen *g) {
assert(g->root_package);
assert(g->std_package);
- g->compile_var_package = new_package(buf_ptr(this_dir), builtin_zig_basename);
+ g->compile_var_package = new_package(buf_ptr(this_dir), builtin_zig_basename, "builtin");
g->root_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
g->std_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
g->std_package->package_table.put(buf_create_from_str("std"), g->std_package);
- g->compile_var_import = add_source_file(g, g->compile_var_package, builtin_zig_path, contents);
- scan_import(g, g->compile_var_import);
+ g->compile_var_import = add_source_file(g, g->compile_var_package, builtin_zig_path, contents,
+ SourceKindPkgMain);
return ErrorNone;
}
@@ -7948,17 +7963,20 @@ void codegen_translate_c(CodeGen *g, Buf *full_path) {
Buf *src_dirname = buf_alloc();
os_path_split(full_path, src_dirname, src_basename);
- ImportTableEntry *import = allocate(1);
- import->source_code = nullptr;
- import->path = full_path;
- g->root_import = import;
- import->decls_scope = create_decls_scope(g, nullptr, nullptr, nullptr, import);
+ Buf noextname = BUF_INIT;
+ os_path_extname(src_basename, &noextname, nullptr);
detect_libc(g);
init(g);
- import->di_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(src_basename), buf_ptr(src_dirname));
+ RootStruct *root_struct = allocate(1);
+ root_struct->source_code = nullptr;
+ root_struct->path = full_path;
+ root_struct->di_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(src_basename), buf_ptr(src_dirname));
+
+ ZigType *import = get_root_container_type(g, buf_ptr(&noextname), &noextname, root_struct);
+ g->root_import = import;
ZigList errors = {0};
Error err = parse_h_file(import, &errors, buf_ptr(full_path), g, nullptr);
@@ -7977,7 +7995,7 @@ void codegen_translate_c(CodeGen *g, Buf *full_path) {
}
}
-static ImportTableEntry *add_special_code(CodeGen *g, PackageTableEntry *package, const char *basename) {
+static ZigType *add_special_code(CodeGen *g, ZigPackage *package, const char *basename) {
Buf *code_basename = buf_create_from_str(basename);
Buf path_to_code_src = BUF_INIT;
os_path_join(g->zig_std_special_dir, code_basename, &path_to_code_src);
@@ -7991,21 +8009,21 @@ static ImportTableEntry *add_special_code(CodeGen *g, PackageTableEntry *package
zig_panic("unable to open '%s': %s\n", buf_ptr(&path_to_code_src), err_str(err));
}
- return add_source_file(g, package, resolved_path, import_code);
+ return add_source_file(g, package, resolved_path, import_code, SourceKindPkgMain);
}
-static PackageTableEntry *create_bootstrap_pkg(CodeGen *g, PackageTableEntry *pkg_with_main) {
- PackageTableEntry *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig");
+static ZigPackage *create_bootstrap_pkg(CodeGen *g, ZigPackage *pkg_with_main) {
+ ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");
package->package_table.put(buf_create_from_str("@root"), pkg_with_main);
return package;
}
-static PackageTableEntry *create_test_runner_pkg(CodeGen *g) {
- return codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "test_runner.zig");
+static ZigPackage *create_test_runner_pkg(CodeGen *g) {
+ return codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "test_runner.zig", "std.special");
}
-static PackageTableEntry *create_panic_pkg(CodeGen *g) {
- return codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "panic.zig");
+static ZigPackage *create_panic_pkg(CodeGen *g) {
+ return codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "panic.zig", "std.special");
}
static void create_test_compile_var_and_add_test_runner(CodeGen *g) {
@@ -8089,24 +8107,24 @@ static void gen_root_source(CodeGen *g) {
exit(1);
}
- g->root_import = add_source_file(g, g->root_package, resolved_path, source_code);
+ ZigType *root_import_alias = add_source_file(g, g->root_package, resolved_path, source_code, SourceKindRoot);
+ assert(root_import_alias == g->root_import);
assert(g->root_out_name);
assert(g->out_type != OutTypeUnknown);
{
// Zig has lazy top level definitions. Here we semantically analyze the panic function.
- ImportTableEntry *import_with_panic;
+ ZigType *import_with_panic;
if (g->have_pub_panic) {
import_with_panic = g->root_import;
} else {
g->panic_package = create_panic_pkg(g);
import_with_panic = add_special_code(g, g->panic_package, "panic.zig");
}
- scan_import(g, import_with_panic);
- Tld *panic_tld = find_decl(g, &import_with_panic->decls_scope->base, buf_create_from_str("panic"));
+ Tld *panic_tld = find_decl(g, &get_container_scope(import_with_panic)->base, buf_create_from_str("panic"));
assert(panic_tld != nullptr);
- resolve_top_level_decl(g, panic_tld, false, nullptr);
+ resolve_top_level_decl(g, panic_tld, nullptr);
}
@@ -8358,7 +8376,6 @@ static void prepend_c_type_to_decl_list(CodeGen *g, GenH *gen_h, ZigType *type_e
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdErrorUnion:
@@ -8496,7 +8513,7 @@ static void get_c_type(CodeGen *g, GenH *gen_h, ZigType *type_entry, Buf *out_bu
if (child_type->zero_bits) {
buf_init_from_str(out_buf, "bool");
return;
- } else if (type_is_codegen_pointer(child_type)) {
+ } else if (type_is_non_optional_pointer(child_type)) {
return get_c_type(g, gen_h, child_type, out_buf);
} else {
zig_unreachable();
@@ -8506,19 +8523,19 @@ static void get_c_type(CodeGen *g, GenH *gen_h, ZigType *type_entry, Buf *out_bu
case ZigTypeIdOpaque:
{
buf_init_from_str(out_buf, "struct ");
- buf_append_buf(out_buf, &type_entry->name);
+ buf_append_buf(out_buf, type_h_name(type_entry));
return;
}
case ZigTypeIdUnion:
{
buf_init_from_str(out_buf, "union ");
- buf_append_buf(out_buf, &type_entry->name);
+ buf_append_buf(out_buf, type_h_name(type_entry));
return;
}
case ZigTypeIdEnum:
{
buf_init_from_str(out_buf, "enum ");
- buf_append_buf(out_buf, &type_entry->name);
+ buf_append_buf(out_buf, type_h_name(type_entry));
return;
}
case ZigTypeIdArray:
@@ -8541,7 +8558,6 @@ static void get_c_type(CodeGen *g, GenH *gen_h, ZigType *type_entry, Buf *out_bu
case ZigTypeIdInvalid:
case ZigTypeIdMetaType:
case ZigTypeIdBoundFn:
- case ZigTypeIdNamespace:
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
@@ -8614,10 +8630,17 @@ static void gen_h_file(CodeGen *g) {
Buf return_type_c = BUF_INIT;
get_c_type(g, gen_h, fn_type_id->return_type, &return_type_c);
+ Buf *symbol_name;
+ if (fn_table_entry->export_list.length == 0) {
+ symbol_name = &fn_table_entry->symbol_name;
+ } else {
+ FnExport *fn_export = &fn_table_entry->export_list.items[0];
+ symbol_name = &fn_export->name;
+ }
buf_appendf(&h_buf, "%s %s %s(",
buf_ptr(export_macro),
buf_ptr(&return_type_c),
- buf_ptr(&fn_table_entry->symbol_name));
+ buf_ptr(symbol_name));
Buf param_type_c = BUF_INIT;
if (fn_type_id->param_count > 0) {
@@ -8693,7 +8716,6 @@ static void gen_h_file(CodeGen *g) {
case ZigTypeIdNull:
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOptional:
@@ -8703,7 +8725,7 @@ static void gen_h_file(CodeGen *g) {
zig_unreachable();
case ZigTypeIdEnum:
if (type_entry->data.enumeration.layout == ContainerLayoutExtern) {
- fprintf(out_h, "enum %s {\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "enum %s {\n", buf_ptr(type_h_name(type_entry)));
for (uint32_t field_i = 0; field_i < type_entry->data.enumeration.src_field_count; field_i += 1) {
TypeEnumField *enum_field = &type_entry->data.enumeration.fields[field_i];
Buf *value_buf = buf_alloc();
@@ -8716,12 +8738,12 @@ static void gen_h_file(CodeGen *g) {
}
fprintf(out_h, "};\n\n");
} else {
- fprintf(out_h, "enum %s;\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "enum %s;\n", buf_ptr(type_h_name(type_entry)));
}
break;
case ZigTypeIdStruct:
if (type_entry->data.structure.layout == ContainerLayoutExtern) {
- fprintf(out_h, "struct %s {\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "struct %s {\n", buf_ptr(type_h_name(type_entry)));
for (uint32_t field_i = 0; field_i < type_entry->data.structure.src_field_count; field_i += 1) {
TypeStructField *struct_field = &type_entry->data.structure.fields[field_i];
@@ -8739,12 +8761,12 @@ static void gen_h_file(CodeGen *g) {
}
fprintf(out_h, "};\n\n");
} else {
- fprintf(out_h, "struct %s;\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "struct %s;\n", buf_ptr(type_h_name(type_entry)));
}
break;
case ZigTypeIdUnion:
if (type_entry->data.unionation.layout == ContainerLayoutExtern) {
- fprintf(out_h, "union %s {\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "union %s {\n", buf_ptr(type_h_name(type_entry)));
for (uint32_t field_i = 0; field_i < type_entry->data.unionation.src_field_count; field_i += 1) {
TypeUnionField *union_field = &type_entry->data.unionation.fields[field_i];
@@ -8754,11 +8776,11 @@ static void gen_h_file(CodeGen *g) {
}
fprintf(out_h, "};\n\n");
} else {
- fprintf(out_h, "union %s;\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "union %s;\n", buf_ptr(type_h_name(type_entry)));
}
break;
case ZigTypeIdOpaque:
- fprintf(out_h, "struct %s;\n\n", buf_ptr(&type_entry->name));
+ fprintf(out_h, "struct %s;\n\n", buf_ptr(type_h_name(type_entry)));
break;
}
}
@@ -8792,7 +8814,7 @@ void codegen_add_time_event(CodeGen *g, const char *name) {
g->timing_events.append({os_get_time(), name});
}
-static void add_cache_pkg(CodeGen *g, CacheHash *ch, PackageTableEntry *pkg) {
+static void add_cache_pkg(CodeGen *g, CacheHash *ch, ZigPackage *pkg) {
if (buf_len(&pkg->root_src_path) == 0)
return;
@@ -9046,9 +9068,11 @@ void codegen_build_and_link(CodeGen *g) {
codegen_add_time_event(g, "Done");
}
-PackageTableEntry *codegen_create_package(CodeGen *g, const char *root_src_dir, const char *root_src_path) {
+ZigPackage *codegen_create_package(CodeGen *g, const char *root_src_dir, const char *root_src_path,
+ const char *pkg_path)
+{
init(g);
- PackageTableEntry *pkg = new_package(root_src_dir, root_src_path);
+ ZigPackage *pkg = new_package(root_src_dir, root_src_path, pkg_path);
if (g->std_package != nullptr) {
assert(g->compile_var_package != nullptr);
pkg->package_table.put(buf_create_from_str("std"), g->std_package);
diff --git a/src/codegen.hpp b/src/codegen.hpp
index 4f62cc4cbc..91598fa7be 100644
--- a/src/codegen.hpp
+++ b/src/codegen.hpp
@@ -15,8 +15,8 @@
#include
-CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out_type, BuildMode build_mode,
- Buf *zig_lib_dir, Buf *override_std_dir, ZigLibCInstallation *libc);
+CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget *target,
+ OutType out_type, BuildMode build_mode, Buf *zig_lib_dir, Buf *override_std_dir, ZigLibCInstallation *libc);
void codegen_set_clang_argv(CodeGen *codegen, const char **args, size_t len);
void codegen_set_llvm_argv(CodeGen *codegen, const char **args, size_t len);
@@ -48,7 +48,8 @@ void codegen_print_timing_report(CodeGen *g, FILE *f);
void codegen_link(CodeGen *g);
void codegen_build_and_link(CodeGen *g);
-PackageTableEntry *codegen_create_package(CodeGen *g, const char *root_src_dir, const char *root_src_path);
+ZigPackage *codegen_create_package(CodeGen *g, const char *root_src_dir, const char *root_src_path,
+ const char *pkg_path);
void codegen_add_assembly(CodeGen *g, Buf *path);
void codegen_add_object(CodeGen *g, Buf *object_path);
diff --git a/src/compiler.cpp b/src/compiler.cpp
index 0d4dff5d50..8c2f9cdf60 100644
--- a/src/compiler.cpp
+++ b/src/compiler.cpp
@@ -78,8 +78,8 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
Buf std_buf = BUF_INIT;
buf_init_from_str(&std_buf, "std");
- Buf index_zig_buf = BUF_INIT;
- buf_init_from_str(&index_zig_buf, "index.zig");
+ Buf std_zig_buf = BUF_INIT;
+ buf_init_from_str(&std_zig_buf, "std.zig");
Buf test_lib_dir = BUF_INIT;
Buf test_zig_dir = BUF_INIT;
@@ -89,7 +89,7 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
os_path_join(test_path, &lib_buf, &test_lib_dir);
os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
- os_path_join(&test_std_dir, &index_zig_buf, &test_index_file);
+ os_path_join(&test_std_dir, &std_zig_buf, &test_index_file);
int err;
bool exists;
diff --git a/src/ir.cpp b/src/ir.cpp
index 87e03ea519..5b1b9d9bff 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -258,7 +258,6 @@ static bool types_have_same_zig_comptime_repr(ZigType *a, ZigType *b) {
case ZigTypeIdPointer:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdErrorSet:
case ZigTypeIdOpaque:
@@ -1123,11 +1122,11 @@ static IrInstruction *ir_create_const_fn(IrBuilder *irb, Scope *scope, AstNode *
return &const_instruction->base;
}
-static IrInstruction *ir_build_const_import(IrBuilder *irb, Scope *scope, AstNode *source_node, ImportTableEntry *import) {
+static IrInstruction *ir_build_const_import(IrBuilder *irb, Scope *scope, AstNode *source_node, ZigType *import) {
IrInstructionConst *const_instruction = ir_build_instruction(irb, scope, source_node);
- const_instruction->base.value.type = irb->codegen->builtin_types.entry_namespace;
+ const_instruction->base.value.type = irb->codegen->builtin_types.entry_type;
const_instruction->base.value.special = ConstValSpecialStatic;
- const_instruction->base.value.data.x_import = import;
+ const_instruction->base.value.data.x_type = import;
return &const_instruction->base;
}
@@ -3824,7 +3823,7 @@ static IrInstruction *ir_gen_symbol(IrBuilder *irb, Scope *scope, AstNode *node,
if (tld)
return ir_build_decl_ref(irb, scope, node, tld, lval);
- if (node->owner->any_imports_failed) {
+ if (get_container_scope(node->owner)->any_imports_failed) {
// skip the error message since we had a failing import in this file
// if an import breaks we don't need redundant undeclared identifier errors
return irb->codegen->invalid_instruction;
@@ -6609,20 +6608,32 @@ static bool render_instance_name_recursive(CodeGen *codegen, Buf *name, Scope *o
return true;
}
-static Buf *get_anon_type_name(CodeGen *codegen, IrExecutable *exec, const char *kind_name, AstNode *source_node) {
+static Buf *get_anon_type_name(CodeGen *codegen, IrExecutable *exec, const char *kind_name,
+ Scope *scope, AstNode *source_node, Buf *out_bare_name)
+{
if (exec->name) {
- return exec->name;
+ ZigType *import = get_scope_import(scope);
+ Buf *namespace_name = buf_create_from_buf(&import->name);
+ if (buf_len(namespace_name) != 0) buf_append_char(namespace_name, NAMESPACE_SEP_CHAR);
+ buf_append_buf(namespace_name, exec->name);
+ buf_init_from_buf(out_bare_name, exec->name);
+ return namespace_name;
} else if (exec->name_fn != nullptr) {
Buf *name = buf_alloc();
buf_append_buf(name, &exec->name_fn->symbol_name);
buf_appendf(name, "(");
render_instance_name_recursive(codegen, name, &exec->name_fn->fndef_scope->base, exec->begin_scope);
buf_appendf(name, ")");
+ buf_init_from_buf(out_bare_name, name);
return name;
} else {
- //Note: C-imports do not have valid location information
- return buf_sprintf("(anonymous %s at %s:%" ZIG_PRI_usize ":%" ZIG_PRI_usize ")", kind_name,
- (source_node->owner->path != nullptr) ? buf_ptr(source_node->owner->path) : "(null)", source_node->line + 1, source_node->column + 1);
+ ZigType *import = get_scope_import(scope);
+ Buf *namespace_name = buf_create_from_buf(&import->name);
+ if (buf_len(namespace_name) != 0) buf_append_char(namespace_name, NAMESPACE_SEP_CHAR);
+ buf_appendf(namespace_name, "%s:%" ZIG_PRI_usize ":%" ZIG_PRI_usize, kind_name,
+ source_node->line + 1, source_node->column + 1);
+ buf_init_from_buf(out_bare_name, namespace_name);
+ return namespace_name;
}
}
@@ -6630,24 +6641,23 @@ static IrInstruction *ir_gen_container_decl(IrBuilder *irb, Scope *parent_scope,
assert(node->type == NodeTypeContainerDecl);
ContainerKind kind = node->data.container_decl.kind;
- Buf *name = get_anon_type_name(irb->codegen, irb->exec, container_string(kind), node);
-
- VisibMod visib_mod = VisibModPub;
- TldContainer *tld_container = allocate(1);
- init_tld(&tld_container->base, TldIdContainer, name, visib_mod, node, parent_scope);
+ Buf *bare_name = buf_alloc();
+ Buf *name = get_anon_type_name(irb->codegen, irb->exec, container_string(kind), parent_scope, node, bare_name);
ContainerLayout layout = node->data.container_decl.layout;
ZigType *container_type = get_partial_container_type(irb->codegen, parent_scope,
- kind, node, buf_ptr(name), layout);
+ kind, node, buf_ptr(name), bare_name, layout);
ScopeDecls *child_scope = get_container_scope(container_type);
- tld_container->type_entry = container_type;
- tld_container->decls_scope = child_scope;
-
for (size_t i = 0; i < node->data.container_decl.decls.length; i += 1) {
AstNode *child_node = node->data.container_decl.decls.at(i);
scan_decls(irb->codegen, child_scope, child_node);
}
+
+ TldContainer *tld_container = allocate(1);
+ init_tld(&tld_container->base, TldIdContainer, bare_name, VisibModPub, node, parent_scope);
+ tld_container->type_entry = container_type;
+ tld_container->decls_scope = child_scope;
irb->codegen->resolve_queue.append(&tld_container->base);
// Add this to the list to mark as invalid if analyzing this exec fails.
@@ -6732,7 +6742,8 @@ static IrInstruction *ir_gen_err_set_decl(IrBuilder *irb, Scope *parent_scope, A
uint32_t err_count = node->data.err_set_decl.decls.length;
- Buf *type_name = get_anon_type_name(irb->codegen, irb->exec, "error set", node);
+ Buf bare_name = BUF_INIT;
+ Buf *type_name = get_anon_type_name(irb->codegen, irb->exec, "error", parent_scope, node, &bare_name);
ZigType *err_set_type = new_type_table_entry(ZigTypeIdErrorSet);
buf_init_from_buf(&err_set_type->name, type_name);
err_set_type->data.error_set.err_count = err_count;
@@ -12065,7 +12076,6 @@ static IrInstruction *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstructionBinOp *
case ZigTypeIdErrorSet:
case ZigTypeIdFn:
case ZigTypeIdOpaque:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -13407,7 +13417,6 @@ static IrInstruction *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructio
case ZigTypeIdOptional:
case ZigTypeIdErrorUnion:
case ZigTypeIdErrorSet:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -13432,7 +13441,6 @@ static IrInstruction *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructio
case ZigTypeIdErrorSet:
case ZigTypeIdVector:
zig_panic("TODO export const value of type %s", buf_ptr(&target->value.type->name));
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
@@ -14616,7 +14624,6 @@ static IrInstruction *ir_analyze_maybe(IrAnalyze *ira, IrInstructionUnOp *un_op_
case ZigTypeIdEnum:
case ZigTypeIdUnion:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdPromise:
@@ -15368,7 +15375,7 @@ static IrInstruction *ir_analyze_container_member_access_inner(IrAnalyze *ira,
auto entry = container_scope->decl_table.maybe_get(field_name);
Tld *tld = entry ? entry->value : nullptr;
if (tld && tld->id == TldIdFn) {
- resolve_top_level_decl(ira->codegen, tld, false, source_instr->source_node);
+ resolve_top_level_decl(ira->codegen, tld, source_instr->source_node);
if (tld->resolution == TldResolutionInvalid)
return ira->codegen->invalid_instruction;
TldFn *tld_fn = (TldFn *)tld;
@@ -15557,8 +15564,7 @@ static void add_link_lib_symbol(IrAnalyze *ira, Buf *lib_name, Buf *symbol_name,
static IrInstruction *ir_analyze_decl_ref(IrAnalyze *ira, IrInstruction *source_instruction, Tld *tld) {
- bool pointer_only = false;
- resolve_top_level_decl(ira->codegen, tld, pointer_only, source_instruction->source_node);
+ resolve_top_level_decl(ira->codegen, tld, source_instruction->source_node);
if (tld->resolution == TldResolutionInvalid)
return ira->codegen->invalid_instruction;
@@ -15735,12 +15741,17 @@ static IrInstruction *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstruc
}
}
ScopeDecls *container_scope = get_container_scope(child_type);
- if (container_scope != nullptr) {
- auto entry = container_scope->decl_table.maybe_get(field_name);
- Tld *tld = entry ? entry->value : nullptr;
- if (tld) {
- return ir_analyze_decl_ref(ira, &field_ptr_instruction->base, tld);
+ Tld *tld = find_container_decl(ira->codegen, container_scope, field_name);
+ if (tld) {
+ if (tld->visib_mod == VisibModPrivate &&
+ tld->import != get_scope_import(field_ptr_instruction->base.scope))
+ {
+ ErrorMsg *msg = ir_add_error(ira, &field_ptr_instruction->base,
+ buf_sprintf("'%s' is private", buf_ptr(field_name)));
+ add_error_note(ira->codegen, msg, tld->source_node, buf_sprintf("declared here"));
+ return ira->codegen->invalid_instruction;
}
+ return ir_analyze_decl_ref(ira, &field_ptr_instruction->base, tld);
}
if (child_type->id == ZigTypeIdUnion &&
(child_type->data.unionation.decl_node->data.container_decl.init_arg_expr != nullptr ||
@@ -15758,9 +15769,11 @@ static IrInstruction *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstruc
ConstPtrMutComptimeConst, ptr_is_const, ptr_is_volatile, 0);
}
}
+ const char *container_name = (child_type == ira->codegen->root_import) ?
+ "root source file" : buf_ptr(buf_sprintf("container '%s'", buf_ptr(&child_type->name)));
ir_add_error(ira, &field_ptr_instruction->base,
- buf_sprintf("container '%s' has no member called '%s'",
- buf_ptr(&child_type->name), buf_ptr(field_name)));
+ buf_sprintf("%s has no member called '%s'",
+ container_name, buf_ptr(field_name)));
return ira->codegen->invalid_instruction;
} else if (child_type->id == ZigTypeIdErrorSet) {
ErrorTableEntry *err_entry;
@@ -15971,37 +15984,6 @@ static IrInstruction *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstruc
buf_sprintf("type '%s' does not support field access", buf_ptr(&child_type->name)));
return ira->codegen->invalid_instruction;
}
- } else if (container_type->id == ZigTypeIdNamespace) {
- assert(container_ptr->value.type->id == ZigTypeIdPointer);
- ConstExprValue *container_ptr_val = ir_resolve_const(ira, container_ptr, UndefBad);
- if (!container_ptr_val)
- return ira->codegen->invalid_instruction;
-
- ConstExprValue *namespace_val = const_ptr_pointee(ira, ira->codegen, container_ptr_val,
- field_ptr_instruction->base.source_node);
- if (namespace_val == nullptr)
- return ira->codegen->invalid_instruction;
- assert(namespace_val->special == ConstValSpecialStatic);
-
- ImportTableEntry *namespace_import = namespace_val->data.x_import;
-
- Tld *tld = find_decl(ira->codegen, &namespace_import->decls_scope->base, field_name);
- if (tld) {
- if (tld->visib_mod == VisibModPrivate &&
- tld->import != source_node->owner)
- {
- ErrorMsg *msg = ir_add_error_node(ira, source_node,
- buf_sprintf("'%s' is private", buf_ptr(field_name)));
- add_error_note(ira->codegen, msg, tld->source_node, buf_sprintf("declared here"));
- return ira->codegen->invalid_instruction;
- }
- return ir_analyze_decl_ref(ira, &field_ptr_instruction->base, tld);
- } else {
- const char *import_name = namespace_import->path ? buf_ptr(namespace_import->path) : "(C import)";
- ir_add_error_node(ira, source_node,
- buf_sprintf("no member named '%s' in '%s'", buf_ptr(field_name), import_name));
- return ira->codegen->invalid_instruction;
- }
} else {
ir_add_error_node(ira, field_ptr_instruction->base.source_node,
buf_sprintf("type '%s' does not support field access", buf_ptr(&container_type->name)));
@@ -16281,7 +16263,6 @@ static IrInstruction *ir_analyze_instruction_slice_type(IrAnalyze *ira,
case ZigTypeIdEnum:
case ZigTypeIdUnion:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdPromise:
case ZigTypeIdVector:
@@ -16402,7 +16383,6 @@ static IrInstruction *ir_analyze_instruction_array_type(IrAnalyze *ira,
case ZigTypeIdEnum:
case ZigTypeIdUnion:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdPromise:
case ZigTypeIdVector:
@@ -16452,7 +16432,6 @@ static IrInstruction *ir_analyze_instruction_size_of(IrAnalyze *ira,
case ZigTypeIdComptimeInt:
case ZigTypeIdBoundFn:
case ZigTypeIdMetaType:
- case ZigTypeIdNamespace:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
ir_add_error_node(ira, size_of_instruction->base.source_node,
@@ -16860,7 +16839,6 @@ static IrInstruction *ir_analyze_instruction_switch_target(IrAnalyze *ira,
case ZigTypeIdPointer:
case ZigTypeIdPromise:
case ZigTypeIdFn:
- case ZigTypeIdNamespace:
case ZigTypeIdErrorSet: {
if (pointee_val) {
IrInstruction *result = ir_const(ira, &switch_target_instruction->base, nullptr);
@@ -17009,25 +16987,29 @@ static IrInstruction *ir_analyze_instruction_import(IrAnalyze *ira, IrInstructio
return ira->codegen->invalid_instruction;
AstNode *source_node = import_instruction->base.source_node;
- ImportTableEntry *import = source_node->owner;
+ ZigType *import = source_node->owner;
Buf *import_target_path;
Buf *search_dir;
- assert(import->package);
- PackageTableEntry *target_package;
- auto package_entry = import->package->package_table.maybe_get(import_target_str);
+ assert(import->data.structure.root_struct->package);
+ ZigPackage *target_package;
+ auto package_entry = import->data.structure.root_struct->package->package_table.maybe_get(import_target_str);
+ SourceKind source_kind;
if (package_entry) {
target_package = package_entry->value;
import_target_path = &target_package->root_src_path;
search_dir = &target_package->root_src_dir;
+ source_kind = SourceKindPkgMain;
} else {
// try it as a filename
- target_package = import->package;
+ target_package = import->data.structure.root_struct->package;
import_target_path = import_target_str;
// search relative to importing file
search_dir = buf_alloc();
- os_path_dirname(import->path, search_dir);
+ os_path_dirname(import->data.structure.root_struct->path, search_dir);
+
+ source_kind = SourceKindNonRoot;
}
Buf full_path = BUF_INIT;
@@ -17041,10 +17023,19 @@ static IrInstruction *ir_analyze_instruction_import(IrAnalyze *ira, IrInstructio
auto import_entry = ira->codegen->import_table.maybe_get(resolved_path);
if (import_entry) {
- IrInstruction *result = ir_const(ira, &import_instruction->base,
- ira->codegen->builtin_types.entry_namespace);
- result->value.data.x_import = import_entry->value;
- return result;
+ return ir_const_type(ira, &import_instruction->base, import_entry->value);
+ }
+
+ if (source_kind == SourceKindNonRoot) {
+ ZigPackage *cur_scope_pkg = scope_package(import_instruction->base.scope);
+ Buf *pkg_root_src_dir = &cur_scope_pkg->root_src_dir;
+ Buf resolved_root_src_dir = os_path_resolve(&pkg_root_src_dir, 1);
+ if (!buf_starts_with_buf(resolved_path, &resolved_root_src_dir)) {
+ ir_add_error_node(ira, source_node,
+ buf_sprintf("import of file outside package path: '%s'",
+ buf_ptr(import_target_path)));
+ return ira->codegen->invalid_instruction;
+ }
}
if ((err = file_fetch(ira->codegen, resolved_path, import_code))) {
@@ -17059,13 +17050,9 @@ static IrInstruction *ir_analyze_instruction_import(IrAnalyze *ira, IrInstructio
}
}
- ImportTableEntry *target_import = add_source_file(ira->codegen, target_package, resolved_path, import_code);
+ ZigType *target_import = add_source_file(ira->codegen, target_package, resolved_path, import_code, source_kind);
- scan_import(ira->codegen, target_import);
-
- IrInstruction *result = ir_const(ira, &import_instruction->base, ira->codegen->builtin_types.entry_namespace);
- result->value.data.x_import = target_import;
- return result;
+ return ir_const_type(ira, &import_instruction->base, target_import);
}
static IrInstruction *ir_analyze_instruction_ref(IrAnalyze *ira, IrInstructionRef *ref_instruction) {
@@ -17398,17 +17385,7 @@ static IrInstruction *ir_analyze_instruction_compile_err(IrAnalyze *ira,
return ira->codegen->invalid_instruction;
ErrorMsg *msg = ir_add_error(ira, &instruction->base, msg_buf);
- size_t i = ira->codegen->tld_ref_source_node_stack.length;
- for (;;) {
- if (i == 0)
- break;
- i -= 1;
- AstNode *source_node = ira->codegen->tld_ref_source_node_stack.at(i);
- if (source_node) {
- add_error_note(ira->codegen, msg, source_node,
- buf_sprintf("referenced here"));
- }
- }
+ emit_error_notes_for_ref_stack(ira->codegen, msg);
return ira->codegen->invalid_instruction;
}
@@ -17665,6 +17642,12 @@ static IrInstruction *ir_analyze_instruction_bit_offset_of(IrAnalyze *ira,
return ir_const_unsigned(ira, &instruction->base, bit_offset);
}
+static IrInstruction *ir_error_dependency_loop(IrAnalyze *ira, IrInstruction *source_instr) {
+ ErrorMsg *msg = ir_add_error(ira, source_instr, buf_sprintf("dependency loop detected"));
+ emit_error_notes_for_ref_stack(ira->codegen, msg);
+ return ira->codegen->invalid_instruction;
+}
+
static void ensure_field_index(ZigType *type, const char *field_name, size_t index) {
Buf *field_name_buf;
@@ -17711,7 +17694,9 @@ static ZigType *ir_type_info_get_type(IrAnalyze *ira, const char *type_name, Zig
return var->const_value->data.x_type;
}
-static Error ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, ScopeDecls *decls_scope) {
+static Error ir_make_type_info_defs(IrAnalyze *ira, IrInstruction *source_instr, ConstExprValue *out_val,
+ ScopeDecls *decls_scope)
+{
Error err;
ZigType *type_info_definition_type = ir_type_info_get_type(ira, "Definition", nullptr);
if ((err = ensure_complete_type(ira->codegen, type_info_definition_type)))
@@ -17741,7 +17726,7 @@ static Error ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Sco
while ((curr_entry = decl_it.next()) != nullptr) {
// If the definition is unresolved, force it to be resolved again.
if (curr_entry->value->resolution == TldResolutionUnresolved) {
- resolve_top_level_decl(ira->codegen, curr_entry->value, false, curr_entry->value->source_node);
+ resolve_top_level_decl(ira->codegen, curr_entry->value, curr_entry->value->source_node);
if (curr_entry->value->resolution != TldResolutionOk) {
return ErrorSemanticAnalyzeFail;
}
@@ -17831,6 +17816,11 @@ static Error ir_make_type_info_defs(IrAnalyze *ira, ConstExprValue *out_val, Sco
ZigFn *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
assert(!fn_entry->is_test);
+ if (fn_entry->type_entry == nullptr) {
+ ir_error_dependency_loop(ira, source_instr);
+ return ErrorSemanticAnalyzeFail;
+ }
+
AstNodeFnProto *fn_node = (AstNodeFnProto *)(fn_entry->proto_node);
ConstExprValue *fn_def_val = create_const_vals(1);
@@ -18007,7 +17997,7 @@ static ConstExprValue *create_ptr_like_type_info(IrAnalyze *ira, ZigType *ptr_ty
// alignment: u32
ensure_field_index(result->type, "alignment", 3);
fields[3].special = ConstValSpecialStatic;
- fields[3].type = get_int_type(ira->codegen, false, 29);
+ fields[3].type = ira->codegen->builtin_types.entry_num_lit_int;
bigint_init_unsigned(&fields[3].data.x_bigint, get_ptr_align(ira->codegen, attrs_type));
// child: type
ensure_field_index(result->type, "child", 4);
@@ -18026,7 +18016,7 @@ static void make_enum_field_val(IrAnalyze *ira, ConstExprValue *enum_field_val,
ConstExprValue *inner_fields = create_const_vals(2);
inner_fields[1].special = ConstValSpecialStatic;
- inner_fields[1].type = ira->codegen->builtin_types.entry_usize;
+ inner_fields[1].type = ira->codegen->builtin_types.entry_num_lit_int;
ConstExprValue *name = create_const_str_lit(ira->codegen, enum_field->name);
init_const_slice(ira->codegen, &inner_fields[0], name, 0, buf_len(enum_field->name), true);
@@ -18036,7 +18026,9 @@ static void make_enum_field_val(IrAnalyze *ira, ConstExprValue *enum_field_val,
enum_field_val->data.x_struct.fields = inner_fields;
}
-static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigType *type_entry, ConstExprValue **out) {
+static Error ir_make_type_info_value(IrAnalyze *ira, IrInstruction *source_instr, ZigType *type_entry,
+ ConstExprValue **out)
+{
Error err;
assert(type_entry != nullptr);
assert(!type_is_invalid(type_entry));
@@ -18056,7 +18048,6 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
*out = nullptr;
@@ -18089,7 +18080,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
// bits: u8
ensure_field_index(result->type, "bits", 1);
fields[1].special = ConstValSpecialStatic;
- fields[1].type = ira->codegen->builtin_types.entry_u8;
+ fields[1].type = ira->codegen->builtin_types.entry_num_lit_int;
bigint_init_unsigned(&fields[1].data.x_bigint, type_entry->data.integral.bit_count);
break;
@@ -18106,7 +18097,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
// bits: u8
ensure_field_index(result->type, "bits", 0);
fields[0].special = ConstValSpecialStatic;
- fields[0].type = ira->codegen->builtin_types.entry_u8;
+ fields[0].type = ira->codegen->builtin_types.entry_num_lit_int;
bigint_init_unsigned(&fields->data.x_bigint, type_entry->data.floating.bit_count);
break;
@@ -18130,7 +18121,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
// len: usize
ensure_field_index(result->type, "len", 0);
fields[0].special = ConstValSpecialStatic;
- fields[0].type = ira->codegen->builtin_types.entry_usize;
+ fields[0].type = ira->codegen->builtin_types.entry_num_lit_int;
bigint_init_unsigned(&fields[0].data.x_bigint, type_entry->data.array.len);
// child: type
ensure_field_index(result->type, "child", 1);
@@ -18151,7 +18142,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
// len: usize
ensure_field_index(result->type, "len", 0);
fields[0].special = ConstValSpecialStatic;
- fields[0].type = ira->codegen->builtin_types.entry_u32;
+ fields[0].type = ira->codegen->builtin_types.entry_num_lit_int;
bigint_init_unsigned(&fields[0].data.x_bigint, type_entry->data.vector.len);
// child: type
ensure_field_index(result->type, "child", 1);
@@ -18248,8 +18239,11 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
}
// defs: []TypeInfo.Definition
ensure_field_index(result->type, "defs", 3);
- if ((err = ir_make_type_info_defs(ira, &fields[3], type_entry->data.enumeration.decls_scope)))
+ if ((err = ir_make_type_info_defs(ira, source_instr, &fields[3],
+ type_entry->data.enumeration.decls_scope)))
+ {
return err;
+ }
break;
}
@@ -18266,11 +18260,11 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
ensure_field_index(result->type, "errors", 0);
ZigType *type_info_error_type = ir_type_info_get_type(ira, "Error", nullptr);
- if (!resolve_inferred_error_set(ira->codegen, type_entry, source_node)) {
+ if (!resolve_inferred_error_set(ira->codegen, type_entry, source_instr->source_node)) {
return ErrorSemanticAnalyzeFail;
}
if (type_is_global_error_set(type_entry)) {
- ir_add_error_node(ira, source_node,
+ ir_add_error(ira, source_instr,
buf_sprintf("TODO: compiler bug: implement @typeInfo support for anyerror. https://github.com/ziglang/zig/issues/1936"));
return ErrorSemanticAnalyzeFail;
}
@@ -18292,7 +18286,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
ConstExprValue *inner_fields = create_const_vals(2);
inner_fields[1].special = ConstValSpecialStatic;
- inner_fields[1].type = ira->codegen->builtin_types.entry_usize;
+ inner_fields[1].type = ira->codegen->builtin_types.entry_num_lit_int;
ConstExprValue *name = nullptr;
if (error->cached_error_name_val != nullptr)
@@ -18412,8 +18406,11 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
}
// defs: []TypeInfo.Definition
ensure_field_index(result->type, "defs", 3);
- if ((err = ir_make_type_info_defs(ira, &fields[3], type_entry->data.unionation.decls_scope)))
+ if ((err = ir_make_type_info_defs(ira, source_instr, &fields[3],
+ type_entry->data.unionation.decls_scope)))
+ {
return err;
+ }
break;
}
@@ -18461,7 +18458,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
ConstExprValue *inner_fields = create_const_vals(3);
inner_fields[1].special = ConstValSpecialStatic;
- inner_fields[1].type = get_optional_type(ira->codegen, ira->codegen->builtin_types.entry_usize);
+ inner_fields[1].type = get_optional_type(ira->codegen, ira->codegen->builtin_types.entry_num_lit_int);
if (!type_has_bits(struct_field->type_entry)) {
inner_fields[1].data.x_optional = nullptr;
@@ -18487,8 +18484,11 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
}
// defs: []TypeInfo.Definition
ensure_field_index(result->type, "defs", 2);
- if ((err = ir_make_type_info_defs(ira, &fields[2], type_entry->data.structure.decls_scope)))
+ if ((err = ir_make_type_info_defs(ira, source_instr, &fields[2],
+ type_entry->data.structure.decls_scope)))
+ {
return err;
+ }
break;
}
@@ -18600,7 +18600,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, AstNode *source_node, ZigTy
{
ZigType *fn_type = type_entry->data.bound_fn.fn_type;
assert(fn_type->id == ZigTypeIdFn);
- if ((err = ir_make_type_info_value(ira, source_node, fn_type, &result)))
+ if ((err = ir_make_type_info_value(ira, source_instr, fn_type, &result)))
return err;
break;
@@ -18625,7 +18625,7 @@ static IrInstruction *ir_analyze_instruction_type_info(IrAnalyze *ira,
ZigType *result_type = ir_type_info_get_type(ira, nullptr, nullptr);
ConstExprValue *payload;
- if ((err = ir_make_type_info_value(ira, instruction->base.source_node, type_entry, &payload)))
+ if ((err = ir_make_type_info_value(ira, &instruction->base, type_entry, &payload)))
return ira->codegen->invalid_instruction;
IrInstruction *result = ir_const(ira, &instruction->base, result_type);
@@ -18680,7 +18680,7 @@ static IrInstruction *ir_analyze_instruction_type_name(IrAnalyze *ira, IrInstruc
return ira->codegen->invalid_instruction;
if (!type_entry->cached_const_name_val) {
- type_entry->cached_const_name_val = create_const_str_lit(ira->codegen, &type_entry->name);
+ type_entry->cached_const_name_val = create_const_str_lit(ira->codegen, type_bare_name(type_entry));
}
IrInstruction *result = ir_const(ira, &instruction->base, nullptr);
copy_const_val(&result->value, type_entry->cached_const_name_val, true);
@@ -18702,14 +18702,21 @@ static IrInstruction *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruct
if (type_is_invalid(cimport_result->type))
return ira->codegen->invalid_instruction;
- ImportTableEntry *child_import = allocate(1);
- child_import->decls_scope = create_decls_scope(ira->codegen, node, nullptr, nullptr, child_import);
- child_import->c_import_node = node;
- child_import->package = new_anonymous_package();
- child_import->package->package_table.put(buf_create_from_str("builtin"), ira->codegen->compile_var_package);
- child_import->package->package_table.put(buf_create_from_str("std"), ira->codegen->std_package);
- child_import->di_file = ZigLLVMCreateFile(ira->codegen->dbuilder,
+ ZigPackage *cur_scope_pkg = scope_package(instruction->base.scope);
+ Buf *namespace_name = buf_sprintf("%s.cimport:%" ZIG_PRI_usize ":%" ZIG_PRI_usize,
+ buf_ptr(&cur_scope_pkg->pkg_path), node->line + 1, node->column + 1);
+
+ RootStruct *root_struct = allocate(1);
+ root_struct->package = new_anonymous_package();
+ root_struct->package->package_table.put(buf_create_from_str("builtin"), ira->codegen->compile_var_package);
+ root_struct->package->package_table.put(buf_create_from_str("std"), ira->codegen->std_package);
+ root_struct->c_import_node = node;
+ // TODO create namespace_name file in zig-cache instead of /tmp and use it
+ // for this DIFile
+ root_struct->di_file = ZigLLVMCreateFile(ira->codegen->dbuilder,
buf_ptr(buf_create_from_str("cimport.h")), buf_ptr(buf_create_from_str(".")));
+ ZigType *child_import = get_root_container_type(ira->codegen, buf_ptr(namespace_name),
+ namespace_name, root_struct);
ZigList errors = {0};
@@ -18738,14 +18745,12 @@ static IrInstruction *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruct
if (ira->codegen->verbose_cimport) {
fprintf(stderr, "\nC imports:\n");
fprintf(stderr, "-----------\n");
- ast_render(ira->codegen, stderr, child_import->root, 4);
+ ast_render(ira->codegen, stderr, child_import->data.structure.decl_node, 4);
}
- scan_decls(ira->codegen, child_import->decls_scope, child_import->root);
+ scan_decls(ira->codegen, get_container_scope(child_import), child_import->data.structure.decl_node);
- IrInstruction *result = ir_const(ira, &instruction->base, ira->codegen->builtin_types.entry_namespace);
- result->value.data.x_import = child_import;
- return result;
+ return ir_const_type(ira, &instruction->base, child_import);
}
static IrInstruction *ir_analyze_instruction_c_include(IrAnalyze *ira, IrInstructionCInclude *instruction) {
@@ -18819,10 +18824,10 @@ static IrInstruction *ir_analyze_instruction_embed_file(IrAnalyze *ira, IrInstru
if (!rel_file_path)
return ira->codegen->invalid_instruction;
- ImportTableEntry *import = get_scope_import(instruction->base.scope);
+ ZigType *import = get_scope_import(instruction->base.scope);
// figure out absolute path to resource
Buf source_dir_path = BUF_INIT;
- os_path_dirname(import->path, &source_dir_path);
+ os_path_dirname(import->data.structure.root_struct->path, &source_dir_path);
Buf *resolve_paths[] = {
&source_dir_path,
@@ -19752,6 +19757,9 @@ static IrInstruction *ir_analyze_instruction_slice(IrAnalyze *ira, IrInstruction
return ira->codegen->invalid_instruction;
}
} else {
+ if (array_type->data.pointer.ptr_len == PtrLenC) {
+ array_type = adjust_ptr_len(ira->codegen, array_type, PtrLenUnknown);
+ }
return_type = get_slice_type(ira->codegen, array_type);
if (!end) {
ir_add_error(ira, &instruction->base, buf_sprintf("slice of pointer must include end value"));
@@ -20137,18 +20145,14 @@ static IrInstruction *ir_analyze_instruction_breakpoint(IrAnalyze *ira, IrInstru
static IrInstruction *ir_analyze_instruction_return_address(IrAnalyze *ira, IrInstructionReturnAddress *instruction) {
IrInstruction *result = ir_build_return_address(&ira->new_irb,
instruction->base.scope, instruction->base.source_node);
- ZigType *u8 = ira->codegen->builtin_types.entry_u8;
- ZigType *u8_ptr_const = get_pointer_to_type(ira->codegen, u8, true);
- result->value.type = u8_ptr_const;
+ result->value.type = ira->codegen->builtin_types.entry_usize;
return result;
}
static IrInstruction *ir_analyze_instruction_frame_address(IrAnalyze *ira, IrInstructionFrameAddress *instruction) {
IrInstruction *result = ir_build_frame_address(&ira->new_irb,
instruction->base.scope, instruction->base.source_node);
- ZigType *u8 = ira->codegen->builtin_types.entry_u8;
- ZigType *u8_ptr_const = get_pointer_to_type(ira->codegen, u8, true);
- result->value.type = u8_ptr_const;
+ result->value.type = ira->codegen->builtin_types.entry_usize;
return result;
}
@@ -20179,7 +20183,6 @@ static IrInstruction *ir_analyze_instruction_align_of(IrAnalyze *ira, IrInstruct
case ZigTypeIdComptimeInt:
case ZigTypeIdUndefined:
case ZigTypeIdNull:
- case ZigTypeIdNamespace:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
case ZigTypeIdVoid:
@@ -21025,7 +21028,6 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ConstExprValue
case ZigTypeIdOpaque:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
- case ZigTypeIdNamespace:
case ZigTypeIdUnreachable:
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
@@ -21185,7 +21187,6 @@ static Error buf_read_value_bytes(IrAnalyze *ira, CodeGen *codegen, AstNode *sou
case ZigTypeIdOpaque:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
- case ZigTypeIdNamespace:
case ZigTypeIdUnreachable:
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
@@ -21343,7 +21344,6 @@ static bool type_can_bit_cast(ZigType *t) {
case ZigTypeIdOpaque:
case ZigTypeIdBoundFn:
case ZigTypeIdArgTuple:
- case ZigTypeIdNamespace:
case ZigTypeIdUnreachable:
case ZigTypeIdComptimeFloat:
case ZigTypeIdComptimeInt:
@@ -21516,7 +21516,7 @@ static IrInstruction *ir_analyze_instruction_decl_ref(IrAnalyze *ira,
Tld *tld = instruction->tld;
LVal lval = instruction->lval;
- resolve_top_level_decl(ira->codegen, tld, lval == LValPtr, instruction->base.source_node);
+ resolve_top_level_decl(ira->codegen, tld, instruction->base.source_node);
if (tld->resolution == TldResolutionInvalid)
return ira->codegen->invalid_instruction;
@@ -21528,6 +21528,10 @@ static IrInstruction *ir_analyze_instruction_decl_ref(IrAnalyze *ira,
TldVar *tld_var = (TldVar *)tld;
ZigVar *var = tld_var->var;
+ if (var == nullptr) {
+ return ir_error_dependency_loop(ira, &instruction->base);
+ }
+
IrInstruction *var_ptr = ir_get_var_ptr(ira, &instruction->base, var);
if (type_is_invalid(var_ptr->value.type))
return ira->codegen->invalid_instruction;
@@ -21664,9 +21668,11 @@ static IrInstruction *ir_analyze_instruction_align_cast(IrAnalyze *ira, IrInstru
}
static IrInstruction *ir_analyze_instruction_opaque_type(IrAnalyze *ira, IrInstructionOpaqueType *instruction) {
- Buf *name = get_anon_type_name(ira->codegen, ira->new_irb.exec, "opaque", instruction->base.source_node);
+ Buf *bare_name = buf_alloc();
+ Buf *full_name = get_anon_type_name(ira->codegen, ira->new_irb.exec, "opaque",
+ instruction->base.scope, instruction->base.source_node, bare_name);
ZigType *result_type = get_opaque_type(ira->codegen, instruction->base.scope, instruction->base.source_node,
- buf_ptr(name));
+ buf_ptr(full_name), bare_name);
return ir_const_type(ira, &instruction->base, result_type);
}
diff --git a/src/link.cpp b/src/link.cpp
index 7eb8cb111f..bd1879da1a 100644
--- a/src/link.cpp
+++ b/src/link.cpp
@@ -41,7 +41,7 @@ static Buf *build_a_raw(CodeGen *parent_gen, const char *aname, Buf *full_path)
child_out_type = OutTypeObj;
}
- CodeGen *child_gen = codegen_create(full_path, parent_gen->zig_target, child_out_type,
+ CodeGen *child_gen = codegen_create(nullptr, full_path, parent_gen->zig_target, child_out_type,
parent_gen->build_mode, parent_gen->zig_lib_dir, parent_gen->zig_std_dir,
parent_gen->libc);
@@ -87,10 +87,8 @@ static Buf *build_a(CodeGen *parent_gen, const char *aname) {
}
static Buf *build_compiler_rt(CodeGen *parent_gen) {
- Buf *dir_path = buf_alloc();
- os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt"), dir_path);
Buf *full_path = buf_alloc();
- os_path_join(dir_path, buf_create_from_str("index.zig"), full_path);
+ os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt.zig"), full_path);
return build_a_raw(parent_gen, "compiler_rt", full_path);
}
diff --git a/src/main.cpp b/src/main.cpp
index d2099a9f80..9078059dc5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,6 +63,7 @@ static int print_full_usage(const char *arg0, FILE *file, int return_code) {
" --output-lib [file] override import library path\n"
" --pkg-begin [name] [path] make pkg available to import and push current pkg\n"
" --pkg-end pop current pkg\n"
+ " --main-pkg-path set the directory of the root package\n"
" --release-fast build with optimizations on and safety off\n"
" --release-safe build with optimizations on and safety on\n"
" --release-small build with size optimizations on and safety off\n"
@@ -215,7 +216,7 @@ struct CliPkg {
CliPkg *parent;
};
-static void add_package(CodeGen *g, CliPkg *cli_pkg, PackageTableEntry *pkg) {
+static void add_package(CodeGen *g, CliPkg *cli_pkg, ZigPackage *pkg) {
for (size_t i = 0; i < cli_pkg->children.length; i += 1) {
CliPkg *child_cli_pkg = cli_pkg->children.at(i);
@@ -223,10 +224,11 @@ static void add_package(CodeGen *g, CliPkg *cli_pkg, PackageTableEntry *pkg) {
Buf *basename = buf_alloc();
os_path_split(buf_create_from_str(child_cli_pkg->path), dirname, basename);
- PackageTableEntry *child_pkg = codegen_create_package(g, buf_ptr(dirname), buf_ptr(basename));
+ ZigPackage *child_pkg = codegen_create_package(g, buf_ptr(dirname), buf_ptr(basename),
+ buf_ptr(buf_sprintf("%s.%s", buf_ptr(&pkg->pkg_path), child_cli_pkg->name)));
auto entry = pkg->package_table.put_unique(buf_create_from_str(child_cli_pkg->name), child_pkg);
if (entry) {
- PackageTableEntry *existing_pkg = entry->value;
+ ZigPackage *existing_pkg = entry->value;
Buf *full_path = buf_alloc();
os_path_join(&existing_pkg->root_src_dir, &existing_pkg->root_src_path, full_path);
fprintf(stderr, "Unable to add package '%s'->'%s': already exists as '%s'\n",
@@ -437,6 +439,7 @@ int main(int argc, char **argv) {
TargetSubsystem subsystem = TargetSubsystemAuto;
bool is_single_threaded = false;
Buf *override_std_dir = nullptr;
+ Buf *main_pkg_path = nullptr;
ValgrindSupport valgrind_support = ValgrindSupportAuto;
if (argc >= 2 && strcmp(argv[1], "build") == 0) {
@@ -475,8 +478,8 @@ int main(int argc, char **argv) {
ZigTarget target;
get_native_target(&target);
- CodeGen *g = codegen_create(build_runner_path, &target, OutTypeExe, BuildModeDebug, get_zig_lib_dir(),
- override_std_dir, nullptr);
+ CodeGen *g = codegen_create(main_pkg_path, build_runner_path, &target, OutTypeExe,
+ BuildModeDebug, get_zig_lib_dir(), override_std_dir, nullptr);
g->valgrind_support = valgrind_support;
g->enable_time_report = timing_info;
buf_init_from_str(&g->cache_dir, cache_dir ? cache_dir : default_zig_cache_name);
@@ -543,8 +546,8 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
- PackageTableEntry *build_pkg = codegen_create_package(g, buf_ptr(&build_file_dirname),
- buf_ptr(&build_file_basename));
+ ZigPackage *build_pkg = codegen_create_package(g, buf_ptr(&build_file_dirname),
+ buf_ptr(&build_file_basename), "std.special");
g->root_package->package_table.put(buf_create_from_str("@build"), build_pkg);
g->enable_cache = get_cache_opt(enable_cache, true);
codegen_build_and_link(g);
@@ -566,8 +569,8 @@ int main(int argc, char **argv) {
get_native_target(&target);
Buf *fmt_runner_path = buf_alloc();
os_path_join(get_zig_special_dir(), buf_create_from_str("fmt_runner.zig"), fmt_runner_path);
- CodeGen *g = codegen_create(fmt_runner_path, &target, OutTypeExe, BuildModeDebug, get_zig_lib_dir(),
- nullptr, nullptr);
+ CodeGen *g = codegen_create(main_pkg_path, fmt_runner_path, &target, OutTypeExe,
+ BuildModeDebug, get_zig_lib_dir(), nullptr, nullptr);
buf_init_from_str(&g->cache_dir, cache_dir ? cache_dir : default_zig_cache_name);
g->valgrind_support = valgrind_support;
g->is_single_threaded = true;
@@ -728,6 +731,8 @@ int main(int argc, char **argv) {
llvm_argv.append(argv[i]);
} else if (strcmp(arg, "--override-std-dir") == 0) {
override_std_dir = buf_create_from_str(argv[i]);
+ } else if (strcmp(arg, "--main-pkg-path") == 0) {
+ main_pkg_path = buf_create_from_str(argv[i]);
} else if (strcmp(arg, "--library-path") == 0 || strcmp(arg, "-L") == 0) {
lib_dirs.append(argv[i]);
} else if (strcmp(arg, "--library") == 0) {
@@ -907,8 +912,8 @@ int main(int argc, char **argv) {
return EXIT_SUCCESS;
}
case CmdBuiltin: {
- CodeGen *g = codegen_create(nullptr, &target, out_type, build_mode, get_zig_lib_dir(), override_std_dir,
- nullptr);
+ CodeGen *g = codegen_create(main_pkg_path, nullptr, &target,
+ out_type, build_mode, get_zig_lib_dir(), override_std_dir, nullptr);
g->valgrind_support = valgrind_support;
g->is_single_threaded = is_single_threaded;
Buf *builtin_source = codegen_generate_builtin_source(g);
@@ -1011,8 +1016,8 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
}
- CodeGen *g = codegen_create(zig_root_source_file, &target, out_type, build_mode, get_zig_lib_dir(),
- override_std_dir, libc);
+ CodeGen *g = codegen_create(main_pkg_path, zig_root_source_file, &target, out_type, build_mode,
+ get_zig_lib_dir(), override_std_dir, libc);
g->valgrind_support = valgrind_support;
g->subsystem = subsystem;
@@ -1095,7 +1100,6 @@ int main(int argc, char **argv) {
if (out_file_lib != nullptr && out_type == OutTypeLib && !is_static)
codegen_set_output_lib_path(g, buf_create_from_str(out_file_lib));
-
add_package(g, cur_pkg, g->root_package);
if (cmd == CmdBuild || cmd == CmdRun || cmd == CmdTest) {
@@ -1145,7 +1149,7 @@ int main(int argc, char **argv) {
}
} else if (cmd == CmdTranslateC) {
codegen_translate_c(g, in_file_buf);
- ast_render(g, stdout, g->root_import->root, 4);
+ ast_render(g, stdout, g->root_import->data.structure.decl_node, 4);
if (timing_info)
codegen_print_timing_report(g, stdout);
return EXIT_SUCCESS;
diff --git a/src/os.cpp b/src/os.cpp
index 732baea359..e418aa2c29 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -264,7 +264,7 @@ void os_path_join(Buf *dirname, Buf *basename, Buf *out_full_path) {
buf_append_buf(out_full_path, basename);
}
-int os_path_real(Buf *rel_path, Buf *out_abs_path) {
+Error os_path_real(Buf *rel_path, Buf *out_abs_path) {
#if defined(ZIG_OS_WINDOWS)
buf_resize(out_abs_path, 4096);
if (_fullpath(buf_ptr(out_abs_path), buf_ptr(rel_path), buf_len(out_abs_path)) == nullptr) {
diff --git a/src/os.hpp b/src/os.hpp
index c4fae1d62b..2e0b1ea88f 100644
--- a/src/os.hpp
+++ b/src/os.hpp
@@ -96,7 +96,7 @@ void os_path_dirname(Buf *full_path, Buf *out_dirname);
void os_path_split(Buf *full_path, Buf *out_dirname, Buf *out_basename);
void os_path_extname(Buf *full_path, Buf *out_basename, Buf *out_extname);
void os_path_join(Buf *dirname, Buf *basename, Buf *out_full_path);
-int os_path_real(Buf *rel_path, Buf *out_abs_path);
+Error os_path_real(Buf *rel_path, Buf *out_abs_path);
Buf os_path_resolve(Buf **paths_ptr, size_t paths_len);
bool os_path_is_absolute(Buf *path);
diff --git a/src/parser.cpp b/src/parser.cpp
index 6fe78c14c3..2fd453c67f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -18,7 +18,7 @@ struct ParseContext {
Buf *buf;
size_t current_token;
ZigList *tokens;
- ImportTableEntry *owner;
+ ZigType *owner;
ErrColor err_color;
};
@@ -130,8 +130,10 @@ static void ast_error(ParseContext *pc, Token *token, const char *format, ...) {
va_end(ap);
- ErrorMsg *err = err_msg_create_with_line(pc->owner->path, token->start_line, token->start_column,
- pc->owner->source_code, pc->owner->line_offsets, msg);
+ ErrorMsg *err = err_msg_create_with_line(pc->owner->data.structure.root_struct->path,
+ token->start_line, token->start_column,
+ pc->owner->data.structure.root_struct->source_code,
+ pc->owner->data.structure.root_struct->line_offsets, msg);
err->line_start = token->start_line;
err->column_start = token->start_column;
@@ -148,8 +150,10 @@ static void ast_asm_error(ParseContext *pc, AstNode *node, size_t offset, const
Buf *msg = buf_vprintf(format, ap);
va_end(ap);
- ErrorMsg *err = err_msg_create_with_line(pc->owner->path, node->line, node->column,
- pc->owner->source_code, pc->owner->line_offsets, msg);
+ ErrorMsg *err = err_msg_create_with_line(pc->owner->data.structure.root_struct->path,
+ node->line, node->column,
+ pc->owner->data.structure.root_struct->source_code,
+ pc->owner->data.structure.root_struct->line_offsets, msg);
print_err_msg(err, pc->err_color);
exit(EXIT_FAILURE);
@@ -570,9 +574,7 @@ static void ast_parse_asm_template(ParseContext *pc, AstNode *node) {
}
}
-AstNode *ast_parse(Buf *buf, ZigList *tokens, ImportTableEntry *owner,
- ErrColor err_color)
-{
+AstNode *ast_parse(Buf *buf, ZigList *tokens, ZigType *owner, ErrColor err_color) {
ParseContext pc = {};
pc.err_color = err_color;
pc.owner = owner;
diff --git a/src/parser.hpp b/src/parser.hpp
index 7243431e4f..73950993f3 100644
--- a/src/parser.hpp
+++ b/src/parser.hpp
@@ -16,7 +16,7 @@ ATTRIBUTE_PRINTF(2, 3)
void ast_token_error(Token *token, const char *format, ...);
-AstNode * ast_parse(Buf *buf, ZigList *tokens, ImportTableEntry *owner, ErrColor err_color);
+AstNode * ast_parse(Buf *buf, ZigList *tokens, ZigType *owner, ErrColor err_color);
void ast_print(AstNode *node, int indent);
diff --git a/src/target.cpp b/src/target.cpp
index 852f55ef7d..a662d9e6fc 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -676,15 +676,15 @@ Error target_parse_triple(ZigTarget *target, const char *triple) {
if (!opt_archsub.is_some)
return ErrorMissingArchitecture;
- if (!opt_os.is_some)
- return ErrorMissingOperatingSystem;
-
if ((err = target_parse_archsub(&target->arch, &target->sub_arch,
(char*)opt_archsub.value.ptr, opt_archsub.value.len)))
{
return err;
}
+ if (!opt_os.is_some)
+ return ErrorMissingOperatingSystem;
+
if ((err = target_parse_os(&target->os, (char*)opt_os.value.ptr, opt_os.value.len))) {
return err;
}
diff --git a/src/translate_c.cpp b/src/translate_c.cpp
index 765ad32e29..25c5c1a14b 100644
--- a/src/translate_c.cpp
+++ b/src/translate_c.cpp
@@ -76,7 +76,7 @@ struct TransScopeWhile {
};
struct Context {
- ImportTableEntry *import;
+ ZigType *import;
ZigList *errors;
VisibMod visib_mod;
bool want_export;
@@ -4779,7 +4779,7 @@ static void process_preprocessor_entities(Context *c, ZigClangASTUnit *zunit) {
}
}
-Error parse_h_buf(ImportTableEntry *import, ZigList *errors, Buf *source,
+Error parse_h_buf(ZigType *import, ZigList *errors, Buf *source,
CodeGen *codegen, AstNode *source_node)
{
Error err;
@@ -4795,7 +4795,7 @@ Error parse_h_buf(ImportTableEntry *import, ZigList *errors, Buf *so
return err;
}
-Error parse_h_file(ImportTableEntry *import, ZigList *errors, const char *target_file,
+Error parse_h_file(ZigType *import, ZigList *errors, const char *target_file,
CodeGen *codegen, AstNode *source_node)
{
Context context = {0};
@@ -5005,7 +5005,8 @@ Error parse_h_file(ImportTableEntry *import, ZigList *errors, const
render_macros(c);
render_aliases(c);
- import->root = c->root;
+ import->data.structure.decl_node = c->root;
+ import->data.structure.decls_scope->base.source_node = c->root;
return ErrorNone;
}
diff --git a/src/translate_c.hpp b/src/translate_c.hpp
index 4323e98c1e..c4bd270c21 100644
--- a/src/translate_c.hpp
+++ b/src/translate_c.hpp
@@ -11,10 +11,10 @@
#include "all_types.hpp"
-Error parse_h_file(ImportTableEntry *import, ZigList *errors, const char *target_file,
+Error parse_h_file(ZigType *import, ZigList *errors, const char *target_file,
CodeGen *codegen, AstNode *source_node);
-Error parse_h_buf(ImportTableEntry *import, ZigList *errors, Buf *source,
+Error parse_h_buf(ZigType *import, ZigList *errors, Buf *source,
CodeGen *codegen, AstNode *source_node);
#endif
diff --git a/src/util.hpp b/src/util.hpp
index a0e759567e..abf4d37c88 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -93,18 +93,6 @@ ATTRIBUTE_RETURNS_NOALIAS static inline T *allocate(size_t count) {
return ptr;
}
-template
-static inline void safe_memcpy(T *dest, const T *src, size_t count) {
-#ifdef NDEBUG
- memcpy(dest, src, count * sizeof(T));
-#else
- // manually assign every elment to trigger compile error for non-copyable structs
- for (size_t i = 0; i < count; i += 1) {
- dest[i] = src[i];
- }
-#endif
-}
-
template
static inline T *reallocate(T *old, size_t old_count, size_t new_count) {
T *ptr = reallocate_nonzero(old, old_count, new_count);
diff --git a/std/array_list.zig b/std/array_list.zig
index e2535d6393..2c9da50972 100644
--- a/std/array_list.zig
+++ b/std/array_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const assert = debug.assert;
const testing = std.testing;
@@ -406,6 +406,6 @@ const Item = struct {
test "std.ArrayList: ArrayList(T) of struct T" {
var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(debug.global_allocator) };
- try root.sub_items.append( Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) } );
+ try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) });
testing.expect(root.sub_items.items[0].integer == 42);
}
diff --git a/std/atomic.zig b/std/atomic.zig
new file mode 100644
index 0000000000..6f7b4fe75d
--- /dev/null
+++ b/std/atomic.zig
@@ -0,0 +1,9 @@
+pub const Stack = @import("atomic/stack.zig").Stack;
+pub const Queue = @import("atomic/queue.zig").Queue;
+pub const Int = @import("atomic/int.zig").Int;
+
+test "std.atomic" {
+ _ = @import("atomic/stack.zig");
+ _ = @import("atomic/queue.zig");
+ _ = @import("atomic/int.zig");
+}
diff --git a/std/atomic/index.zig b/std/atomic/index.zig
deleted file mode 100644
index a94cff1973..0000000000
--- a/std/atomic/index.zig
+++ /dev/null
@@ -1,9 +0,0 @@
-pub const Stack = @import("stack.zig").Stack;
-pub const Queue = @import("queue.zig").Queue;
-pub const Int = @import("int.zig").Int;
-
-test "std.atomic" {
- _ = @import("stack.zig");
- _ = @import("queue.zig");
- _ = @import("int.zig");
-}
diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig
index bdc86c0981..431a96e64b 100644
--- a/std/atomic/queue.zig
+++ b/std/atomic/queue.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const AtomicOrder = builtin.AtomicOrder;
const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig
index 4d0d5075e0..8ae6c997aa 100644
--- a/std/atomic/stack.zig
+++ b/std/atomic/stack.zig
@@ -68,7 +68,7 @@ pub fn Stack(comptime T: type) type {
};
}
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const Context = struct {
allocator: *std.mem.Allocator,
stack: *Stack(i32),
diff --git a/std/base64.zig b/std/base64.zig
index cfe8ea95f8..0e44f9d4fe 100644
--- a/std/base64.zig
+++ b/std/base64.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const mem = std.mem;
diff --git a/std/buf_map.zig b/std/buf_map.zig
index f8d3d5e04d..be0666d972 100644
--- a/std/buf_map.zig
+++ b/std/buf_map.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const HashMap = std.HashMap;
const mem = std.mem;
const Allocator = mem.Allocator;
diff --git a/std/buf_set.zig b/std/buf_set.zig
index 484b4953b9..807b9db35d 100644
--- a/std/buf_set.zig
+++ b/std/buf_set.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const HashMap = @import("hash_map.zig").HashMap;
const mem = @import("mem.zig");
const Allocator = mem.Allocator;
diff --git a/std/buffer.zig b/std/buffer.zig
index 371655f1e5..8706dfc320 100644
--- a/std/buffer.zig
+++ b/std/buffer.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const mem = std.mem;
const Allocator = mem.Allocator;
diff --git a/std/build.zig b/std/build.zig
index e3fdfbccee..2316a87b31 100644
--- a/std/build.zig
+++ b/std/build.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const io = std.io;
const mem = std.mem;
@@ -859,6 +859,7 @@ pub const LibExeObjStep = struct {
verbose_cc: bool,
c_std: Builder.CStd,
override_std_dir: ?[]const u8,
+ main_pkg_path: ?[]const u8,
exec_cmd_args: ?[]const ?[]const u8,
name_prefix: []const u8,
filter: ?[]const u8,
@@ -950,6 +951,7 @@ pub const LibExeObjStep = struct {
.c_std = Builder.CStd.C99,
.system_linker_hack = false,
.override_std_dir = null,
+ .main_pkg_path = null,
.exec_cmd_args = null,
.name_prefix = "",
.filter = null,
@@ -1098,6 +1100,10 @@ pub const LibExeObjStep = struct {
self.override_std_dir = dir_path;
}
+ pub fn setMainPkgPath(self: *LibExeObjStep, dir_path: []const u8) void {
+ self.main_pkg_path = dir_path;
+ }
+
pub fn setOutputPath(self: *LibExeObjStep, file_path: []const u8) void {
self.output_path = file_path;
@@ -1320,7 +1326,7 @@ pub const LibExeObjStep = struct {
zig_args.append("--ver-patch") catch unreachable;
zig_args.append(builder.fmt("{}", self.version.patch)) catch unreachable;
}
- if ((self.kind == Kind.Exe or self.kind == Kind.Test) and self.static) {
+ if (self.static) {
zig_args.append("--static") catch unreachable;
}
@@ -1424,6 +1430,11 @@ pub const LibExeObjStep = struct {
try zig_args.append(builder.pathFromRoot(dir));
}
+ if (self.main_pkg_path) |dir| {
+ try zig_args.append("--main-pkg-path");
+ try zig_args.append(builder.pathFromRoot(dir));
+ }
+
try builder.spawnChild(zig_args.toSliceConst());
if (self.kind == Kind.Lib and !self.static and self.target.wantSharedLibSymLinks()) {
diff --git a/std/build/fmt.zig b/std/build/fmt.zig
index ec0536dd34..f3b8e08180 100644
--- a/std/build/fmt.zig
+++ b/std/build/fmt.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const build = @import("../build.zig");
const Step = build.Step;
const Builder = build.Builder;
diff --git a/std/c/index.zig b/std/c.zig
similarity index 93%
rename from std/c/index.zig
rename to std/c.zig
index 74cdd884ca..c7c8a9c550 100644
--- a/std/c/index.zig
+++ b/std/c.zig
@@ -2,14 +2,14 @@ const builtin = @import("builtin");
const Os = builtin.Os;
pub use switch (builtin.os) {
- Os.linux => @import("linux.zig"),
- Os.windows => @import("windows.zig"),
- Os.macosx, Os.ios => @import("darwin.zig"),
- Os.freebsd => @import("freebsd.zig"),
- Os.netbsd => @import("netbsd.zig"),
+ Os.linux => @import("c/linux.zig"),
+ Os.windows => @import("c/windows.zig"),
+ Os.macosx, Os.ios => @import("c/darwin.zig"),
+ Os.freebsd => @import("c/freebsd.zig"),
+ Os.netbsd => @import("c/netbsd.zig"),
else => empty_import,
};
-const empty_import = @import("../empty.zig");
+const empty_import = @import("empty.zig");
// TODO https://github.com/ziglang/zig/issues/265 on this whole file
diff --git a/std/c/darwin.zig b/std/c/darwin.zig
index 940d949985..0e92e8d411 100644
--- a/std/c/darwin.zig
+++ b/std/c/darwin.zig
@@ -163,7 +163,7 @@ pub const Kevent = extern struct {
// sys/types.h on macos uses #pragma pack(4) so these checks are
// to make sure the struct is laid out the same. These values were
// produced from C code using the offsetof macro.
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
comptime {
diff --git a/std/coff.zig b/std/coff.zig
index 53bd2a4b7a..c31d2d8233 100644
--- a/std/coff.zig
+++ b/std/coff.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
const io = std.io;
const mem = std.mem;
const os = std.os;
diff --git a/std/crypto.zig b/std/crypto.zig
new file mode 100644
index 0000000000..2429441fc7
--- /dev/null
+++ b/std/crypto.zig
@@ -0,0 +1,45 @@
+pub const Md5 = @import("crypto/md5.zig").Md5;
+pub const Sha1 = @import("crypto/sha1.zig").Sha1;
+
+const sha2 = @import("crypto/sha2.zig");
+pub const Sha224 = sha2.Sha224;
+pub const Sha256 = sha2.Sha256;
+pub const Sha384 = sha2.Sha384;
+pub const Sha512 = sha2.Sha512;
+
+const sha3 = @import("crypto/sha3.zig");
+pub const Sha3_224 = sha3.Sha3_224;
+pub const Sha3_256 = sha3.Sha3_256;
+pub const Sha3_384 = sha3.Sha3_384;
+pub const Sha3_512 = sha3.Sha3_512;
+
+const blake2 = @import("crypto/blake2.zig");
+pub const Blake2s224 = blake2.Blake2s224;
+pub const Blake2s256 = blake2.Blake2s256;
+pub const Blake2b384 = blake2.Blake2b384;
+pub const Blake2b512 = blake2.Blake2b512;
+
+const hmac = @import("crypto/hmac.zig");
+pub const HmacMd5 = hmac.HmacMd5;
+pub const HmacSha1 = hmac.HmacSha1;
+pub const HmacSha256 = hmac.HmacSha256;
+pub const HmacBlake2s256 = hmac.HmacBlake2s256;
+
+const import_chaCha20 = @import("crypto/chacha20.zig");
+pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
+pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
+
+pub const Poly1305 = @import("crypto/poly1305.zig").Poly1305;
+pub const X25519 = @import("crypto/x25519.zig").X25519;
+
+test "crypto" {
+ _ = @import("crypto/blake2.zig");
+ _ = @import("crypto/chacha20.zig");
+ _ = @import("crypto/hmac.zig");
+ _ = @import("crypto/md5.zig");
+ _ = @import("crypto/poly1305.zig");
+ _ = @import("crypto/sha1.zig");
+ _ = @import("crypto/sha2.zig");
+ _ = @import("crypto/sha3.zig");
+ _ = @import("crypto/x25519.zig");
+}
diff --git a/std/crypto/blake2.zig b/std/crypto/blake2.zig
index e3de65916a..e9f617261f 100644
--- a/std/crypto/blake2.zig
+++ b/std/crypto/blake2.zig
@@ -1,7 +1,7 @@
const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
const builtin = @import("builtin");
const htest = @import("test.zig");
@@ -34,8 +34,8 @@ pub const Blake2s256 = Blake2s(256);
fn Blake2s(comptime out_len: usize) type {
return struct {
const Self = @This();
- const block_length = 64;
- const digest_length = out_len / 8;
+ pub const block_length = 64;
+ pub const digest_length = out_len / 8;
const iv = [8]u32{
0x6A09E667,
diff --git a/std/crypto/chacha20.zig b/std/crypto/chacha20.zig
index d964f4c03d..78ef700bdf 100644
--- a/std/crypto/chacha20.zig
+++ b/std/crypto/chacha20.zig
@@ -1,6 +1,6 @@
// Based on public domain Supercop by Daniel J. Bernstein
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const mem = std.mem;
const endian = std.endian;
const assert = std.debug.assert;
diff --git a/std/crypto/hmac.zig b/std/crypto/hmac.zig
index 51dda1b1ea..69c1b86386 100644
--- a/std/crypto/hmac.zig
+++ b/std/crypto/hmac.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const crypto = std.crypto;
const debug = std.debug;
const mem = std.mem;
diff --git a/std/crypto/index.zig b/std/crypto/index.zig
deleted file mode 100644
index 3855bd8dd3..0000000000
--- a/std/crypto/index.zig
+++ /dev/null
@@ -1,45 +0,0 @@
-pub const Md5 = @import("md5.zig").Md5;
-pub const Sha1 = @import("sha1.zig").Sha1;
-
-const sha2 = @import("sha2.zig");
-pub const Sha224 = sha2.Sha224;
-pub const Sha256 = sha2.Sha256;
-pub const Sha384 = sha2.Sha384;
-pub const Sha512 = sha2.Sha512;
-
-const sha3 = @import("sha3.zig");
-pub const Sha3_224 = sha3.Sha3_224;
-pub const Sha3_256 = sha3.Sha3_256;
-pub const Sha3_384 = sha3.Sha3_384;
-pub const Sha3_512 = sha3.Sha3_512;
-
-const blake2 = @import("blake2.zig");
-pub const Blake2s224 = blake2.Blake2s224;
-pub const Blake2s256 = blake2.Blake2s256;
-pub const Blake2b384 = blake2.Blake2b384;
-pub const Blake2b512 = blake2.Blake2b512;
-
-const hmac = @import("hmac.zig");
-pub const HmacMd5 = hmac.HmacMd5;
-pub const HmacSha1 = hmac.HmacSha1;
-pub const HmacSha256 = hmac.HmacSha256;
-pub const HmacBlake2s256 = hmac.HmacBlake2s256;
-
-const import_chaCha20 = @import("chacha20.zig");
-pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
-pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
-
-pub const Poly1305 = @import("poly1305.zig").Poly1305;
-pub const X25519 = @import("x25519.zig").X25519;
-
-test "crypto" {
- _ = @import("blake2.zig");
- _ = @import("chacha20.zig");
- _ = @import("hmac.zig");
- _ = @import("md5.zig");
- _ = @import("poly1305.zig");
- _ = @import("sha1.zig");
- _ = @import("sha2.zig");
- _ = @import("sha3.zig");
- _ = @import("x25519.zig");
-}
diff --git a/std/crypto/md5.zig b/std/crypto/md5.zig
index 994a7fa25c..d27a3c1c33 100644
--- a/std/crypto/md5.zig
+++ b/std/crypto/md5.zig
@@ -1,9 +1,9 @@
const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
const endian = @import("../endian.zig");
const builtin = @import("builtin");
-const debug = @import("../debug/index.zig");
-const fmt = @import("../fmt/index.zig");
+const debug = @import("../debug.zig");
+const fmt = @import("../fmt.zig");
const RoundParam = struct {
a: usize,
@@ -29,8 +29,8 @@ fn Rp(a: usize, b: usize, c: usize, d: usize, k: usize, s: u32, t: u32) RoundPar
pub const Md5 = struct {
const Self = @This();
- const block_length = 64;
- const digest_length = 16;
+ pub const block_length = 64;
+ pub const digest_length = 16;
s: [4]u32,
// Streaming Cache
diff --git a/std/crypto/poly1305.zig b/std/crypto/poly1305.zig
index 64adb17c45..bd0b33e586 100644
--- a/std/crypto/poly1305.zig
+++ b/std/crypto/poly1305.zig
@@ -2,7 +2,7 @@
//
// https://monocypher.org/
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const Endian = builtin.Endian;
diff --git a/std/crypto/sha1.zig b/std/crypto/sha1.zig
index d5aab8f33f..ee5c118b13 100644
--- a/std/crypto/sha1.zig
+++ b/std/crypto/sha1.zig
@@ -1,7 +1,7 @@
const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
const builtin = @import("builtin");
const RoundParam = struct {
@@ -26,8 +26,8 @@ fn Rp(a: usize, b: usize, c: usize, d: usize, e: usize, i: u32) RoundParam {
pub const Sha1 = struct {
const Self = @This();
- const block_length = 64;
- const digest_length = 20;
+ pub const block_length = 64;
+ pub const digest_length = 20;
s: [5]u32,
// Streaming Cache
diff --git a/std/crypto/sha2.zig b/std/crypto/sha2.zig
index 0476a3a25e..37b0b65dc6 100644
--- a/std/crypto/sha2.zig
+++ b/std/crypto/sha2.zig
@@ -1,7 +1,7 @@
const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
const builtin = @import("builtin");
const htest = @import("test.zig");
@@ -78,8 +78,8 @@ pub const Sha256 = Sha2_32(Sha256Params);
fn Sha2_32(comptime params: Sha2Params32) type {
return struct {
const Self = @This();
- const block_length = 64;
- const digest_length = params.out_len / 8;
+ pub const block_length = 64;
+ pub const digest_length = params.out_len / 8;
s: [8]u32,
// Streaming Cache
diff --git a/std/crypto/sha3.zig b/std/crypto/sha3.zig
index e686e1337c..beebb3e65d 100644
--- a/std/crypto/sha3.zig
+++ b/std/crypto/sha3.zig
@@ -1,7 +1,7 @@
const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
const builtin = @import("builtin");
const htest = @import("test.zig");
@@ -13,8 +13,8 @@ pub const Sha3_512 = Keccak(512, 0x06);
fn Keccak(comptime bits: usize, comptime delim: u8) type {
return struct {
const Self = @This();
- const block_length = 200;
- const digest_length = bits / 8;
+ pub const block_length = 200;
+ pub const digest_length = bits / 8;
s: [200]u8,
offset: usize,
diff --git a/std/crypto/test.zig b/std/crypto/test.zig
index 258cdf7320..a0ddad6c83 100644
--- a/std/crypto/test.zig
+++ b/std/crypto/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const testing = std.testing;
const mem = std.mem;
const fmt = std.fmt;
diff --git a/std/crypto/throughput_test.zig b/std/crypto/throughput_test.zig
index 10ef1bcd48..73a2a86124 100644
--- a/std/crypto/throughput_test.zig
+++ b/std/crypto/throughput_test.zig
@@ -2,7 +2,7 @@ const builtin = @import("builtin");
const std = @import("std");
const time = std.os.time;
const Timer = time.Timer;
-const crypto = @import("index.zig");
+const crypto = @import("../crypto.zig");
const KiB = 1024;
const MiB = 1024 * KiB;
diff --git a/std/crypto/x25519.zig b/std/crypto/x25519.zig
index 9349569f97..5d5d31267d 100644
--- a/std/crypto/x25519.zig
+++ b/std/crypto/x25519.zig
@@ -2,7 +2,7 @@
//
// https://monocypher.org/
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const fmt = std.fmt;
diff --git a/std/cstr.zig b/std/cstr.zig
index abd2eac48f..49d6373732 100644
--- a/std/cstr.zig
+++ b/std/cstr.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const debug = std.debug;
const mem = std.mem;
diff --git a/std/debug/index.zig b/std/debug.zig
similarity index 99%
rename from std/debug/index.zig
rename to std/debug.zig
index 538fb5ef28..df35a8e773 100644
--- a/std/debug/index.zig
+++ b/std/debug.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
const math = std.math;
const mem = std.mem;
const io = std.io;
@@ -13,7 +13,7 @@ const ArrayList = std.ArrayList;
const builtin = @import("builtin");
const maxInt = std.math.maxInt;
-pub const FailingAllocator = @import("failing_allocator.zig").FailingAllocator;
+pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;
pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;
pub const runtime_safety = switch (builtin.mode) {
@@ -171,7 +171,7 @@ pub fn assert(ok: bool) void {
pub fn panic(comptime format: []const u8, args: ...) noreturn {
@setCold(true);
- const first_trace_addr = @ptrToInt(@returnAddress());
+ const first_trace_addr = @returnAddress();
panicExtra(null, first_trace_addr, format, args);
}
@@ -232,7 +232,7 @@ pub const StackIterator = struct {
pub fn init(first_addr: ?usize) StackIterator {
return StackIterator{
.first_addr = first_addr,
- .fp = @ptrToInt(@frameAddress()),
+ .fp = @frameAddress(),
};
}
diff --git a/std/debug/failing_allocator.zig b/std/debug/failing_allocator.zig
index e16dd21db4..82093dffda 100644
--- a/std/debug/failing_allocator.zig
+++ b/std/debug/failing_allocator.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const mem = std.mem;
/// Allocator that fails after N allocations, useful for making sure out of
diff --git a/std/dynamic_library.zig b/std/dynamic_library.zig
index 66026b1f29..698b0eb216 100644
--- a/std/dynamic_library.zig
+++ b/std/dynamic_library.zig
@@ -1,7 +1,7 @@
const builtin = @import("builtin");
const Os = builtin.Os;
-const std = @import("index.zig");
+const std = @import("std.zig");
const mem = std.mem;
const cstr = std.cstr;
const os = std.os;
diff --git a/std/elf.zig b/std/elf.zig
index 6a564c3283..d0ec5fb2ae 100644
--- a/std/elf.zig
+++ b/std/elf.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
const io = std.io;
const os = std.os;
const math = std.math;
diff --git a/std/event/channel.zig b/std/event/channel.zig
index 4af9bf612b..be5af49774 100644
--- a/std/event/channel.zig
+++ b/std/event/channel.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/event/fs.zig b/std/event/fs.zig
index 6535945573..b923651b1b 100644
--- a/std/event/fs.zig
+++ b/std/event/fs.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const event = std.event;
const assert = std.debug.assert;
const testing = std.testing;
@@ -404,11 +404,7 @@ pub async fn openPosix(
pub async fn openRead(loop: *Loop, path: []const u8) os.File.OpenError!os.FileHandle {
switch (builtin.os) {
- builtin.Os.macosx,
- builtin.Os.linux,
- builtin.Os.freebsd,
- builtin.Os.netbsd
- => {
+ builtin.Os.macosx, builtin.Os.linux, builtin.Os.freebsd, builtin.Os.netbsd => {
const flags = posix.O_LARGEFILE | posix.O_RDONLY | posix.O_CLOEXEC;
return await (async openPosix(loop, path, flags, os.File.default_mode) catch unreachable);
},
@@ -876,10 +872,7 @@ pub fn Watch(comptime V: type) type {
pub async fn addFile(self: *Self, file_path: []const u8, value: V) !?V {
switch (builtin.os) {
- builtin.Os.macosx,
- builtin.Os.freebsd,
- builtin.Os.netbsd
- => return await (async addFileKEvent(self, file_path, value) catch unreachable),
+ builtin.Os.macosx, builtin.Os.freebsd, builtin.Os.netbsd => return await (async addFileKEvent(self, file_path, value) catch unreachable),
builtin.Os.linux => return await (async addFileLinux(self, file_path, value) catch unreachable),
builtin.Os.windows => return await (async addFileWindows(self, file_path, value) catch unreachable),
else => @compileError("Unsupported OS"),
diff --git a/std/event/future.zig b/std/event/future.zig
index 66acac5ad7..0e1b928898 100644
--- a/std/event/future.zig
+++ b/std/event/future.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const builtin = @import("builtin");
diff --git a/std/event/group.zig b/std/event/group.zig
index 25e79640cb..455d1bd60c 100644
--- a/std/event/group.zig
+++ b/std/event/group.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const Lock = std.event.Lock;
const Loop = std.event.Loop;
diff --git a/std/event/io.zig b/std/event/io.zig
index b11550f7aa..29419a792e 100644
--- a/std/event/io.zig
+++ b/std/event/io.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const Allocator = std.mem.Allocator;
const assert = std.debug.assert;
diff --git a/std/event/lock.zig b/std/event/lock.zig
index d6a246cee5..031b2adf19 100644
--- a/std/event/lock.zig
+++ b/std/event/lock.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/event/locked.zig b/std/event/locked.zig
index 6718b1bf9c..1ceaa33530 100644
--- a/std/event/locked.zig
+++ b/std/event/locked.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const Lock = std.event.Lock;
const Loop = std.event.Loop;
diff --git a/std/event/loop.zig b/std/event/loop.zig
index 55a1538f0c..a327d03792 100644
--- a/std/event/loop.zig
+++ b/std/event/loop.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/event/net.zig b/std/event/net.zig
index 48461c3d81..687c119920 100644
--- a/std/event/net.zig
+++ b/std/event/net.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const testing = std.testing;
const event = std.event;
diff --git a/std/event/rwlock.zig b/std/event/rwlock.zig
index 26ccd12b73..25b0f0e74b 100644
--- a/std/event/rwlock.zig
+++ b/std/event/rwlock.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/event/rwlocked.zig b/std/event/rwlocked.zig
index d305b1791e..0448e0298e 100644
--- a/std/event/rwlocked.zig
+++ b/std/event/rwlocked.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const RwLock = std.event.RwLock;
const Loop = std.event.Loop;
diff --git a/std/fmt/index.zig b/std/fmt.zig
similarity index 99%
rename from std/fmt/index.zig
rename to std/fmt.zig
index 4f864b3662..e01ba2033b 100644
--- a/std/fmt/index.zig
+++ b/std/fmt.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
const math = std.math;
const debug = std.debug;
const assert = debug.assert;
const testing = std.testing;
const mem = std.mem;
const builtin = @import("builtin");
-const errol = @import("errol/index.zig");
+const errol = @import("fmt/errol.zig");
const lossyCast = std.math.lossyCast;
const max_int_digits = 65;
@@ -858,10 +858,10 @@ test "fmt.parseUnsigned" {
testing.expectError(error.Overflow, parseUnsigned(u2, "4", 16));
}
-pub const parseFloat = @import("parse_float.zig").parseFloat;
+pub const parseFloat = @import("fmt/parse_float.zig").parseFloat;
test "fmt.parseFloat" {
- _ = @import("parse_float.zig");
+ _ = @import("fmt/parse_float.zig");
}
pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {
diff --git a/std/fmt/errol/index.zig b/std/fmt/errol.zig
similarity index 98%
rename from std/fmt/errol/index.zig
rename to std/fmt/errol.zig
index 0fdb1c4ab8..9304c54874 100644
--- a/std/fmt/errol/index.zig
+++ b/std/fmt/errol.zig
@@ -1,8 +1,8 @@
-const std = @import("../../index.zig");
-const enum3 = @import("enum3.zig").enum3;
-const enum3_data = @import("enum3.zig").enum3_data;
-const lookup_table = @import("lookup.zig").lookup_table;
-const HP = @import("lookup.zig").HP;
+const std = @import("../std.zig");
+const enum3 = @import("errol/enum3.zig").enum3;
+const enum3_data = @import("errol/enum3.zig").enum3_data;
+const lookup_table = @import("errol/lookup.zig").lookup_table;
+const HP = @import("errol/lookup.zig").HP;
const math = std.math;
const mem = std.mem;
const assert = std.debug.assert;
diff --git a/std/fmt/parse_float.zig b/std/fmt/parse_float.zig
index de9619efe2..c13977dc42 100644
--- a/std/fmt/parse_float.zig
+++ b/std/fmt/parse_float.zig
@@ -29,7 +29,7 @@
// - Only supports round-to-zero
// - Does not handle denormals
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const max_digits = 25;
diff --git a/std/hash/index.zig b/std/hash.zig
similarity index 51%
rename from std/hash/index.zig
rename to std/hash.zig
index 8cce35f3c5..19ee62824d 100644
--- a/std/hash/index.zig
+++ b/std/hash.zig
@@ -1,22 +1,22 @@
-const adler = @import("adler.zig");
+const adler = @import("hash/adler.zig");
pub const Adler32 = adler.Adler32;
// pub for polynomials + generic crc32 construction
-pub const crc = @import("crc.zig");
+pub const crc = @import("hash/crc.zig");
pub const Crc32 = crc.Crc32;
-const fnv = @import("fnv.zig");
+const fnv = @import("hash/fnv.zig");
pub const Fnv1a_32 = fnv.Fnv1a_32;
pub const Fnv1a_64 = fnv.Fnv1a_64;
pub const Fnv1a_128 = fnv.Fnv1a_128;
-const siphash = @import("siphash.zig");
+const siphash = @import("hash/siphash.zig");
pub const SipHash64 = siphash.SipHash64;
pub const SipHash128 = siphash.SipHash128;
test "hash" {
- _ = @import("adler.zig");
- _ = @import("crc.zig");
- _ = @import("fnv.zig");
- _ = @import("siphash.zig");
+ _ = @import("hash/adler.zig");
+ _ = @import("hash/crc.zig");
+ _ = @import("hash/fnv.zig");
+ _ = @import("hash/siphash.zig");
}
diff --git a/std/hash/adler.zig b/std/hash/adler.zig
index 78f960367a..e95203cc6c 100644
--- a/std/hash/adler.zig
+++ b/std/hash/adler.zig
@@ -3,7 +3,7 @@
// https://tools.ietf.org/html/rfc1950#section-9
// https://github.com/madler/zlib/blob/master/adler32.c
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const testing = std.testing;
pub const Adler32 = struct {
diff --git a/std/hash/crc.zig b/std/hash/crc.zig
index 9bea358bf1..53b4262c93 100644
--- a/std/hash/crc.zig
+++ b/std/hash/crc.zig
@@ -5,7 +5,7 @@
// - Crc32SmallWithPoly uses only 64 bytes of memory but is slower. Be aware that this is
// still moderately fast just slow relative to the slicing approach.
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const debug = std.debug;
const testing = std.testing;
diff --git a/std/hash/fnv.zig b/std/hash/fnv.zig
index 6876b636f6..8094134e19 100644
--- a/std/hash/fnv.zig
+++ b/std/hash/fnv.zig
@@ -4,7 +4,7 @@
//
// https://tools.ietf.org/html/draft-eastlake-fnv-14
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const testing = std.testing;
pub const Fnv1a_32 = Fnv1a(u32, 0x01000193, 0x811c9dc5);
diff --git a/std/hash/siphash.zig b/std/hash/siphash.zig
index c9a6128d35..77194c3e03 100644
--- a/std/hash/siphash.zig
+++ b/std/hash/siphash.zig
@@ -5,7 +5,7 @@
//
// https://131002.net/siphash/
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const math = std.math;
diff --git a/std/hash_map.zig b/std/hash_map.zig
index 4519890bb7..d31fcdb597 100644
--- a/std/hash_map.zig
+++ b/std/hash_map.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const assert = debug.assert;
const testing = std.testing;
@@ -486,7 +486,6 @@ pub fn autoHash(key: var, comptime rng: *std.rand.Random, comptime HashInt: type
builtin.TypeId.ErrorSet => return autoHash(@errorToInt(key), rng),
builtin.TypeId.Promise, builtin.TypeId.Fn => return autoHash(@ptrToInt(key), rng),
- builtin.TypeId.Namespace,
builtin.TypeId.BoundFn,
builtin.TypeId.ComptimeFloat,
builtin.TypeId.ComptimeInt,
@@ -532,7 +531,6 @@ pub fn autoEql(a: var, b: @typeOf(a)) bool {
builtin.TypeId.Float,
builtin.TypeId.ComptimeFloat,
builtin.TypeId.ComptimeInt,
- builtin.TypeId.Namespace,
builtin.TypeId.Promise,
builtin.TypeId.Enum,
builtin.TypeId.BoundFn,
diff --git a/std/heap.zig b/std/heap.zig
index e257977f9d..e03e77a39c 100644
--- a/std/heap.zig
+++ b/std/heap.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const assert = debug.assert;
const testing = std.testing;
diff --git a/std/io.zig b/std/io.zig
index f6e3790af6..7756f36116 100644
--- a/std/io.zig
+++ b/std/io.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const Os = builtin.Os;
const c = std.c;
diff --git a/std/io/seekable_stream.zig b/std/io/seekable_stream.zig
index a766f4fb89..5529e42ff1 100644
--- a/std/io/seekable_stream.zig
+++ b/std/io/seekable_stream.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const InStream = std.io.InStream;
pub fn SeekableStream(comptime SeekErrorType: type, comptime GetSeekPosErrorType: type) type {
diff --git a/std/io_test.zig b/std/io_test.zig
index c07ff137ab..58d542307c 100644
--- a/std/io_test.zig
+++ b/std/io_test.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const io = std.io;
const meta = std.meta;
const trait = std.trait;
diff --git a/std/json.zig b/std/json.zig
index dd053e7635..551c3a8da7 100644
--- a/std/json.zig
+++ b/std/json.zig
@@ -2,7 +2,7 @@
//
// https://tools.ietf.org/html/rfc8259
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const testing = std.testing;
const mem = std.mem;
diff --git a/std/json_test.zig b/std/json_test.zig
index edc50be8cb..a323e6e979 100644
--- a/std/json_test.zig
+++ b/std/json_test.zig
@@ -3,7 +3,7 @@
// Tests are taken from https://github.com/nst/JSONTestSuite
// Read also http://seriot.ch/parsing_json.php for a good overview.
-const std = @import("index.zig");
+const std = @import("std.zig");
fn ok(comptime s: []const u8) void {
std.testing.expect(std.json.validate(s));
diff --git a/std/lazy_init.zig b/std/lazy_init.zig
index a09168786b..7beabb9cde 100644
--- a/std/lazy_init.zig
+++ b/std/lazy_init.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/linked_list.zig b/std/linked_list.zig
index 86e5cd056e..c4ad525913 100644
--- a/std/linked_list.zig
+++ b/std/linked_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const assert = debug.assert;
const testing = std.testing;
diff --git a/std/math/index.zig b/std/math.zig
similarity index 84%
rename from std/math/index.zig
rename to std/math.zig
index 20648139b8..cead685778 100644
--- a/std/math/index.zig
+++ b/std/math.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("std.zig");
const TypeId = builtin.TypeId;
const assert = std.debug.assert;
const testing = std.testing;
@@ -57,9 +57,9 @@ pub const nan_f128 = @bitCast(f128, nan_u128);
pub const inf_u128 = u128(0x7fff0000000000000000000000000000);
pub const inf_f128 = @bitCast(f128, inf_u128);
-pub const nan = @import("nan.zig").nan;
-pub const snan = @import("nan.zig").snan;
-pub const inf = @import("inf.zig").inf;
+pub const nan = @import("math/nan.zig").nan;
+pub const snan = @import("math/nan.zig").snan;
+pub const inf = @import("math/inf.zig").inf;
pub fn approxEq(comptime T: type, x: T, y: T, epsilon: T) bool {
assert(@typeId(T) == TypeId.Float);
@@ -111,109 +111,109 @@ pub fn raiseDivByZero() void {
// Raise INEXACT fpu exception
}
-pub const isNan = @import("isnan.zig").isNan;
-pub const isSignalNan = @import("isnan.zig").isSignalNan;
-pub const fabs = @import("fabs.zig").fabs;
-pub const ceil = @import("ceil.zig").ceil;
-pub const floor = @import("floor.zig").floor;
-pub const trunc = @import("trunc.zig").trunc;
-pub const round = @import("round.zig").round;
-pub const frexp = @import("frexp.zig").frexp;
-pub const frexp32_result = @import("frexp.zig").frexp32_result;
-pub const frexp64_result = @import("frexp.zig").frexp64_result;
-pub const modf = @import("modf.zig").modf;
-pub const modf32_result = @import("modf.zig").modf32_result;
-pub const modf64_result = @import("modf.zig").modf64_result;
-pub const copysign = @import("copysign.zig").copysign;
-pub const isFinite = @import("isfinite.zig").isFinite;
-pub const isInf = @import("isinf.zig").isInf;
-pub const isPositiveInf = @import("isinf.zig").isPositiveInf;
-pub const isNegativeInf = @import("isinf.zig").isNegativeInf;
-pub const isNormal = @import("isnormal.zig").isNormal;
-pub const signbit = @import("signbit.zig").signbit;
-pub const scalbn = @import("scalbn.zig").scalbn;
-pub const pow = @import("pow.zig").pow;
-pub const powi = @import("powi.zig").powi;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const cbrt = @import("cbrt.zig").cbrt;
-pub const acos = @import("acos.zig").acos;
-pub const asin = @import("asin.zig").asin;
-pub const atan = @import("atan.zig").atan;
-pub const atan2 = @import("atan2.zig").atan2;
-pub const hypot = @import("hypot.zig").hypot;
-pub const exp = @import("exp.zig").exp;
-pub const exp2 = @import("exp2.zig").exp2;
-pub const expm1 = @import("expm1.zig").expm1;
-pub const ilogb = @import("ilogb.zig").ilogb;
-pub const ln = @import("ln.zig").ln;
-pub const log = @import("log.zig").log;
-pub const log2 = @import("log2.zig").log2;
-pub const log10 = @import("log10.zig").log10;
-pub const log1p = @import("log1p.zig").log1p;
-pub const fma = @import("fma.zig").fma;
-pub const asinh = @import("asinh.zig").asinh;
-pub const acosh = @import("acosh.zig").acosh;
-pub const atanh = @import("atanh.zig").atanh;
-pub const sinh = @import("sinh.zig").sinh;
-pub const cosh = @import("cosh.zig").cosh;
-pub const tanh = @import("tanh.zig").tanh;
-pub const cos = @import("cos.zig").cos;
-pub const sin = @import("sin.zig").sin;
-pub const tan = @import("tan.zig").tan;
+pub const isNan = @import("math/isnan.zig").isNan;
+pub const isSignalNan = @import("math/isnan.zig").isSignalNan;
+pub const fabs = @import("math/fabs.zig").fabs;
+pub const ceil = @import("math/ceil.zig").ceil;
+pub const floor = @import("math/floor.zig").floor;
+pub const trunc = @import("math/trunc.zig").trunc;
+pub const round = @import("math/round.zig").round;
+pub const frexp = @import("math/frexp.zig").frexp;
+pub const frexp32_result = @import("math/frexp.zig").frexp32_result;
+pub const frexp64_result = @import("math/frexp.zig").frexp64_result;
+pub const modf = @import("math/modf.zig").modf;
+pub const modf32_result = @import("math/modf.zig").modf32_result;
+pub const modf64_result = @import("math/modf.zig").modf64_result;
+pub const copysign = @import("math/copysign.zig").copysign;
+pub const isFinite = @import("math/isfinite.zig").isFinite;
+pub const isInf = @import("math/isinf.zig").isInf;
+pub const isPositiveInf = @import("math/isinf.zig").isPositiveInf;
+pub const isNegativeInf = @import("math/isinf.zig").isNegativeInf;
+pub const isNormal = @import("math/isnormal.zig").isNormal;
+pub const signbit = @import("math/signbit.zig").signbit;
+pub const scalbn = @import("math/scalbn.zig").scalbn;
+pub const pow = @import("math/pow.zig").pow;
+pub const powi = @import("math/powi.zig").powi;
+pub const sqrt = @import("math/sqrt.zig").sqrt;
+pub const cbrt = @import("math/cbrt.zig").cbrt;
+pub const acos = @import("math/acos.zig").acos;
+pub const asin = @import("math/asin.zig").asin;
+pub const atan = @import("math/atan.zig").atan;
+pub const atan2 = @import("math/atan2.zig").atan2;
+pub const hypot = @import("math/hypot.zig").hypot;
+pub const exp = @import("math/exp.zig").exp;
+pub const exp2 = @import("math/exp2.zig").exp2;
+pub const expm1 = @import("math/expm1.zig").expm1;
+pub const ilogb = @import("math/ilogb.zig").ilogb;
+pub const ln = @import("math/ln.zig").ln;
+pub const log = @import("math/log.zig").log;
+pub const log2 = @import("math/log2.zig").log2;
+pub const log10 = @import("math/log10.zig").log10;
+pub const log1p = @import("math/log1p.zig").log1p;
+pub const fma = @import("math/fma.zig").fma;
+pub const asinh = @import("math/asinh.zig").asinh;
+pub const acosh = @import("math/acosh.zig").acosh;
+pub const atanh = @import("math/atanh.zig").atanh;
+pub const sinh = @import("math/sinh.zig").sinh;
+pub const cosh = @import("math/cosh.zig").cosh;
+pub const tanh = @import("math/tanh.zig").tanh;
+pub const cos = @import("math/cos.zig").cos;
+pub const sin = @import("math/sin.zig").sin;
+pub const tan = @import("math/tan.zig").tan;
-pub const complex = @import("complex/index.zig");
+pub const complex = @import("math/complex.zig");
pub const Complex = complex.Complex;
-pub const big = @import("big/index.zig");
+pub const big = @import("math/big.zig");
test "math" {
- _ = @import("nan.zig");
- _ = @import("isnan.zig");
- _ = @import("fabs.zig");
- _ = @import("ceil.zig");
- _ = @import("floor.zig");
- _ = @import("trunc.zig");
- _ = @import("round.zig");
- _ = @import("frexp.zig");
- _ = @import("modf.zig");
- _ = @import("copysign.zig");
- _ = @import("isfinite.zig");
- _ = @import("isinf.zig");
- _ = @import("isnormal.zig");
- _ = @import("signbit.zig");
- _ = @import("scalbn.zig");
- _ = @import("pow.zig");
- _ = @import("powi.zig");
- _ = @import("sqrt.zig");
- _ = @import("cbrt.zig");
- _ = @import("acos.zig");
- _ = @import("asin.zig");
- _ = @import("atan.zig");
- _ = @import("atan2.zig");
- _ = @import("hypot.zig");
- _ = @import("exp.zig");
- _ = @import("exp2.zig");
- _ = @import("expm1.zig");
- _ = @import("ilogb.zig");
- _ = @import("ln.zig");
- _ = @import("log.zig");
- _ = @import("log2.zig");
- _ = @import("log10.zig");
- _ = @import("log1p.zig");
- _ = @import("fma.zig");
- _ = @import("asinh.zig");
- _ = @import("acosh.zig");
- _ = @import("atanh.zig");
- _ = @import("sinh.zig");
- _ = @import("cosh.zig");
- _ = @import("tanh.zig");
- _ = @import("sin.zig");
- _ = @import("cos.zig");
- _ = @import("tan.zig");
+ _ = @import("math/nan.zig");
+ _ = @import("math/isnan.zig");
+ _ = @import("math/fabs.zig");
+ _ = @import("math/ceil.zig");
+ _ = @import("math/floor.zig");
+ _ = @import("math/trunc.zig");
+ _ = @import("math/round.zig");
+ _ = @import("math/frexp.zig");
+ _ = @import("math/modf.zig");
+ _ = @import("math/copysign.zig");
+ _ = @import("math/isfinite.zig");
+ _ = @import("math/isinf.zig");
+ _ = @import("math/isnormal.zig");
+ _ = @import("math/signbit.zig");
+ _ = @import("math/scalbn.zig");
+ _ = @import("math/pow.zig");
+ _ = @import("math/powi.zig");
+ _ = @import("math/sqrt.zig");
+ _ = @import("math/cbrt.zig");
+ _ = @import("math/acos.zig");
+ _ = @import("math/asin.zig");
+ _ = @import("math/atan.zig");
+ _ = @import("math/atan2.zig");
+ _ = @import("math/hypot.zig");
+ _ = @import("math/exp.zig");
+ _ = @import("math/exp2.zig");
+ _ = @import("math/expm1.zig");
+ _ = @import("math/ilogb.zig");
+ _ = @import("math/ln.zig");
+ _ = @import("math/log.zig");
+ _ = @import("math/log2.zig");
+ _ = @import("math/log10.zig");
+ _ = @import("math/log1p.zig");
+ _ = @import("math/fma.zig");
+ _ = @import("math/asinh.zig");
+ _ = @import("math/acosh.zig");
+ _ = @import("math/atanh.zig");
+ _ = @import("math/sinh.zig");
+ _ = @import("math/cosh.zig");
+ _ = @import("math/tanh.zig");
+ _ = @import("math/sin.zig");
+ _ = @import("math/cos.zig");
+ _ = @import("math/tan.zig");
- _ = @import("complex/index.zig");
+ _ = @import("math/complex.zig");
- _ = @import("big/index.zig");
+ _ = @import("math/big.zig");
}
pub fn floatMantissaBits(comptime T: type) comptime_int {
@@ -738,14 +738,14 @@ test "math.f64_min" {
pub fn maxInt(comptime T: type) comptime_int {
const info = @typeInfo(T);
- const bit_count = comptime_int(info.Int.bits); // TODO #1683
+ const bit_count = info.Int.bits;
if (bit_count == 0) return 0;
return (1 << (bit_count - @boolToInt(info.Int.is_signed))) - 1;
}
pub fn minInt(comptime T: type) comptime_int {
const info = @typeInfo(T);
- const bit_count = comptime_int(info.Int.bits); // TODO #1683
+ const bit_count = info.Int.bits;
if (!info.Int.is_signed) return 0;
if (bit_count == 0) return 0;
return -(1 << (bit_count - 1));
diff --git a/std/math/acos.zig b/std/math/acos.zig
index 734f7a8651..763d9d8abd 100644
--- a/std/math/acos.zig
+++ b/std/math/acos.zig
@@ -2,7 +2,7 @@
//
// - acos(x) = nan if x < -1 or x > 1
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/acosh.zig b/std/math/acosh.zig
index a9c4a908ef..a2a9926863 100644
--- a/std/math/acosh.zig
+++ b/std/math/acosh.zig
@@ -4,7 +4,7 @@
// - acosh(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/asin.zig b/std/math/asin.zig
index c9dbdf704f..b01a1ac49e 100644
--- a/std/math/asin.zig
+++ b/std/math/asin.zig
@@ -3,7 +3,7 @@
// - asin(+-0) = +-0
// - asin(x) = nan if x < -1 or x > 1
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/asinh.zig b/std/math/asinh.zig
index 05bd8d008e..cef9bfb23f 100644
--- a/std/math/asinh.zig
+++ b/std/math/asinh.zig
@@ -4,7 +4,7 @@
// - asinh(+-inf) = +-inf
// - asinh(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/atan.zig b/std/math/atan.zig
index 72d17b4db2..ba5a11dd10 100644
--- a/std/math/atan.zig
+++ b/std/math/atan.zig
@@ -3,7 +3,7 @@
// - atan(+-0) = +-0
// - atan(+-inf) = +-pi/2
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/atan2.zig b/std/math/atan2.zig
index 6e1f67cfbb..7f13507402 100644
--- a/std/math/atan2.zig
+++ b/std/math/atan2.zig
@@ -18,7 +18,7 @@
// atan2(+inf, x) = +pi/2
// atan2(-inf, x) = -pi/2
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/atanh.zig b/std/math/atanh.zig
index f2feab0207..9056064f5a 100644
--- a/std/math/atanh.zig
+++ b/std/math/atanh.zig
@@ -4,7 +4,7 @@
// - atanh(x) = nan if |x| > 1 with signal
// - atanh(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/big.zig b/std/math/big.zig
new file mode 100644
index 0000000000..94b6d864e7
--- /dev/null
+++ b/std/math/big.zig
@@ -0,0 +1,5 @@
+pub use @import("big/int.zig");
+
+test "math.big" {
+ _ = @import("big/int.zig");
+}
diff --git a/std/math/big/index.zig b/std/math/big/index.zig
deleted file mode 100644
index 26fa538c4f..0000000000
--- a/std/math/big/index.zig
+++ /dev/null
@@ -1,5 +0,0 @@
-pub use @import("int.zig");
-
-test "math.big" {
- _ = @import("int.zig");
-}
diff --git a/std/math/big/int.zig b/std/math/big/int.zig
index f21e5df8aa..7fca4a147f 100644
--- a/std/math/big/int.zig
+++ b/std/math/big/int.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const builtin = @import("builtin");
const debug = std.debug;
const testing = std.testing;
diff --git a/std/math/cbrt.zig b/std/math/cbrt.zig
index 957e026af4..9497255269 100644
--- a/std/math/cbrt.zig
+++ b/std/math/cbrt.zig
@@ -4,7 +4,7 @@
// - cbrt(+-inf) = +-inf
// - cbrt(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/ceil.zig b/std/math/ceil.zig
index 5c6b98b2ca..da83e0ec59 100644
--- a/std/math/ceil.zig
+++ b/std/math/ceil.zig
@@ -5,7 +5,7 @@
// - ceil(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/complex/index.zig b/std/math/complex.zig
similarity index 64%
rename from std/math/complex/index.zig
rename to std/math/complex.zig
index ffbf14d83e..cc0573b227 100644
--- a/std/math/complex/index.zig
+++ b/std/math/complex.zig
@@ -1,27 +1,27 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
const testing = std.testing;
const math = std.math;
-pub const abs = @import("abs.zig").abs;
-pub const acosh = @import("acosh.zig").acosh;
-pub const acos = @import("acos.zig").acos;
-pub const arg = @import("arg.zig").arg;
-pub const asinh = @import("asinh.zig").asinh;
-pub const asin = @import("asin.zig").asin;
-pub const atanh = @import("atanh.zig").atanh;
-pub const atan = @import("atan.zig").atan;
-pub const conj = @import("conj.zig").conj;
-pub const cosh = @import("cosh.zig").cosh;
-pub const cos = @import("cos.zig").cos;
-pub const exp = @import("exp.zig").exp;
-pub const log = @import("log.zig").log;
-pub const pow = @import("pow.zig").pow;
-pub const proj = @import("proj.zig").proj;
-pub const sinh = @import("sinh.zig").sinh;
-pub const sin = @import("sin.zig").sin;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const tanh = @import("tanh.zig").tanh;
-pub const tan = @import("tan.zig").tan;
+pub const abs = @import("complex/abs.zig").abs;
+pub const acosh = @import("complex/acosh.zig").acosh;
+pub const acos = @import("complex/acos.zig").acos;
+pub const arg = @import("complex/arg.zig").arg;
+pub const asinh = @import("complex/asinh.zig").asinh;
+pub const asin = @import("complex/asin.zig").asin;
+pub const atanh = @import("complex/atanh.zig").atanh;
+pub const atan = @import("complex/atan.zig").atan;
+pub const conj = @import("complex/conj.zig").conj;
+pub const cosh = @import("complex/cosh.zig").cosh;
+pub const cos = @import("complex/cos.zig").cos;
+pub const exp = @import("complex/exp.zig").exp;
+pub const log = @import("complex/log.zig").log;
+pub const pow = @import("complex/pow.zig").pow;
+pub const proj = @import("complex/proj.zig").proj;
+pub const sinh = @import("complex/sinh.zig").sinh;
+pub const sin = @import("complex/sin.zig").sin;
+pub const sqrt = @import("complex/sqrt.zig").sqrt;
+pub const tanh = @import("complex/tanh.zig").tanh;
+pub const tan = @import("complex/tan.zig").tan;
pub fn Complex(comptime T: type) type {
return struct {
@@ -148,24 +148,24 @@ test "complex.magnitude" {
}
test "complex.cmath" {
- _ = @import("abs.zig");
- _ = @import("acosh.zig");
- _ = @import("acos.zig");
- _ = @import("arg.zig");
- _ = @import("asinh.zig");
- _ = @import("asin.zig");
- _ = @import("atanh.zig");
- _ = @import("atan.zig");
- _ = @import("conj.zig");
- _ = @import("cosh.zig");
- _ = @import("cos.zig");
- _ = @import("exp.zig");
- _ = @import("log.zig");
- _ = @import("pow.zig");
- _ = @import("proj.zig");
- _ = @import("sinh.zig");
- _ = @import("sin.zig");
- _ = @import("sqrt.zig");
- _ = @import("tanh.zig");
- _ = @import("tan.zig");
+ _ = @import("complex/abs.zig");
+ _ = @import("complex/acosh.zig");
+ _ = @import("complex/acos.zig");
+ _ = @import("complex/arg.zig");
+ _ = @import("complex/asinh.zig");
+ _ = @import("complex/asin.zig");
+ _ = @import("complex/atanh.zig");
+ _ = @import("complex/atan.zig");
+ _ = @import("complex/conj.zig");
+ _ = @import("complex/cosh.zig");
+ _ = @import("complex/cos.zig");
+ _ = @import("complex/exp.zig");
+ _ = @import("complex/log.zig");
+ _ = @import("complex/pow.zig");
+ _ = @import("complex/proj.zig");
+ _ = @import("complex/sinh.zig");
+ _ = @import("complex/sin.zig");
+ _ = @import("complex/sqrt.zig");
+ _ = @import("complex/tanh.zig");
+ _ = @import("complex/tan.zig");
}
diff --git a/std/math/complex/abs.zig b/std/math/complex/abs.zig
index 245d67d4c5..e1368d6ef6 100644
--- a/std/math/complex/abs.zig
+++ b/std/math/complex/abs.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/acos.zig b/std/math/complex/acos.zig
index 1b314bc31a..8aed26a71b 100644
--- a/std/math/complex/acos.zig
+++ b/std/math/complex/acos.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/acosh.zig b/std/math/complex/acosh.zig
index 0e4c0121f4..e72bf431fe 100644
--- a/std/math/complex/acosh.zig
+++ b/std/math/complex/acosh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/arg.zig b/std/math/complex/arg.zig
index be117a5940..0a2441d1fd 100644
--- a/std/math/complex/arg.zig
+++ b/std/math/complex/arg.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/asin.zig b/std/math/complex/asin.zig
index cf802ea206..6be775d748 100644
--- a/std/math/complex/asin.zig
+++ b/std/math/complex/asin.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/asinh.zig b/std/math/complex/asinh.zig
index 0386a636b0..8e09036750 100644
--- a/std/math/complex/asinh.zig
+++ b/std/math/complex/asinh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/atan.zig b/std/math/complex/atan.zig
index 8e60e58e43..6b83adbd97 100644
--- a/std/math/complex/atan.zig
+++ b/std/math/complex/atan.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/atanh.zig b/std/math/complex/atanh.zig
index 5b18fe1992..8edfb6e78e 100644
--- a/std/math/complex/atanh.zig
+++ b/std/math/complex/atanh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/conj.zig b/std/math/complex/conj.zig
index 143543f9e7..7a42d365ea 100644
--- a/std/math/complex/conj.zig
+++ b/std/math/complex/conj.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/cos.zig b/std/math/complex/cos.zig
index 658d19c3b6..71f9603c75 100644
--- a/std/math/complex/cos.zig
+++ b/std/math/complex/cos.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/cosh.zig b/std/math/complex/cosh.zig
index 5ce10b03f8..9806e41170 100644
--- a/std/math/complex/cosh.zig
+++ b/std/math/complex/cosh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/exp.zig b/std/math/complex/exp.zig
index 9ded698d08..c74ac2fc08 100644
--- a/std/math/complex/exp.zig
+++ b/std/math/complex/exp.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/ldexp.zig b/std/math/complex/ldexp.zig
index e919ef6bec..6b4306bf77 100644
--- a/std/math/complex/ldexp.zig
+++ b/std/math/complex/ldexp.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const debug = std.debug;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/log.zig b/std/math/complex/log.zig
index 360bb7d21e..2b43a6970f 100644
--- a/std/math/complex/log.zig
+++ b/std/math/complex/log.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/pow.zig b/std/math/complex/pow.zig
index bd625626c8..9174bb3626 100644
--- a/std/math/complex/pow.zig
+++ b/std/math/complex/pow.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/proj.zig b/std/math/complex/proj.zig
index d31006129e..aadcff6ff6 100644
--- a/std/math/complex/proj.zig
+++ b/std/math/complex/proj.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/sin.zig b/std/math/complex/sin.zig
index 9d54ab0969..049631f31e 100644
--- a/std/math/complex/sin.zig
+++ b/std/math/complex/sin.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/sinh.zig b/std/math/complex/sinh.zig
index 469ea6067a..0b656e5354 100644
--- a/std/math/complex/sinh.zig
+++ b/std/math/complex/sinh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/sqrt.zig b/std/math/complex/sqrt.zig
index 60f6061baa..e935d0b238 100644
--- a/std/math/complex/sqrt.zig
+++ b/std/math/complex/sqrt.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/tan.zig b/std/math/complex/tan.zig
index db34580598..45e2873eb6 100644
--- a/std/math/complex/tan.zig
+++ b/std/math/complex/tan.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/complex/tanh.zig b/std/math/complex/tanh.zig
index 03ab431312..de905ee3f6 100644
--- a/std/math/complex/tanh.zig
+++ b/std/math/complex/tanh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const testing = std.testing;
const math = std.math;
const cmath = math.complex;
diff --git a/std/math/copysign.zig b/std/math/copysign.zig
index dbf8f6e1ef..ff8140b3ab 100644
--- a/std/math/copysign.zig
+++ b/std/math/copysign.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/cos.zig b/std/math/cos.zig
index 7783ddc09b..9479482894 100644
--- a/std/math/cos.zig
+++ b/std/math/cos.zig
@@ -4,7 +4,7 @@
// - cos(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/cosh.zig b/std/math/cosh.zig
index 57c5eef828..eb3082e5fa 100644
--- a/std/math/cosh.zig
+++ b/std/math/cosh.zig
@@ -5,7 +5,7 @@
// - cosh(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expo2 = @import("expo2.zig").expo2;
const expect = std.testing.expect;
diff --git a/std/math/exp.zig b/std/math/exp.zig
index cf8fd62d80..aabccffd0b 100644
--- a/std/math/exp.zig
+++ b/std/math/exp.zig
@@ -3,7 +3,7 @@
// - exp(+inf) = +inf
// - exp(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const assert = std.debug.assert;
const builtin = @import("builtin");
diff --git a/std/math/exp2.zig b/std/math/exp2.zig
index ba0001a09a..392d45bf68 100644
--- a/std/math/exp2.zig
+++ b/std/math/exp2.zig
@@ -3,7 +3,7 @@
// - exp2(+inf) = +inf
// - exp2(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/expm1.zig b/std/math/expm1.zig
index ba00ec2561..b83cc3e82e 100644
--- a/std/math/expm1.zig
+++ b/std/math/expm1.zig
@@ -5,7 +5,7 @@
// - expm1(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/expo2.zig b/std/math/expo2.zig
index 15b80c710c..57e2bf34c9 100644
--- a/std/math/expo2.zig
+++ b/std/math/expo2.zig
@@ -1,4 +1,4 @@
-const math = @import("index.zig");
+const math = @import("../math.zig");
pub fn expo2(x: var) @typeOf(x) {
const T = @typeOf(x);
diff --git a/std/math/fabs.zig b/std/math/fabs.zig
index a605f4f33f..e30f788ae7 100644
--- a/std/math/fabs.zig
+++ b/std/math/fabs.zig
@@ -3,7 +3,7 @@
// - fabs(+-inf) = +inf
// - fabs(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/floor.zig b/std/math/floor.zig
index c7c12e37ba..ab45a8fee7 100644
--- a/std/math/floor.zig
+++ b/std/math/floor.zig
@@ -6,7 +6,7 @@
const builtin = @import("builtin");
const expect = std.testing.expect;
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
pub fn floor(x: var) @typeOf(x) {
diff --git a/std/math/fma.zig b/std/math/fma.zig
index b084cf3cbd..a317bc96de 100644
--- a/std/math/fma.zig
+++ b/std/math/fma.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/frexp.zig b/std/math/frexp.zig
index 35f3e081a9..35eec315d9 100644
--- a/std/math/frexp.zig
+++ b/std/math/frexp.zig
@@ -4,7 +4,7 @@
// - frexp(+-inf) = +-inf, 0
// - frexp(nan) = nan, undefined
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/hypot.zig b/std/math/hypot.zig
index dea11e0a61..fddbe7c068 100644
--- a/std/math/hypot.zig
+++ b/std/math/hypot.zig
@@ -5,7 +5,7 @@
// - hypot(nan, y) = nan
// - hypot(x, nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/ilogb.zig b/std/math/ilogb.zig
index e7b6485357..2dfd42a62c 100644
--- a/std/math/ilogb.zig
+++ b/std/math/ilogb.zig
@@ -4,7 +4,7 @@
// - ilogb(0) = maxInt(i32)
// - ilogb(nan) = maxInt(i32)
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/inf.zig b/std/math/inf.zig
index fb7a3489c5..e1bfbb197a 100644
--- a/std/math/inf.zig
+++ b/std/math/inf.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
pub fn inf(comptime T: type) T {
diff --git a/std/math/isfinite.zig b/std/math/isfinite.zig
index bf1c9ac63c..ee8a5ff590 100644
--- a/std/math/isfinite.zig
+++ b/std/math/isfinite.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/isinf.zig b/std/math/isinf.zig
index b1e3f7795e..1b1759bd36 100644
--- a/std/math/isinf.zig
+++ b/std/math/isinf.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/isnan.zig b/std/math/isnan.zig
index e8b03a1e34..7645528ea9 100644
--- a/std/math/isnan.zig
+++ b/std/math/isnan.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/isnormal.zig b/std/math/isnormal.zig
index 2c57aea7a9..cddcada1d3 100644
--- a/std/math/isnormal.zig
+++ b/std/math/isnormal.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/ln.zig b/std/math/ln.zig
index 257ce8054f..82b212f00f 100644
--- a/std/math/ln.zig
+++ b/std/math/ln.zig
@@ -5,7 +5,7 @@
// - ln(x) = nan if x < 0
// - ln(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const builtin = @import("builtin");
diff --git a/std/math/log.zig b/std/math/log.zig
index 21cffcc078..100dc2fb7f 100644
--- a/std/math/log.zig
+++ b/std/math/log.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const builtin = @import("builtin");
const TypeId = builtin.TypeId;
diff --git a/std/math/log10.zig b/std/math/log10.zig
index 8055f71280..7311778ddd 100644
--- a/std/math/log10.zig
+++ b/std/math/log10.zig
@@ -5,7 +5,7 @@
// - log10(x) = nan if x < 0
// - log10(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const testing = std.testing;
const builtin = @import("builtin");
diff --git a/std/math/log1p.zig b/std/math/log1p.zig
index 257e7b90d4..c9be1132be 100644
--- a/std/math/log1p.zig
+++ b/std/math/log1p.zig
@@ -7,7 +7,7 @@
// - log1p(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/log2.zig b/std/math/log2.zig
index 1bb51bf9f9..e2dbf4105a 100644
--- a/std/math/log2.zig
+++ b/std/math/log2.zig
@@ -5,7 +5,7 @@
// - log2(x) = nan if x < 0
// - log2(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const builtin = @import("builtin");
diff --git a/std/math/modf.zig b/std/math/modf.zig
index 2dadda76a9..e5a4964e63 100644
--- a/std/math/modf.zig
+++ b/std/math/modf.zig
@@ -3,7 +3,7 @@
// - modf(+-inf) = +-inf, nan
// - modf(nan) = nan, nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/math/nan.zig b/std/math/nan.zig
index d3ad43da23..1a11a141d5 100644
--- a/std/math/nan.zig
+++ b/std/math/nan.zig
@@ -1,4 +1,4 @@
-const math = @import("index.zig");
+const math = @import("../math.zig");
pub fn nan(comptime T: type) T {
return switch (T) {
diff --git a/std/math/pow.zig b/std/math/pow.zig
index f037f66d7e..81bb2d95d5 100644
--- a/std/math/pow.zig
+++ b/std/math/pow.zig
@@ -22,7 +22,7 @@
// pow(x, y) = nan for finite x < 0 and finite non-integer y
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/powi.zig b/std/math/powi.zig
index dffb564da7..b7212efcbf 100644
--- a/std/math/powi.zig
+++ b/std/math/powi.zig
@@ -9,7 +9,7 @@
// powi(x, y) = Underflow for for y > @sizeOf(x) - 1 y < 0
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/math/round.zig b/std/math/round.zig
index 7346b703c9..39ff56ca79 100644
--- a/std/math/round.zig
+++ b/std/math/round.zig
@@ -6,7 +6,7 @@
const builtin = @import("builtin");
const expect = std.testing.expect;
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
pub fn round(x: var) @typeOf(x) {
diff --git a/std/math/scalbn.zig b/std/math/scalbn.zig
index d37a8659a9..d1338f5acb 100644
--- a/std/math/scalbn.zig
+++ b/std/math/scalbn.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/signbit.zig b/std/math/signbit.zig
index 728f651aec..9727152b07 100644
--- a/std/math/signbit.zig
+++ b/std/math/signbit.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/sin.zig b/std/math/sin.zig
index 5ade6636c7..e25b8a292b 100644
--- a/std/math/sin.zig
+++ b/std/math/sin.zig
@@ -5,7 +5,7 @@
// - sin(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/sinh.zig b/std/math/sinh.zig
index 95924ba55a..cf4363c4a9 100644
--- a/std/math/sinh.zig
+++ b/std/math/sinh.zig
@@ -5,7 +5,7 @@
// - sinh(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const expo2 = @import("expo2.zig").expo2;
diff --git a/std/math/sqrt.zig b/std/math/sqrt.zig
index 9996b44b20..9062f598a1 100644
--- a/std/math/sqrt.zig
+++ b/std/math/sqrt.zig
@@ -5,7 +5,7 @@
// - sqrt(x) = nan if x < 0
// - sqrt(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const builtin = @import("builtin");
diff --git a/std/math/tan.zig b/std/math/tan.zig
index ec43092320..fc11ebdef7 100644
--- a/std/math/tan.zig
+++ b/std/math/tan.zig
@@ -5,7 +5,7 @@
// - tan(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
diff --git a/std/math/tanh.zig b/std/math/tanh.zig
index a35449a053..f88ecfdc9c 100644
--- a/std/math/tanh.zig
+++ b/std/math/tanh.zig
@@ -5,7 +5,7 @@
// - sinh(nan) = nan
const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const expo2 = @import("expo2.zig").expo2;
diff --git a/std/math/trunc.zig b/std/math/trunc.zig
index 8c91ccc568..9449d0e7eb 100644
--- a/std/math/trunc.zig
+++ b/std/math/trunc.zig
@@ -4,7 +4,7 @@
// - trunc(+-inf) = +-inf
// - trunc(nan) = nan
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const expect = std.testing.expect;
const maxInt = std.math.maxInt;
diff --git a/std/mem.zig b/std/mem.zig
index 39b9701754..681054d087 100644
--- a/std/mem.zig
+++ b/std/mem.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const debug = std.debug;
const assert = debug.assert;
const math = std.math;
diff --git a/std/meta/index.zig b/std/meta.zig
similarity index 99%
rename from std/meta/index.zig
rename to std/meta.zig
index 652e2d39ec..215c5dfad8 100644
--- a/std/meta/index.zig
+++ b/std/meta.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const debug = std.debug;
const mem = std.mem;
const math = std.math;
const testing = std.testing;
-pub const trait = @import("trait.zig");
+pub const trait = @import("meta/trait.zig");
const TypeId = builtin.TypeId;
const TypeInfo = builtin.TypeInfo;
diff --git a/std/meta/trait.zig b/std/meta/trait.zig
index 7fca5f4dcd..f77619ec39 100644
--- a/std/meta/trait.zig
+++ b/std/meta/trait.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const mem = std.mem;
const debug = std.debug;
const testing = std.testing;
const warn = debug.warn;
-const meta = @import("index.zig");
+const meta = @import("../meta.zig");
//This is necessary if we want to return generic functions directly because of how the
// the type erasure works. see: #1375
diff --git a/std/mutex.zig b/std/mutex.zig
index a13b1c06c7..2b3ac4e366 100644
--- a/std/mutex.zig
+++ b/std/mutex.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const AtomicOrder = builtin.AtomicOrder;
const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/net.zig b/std/net.zig
index 968c1f019f..bb292efd83 100644
--- a/std/net.zig
+++ b/std/net.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const net = @This();
diff --git a/std/os/index.zig b/std/os.zig
similarity index 98%
rename from std/os/index.zig
rename to std/os.zig
index 148f4ebe06..c686c2a054 100644
--- a/std/os/index.zig
+++ b/std/os.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const Os = builtin.Os;
const is_windows = builtin.os == Os.windows;
@@ -13,26 +13,26 @@ comptime {
}
test "std.os" {
- _ = @import("child_process.zig");
- _ = @import("darwin.zig");
- _ = @import("darwin/errno.zig");
- _ = @import("get_user_id.zig");
- _ = @import("linux/index.zig");
- _ = @import("path.zig");
- _ = @import("test.zig");
- _ = @import("time.zig");
- _ = @import("windows/index.zig");
- _ = @import("uefi.zig");
- _ = @import("get_app_data_dir.zig");
+ _ = @import("os/child_process.zig");
+ _ = @import("os/darwin.zig");
+ _ = @import("os/darwin/errno.zig");
+ _ = @import("os/get_user_id.zig");
+ _ = @import("os/linux.zig");
+ _ = @import("os/path.zig");
+ _ = @import("os/test.zig");
+ _ = @import("os/time.zig");
+ _ = @import("os/windows.zig");
+ _ = @import("os/uefi.zig");
+ _ = @import("os/get_app_data_dir.zig");
}
-pub const windows = @import("windows/index.zig");
-pub const darwin = @import("darwin.zig");
-pub const linux = @import("linux/index.zig");
-pub const freebsd = @import("freebsd/index.zig");
-pub const netbsd = @import("netbsd/index.zig");
-pub const zen = @import("zen.zig");
-pub const uefi = @import("uefi.zig");
+pub const windows = @import("os/windows.zig");
+pub const darwin = @import("os/darwin.zig");
+pub const linux = @import("os/linux.zig");
+pub const freebsd = @import("os/freebsd.zig");
+pub const netbsd = @import("os/netbsd.zig");
+pub const zen = @import("os/zen.zig");
+pub const uefi = @import("os/uefi.zig");
pub const posix = switch (builtin.os) {
Os.linux => linux,
@@ -45,10 +45,10 @@ pub const posix = switch (builtin.os) {
pub const net = @import("net.zig");
-pub const ChildProcess = @import("child_process.zig").ChildProcess;
-pub const path = @import("path.zig");
-pub const File = @import("file.zig").File;
-pub const time = @import("time.zig");
+pub const ChildProcess = @import("os/child_process.zig").ChildProcess;
+pub const path = @import("os/path.zig");
+pub const File = @import("os/file.zig").File;
+pub const time = @import("os/time.zig");
pub const page_size = 4 * 1024;
pub const MAX_PATH_BYTES = switch (builtin.os) {
@@ -61,10 +61,10 @@ pub const MAX_PATH_BYTES = switch (builtin.os) {
else => @compileError("Unsupported OS"),
};
-pub const UserInfo = @import("get_user_id.zig").UserInfo;
-pub const getUserInfo = @import("get_user_id.zig").getUserInfo;
+pub const UserInfo = @import("os/get_user_id.zig").UserInfo;
+pub const getUserInfo = @import("os/get_user_id.zig").getUserInfo;
-const windows_util = @import("windows/util.zig");
+const windows_util = @import("os/windows/util.zig");
pub const windowsWaitSingle = windows_util.windowsWaitSingle;
pub const windowsWrite = windows_util.windowsWrite;
pub const windowsIsCygwinPty = windows_util.windowsIsCygwinPty;
@@ -88,8 +88,8 @@ pub const WindowsReadError = windows_util.ReadError;
pub const FileHandle = if (is_windows) windows.HANDLE else i32;
-pub const getAppDataDir = @import("get_app_data_dir.zig").getAppDataDir;
-pub const GetAppDataDirError = @import("get_app_data_dir.zig").GetAppDataDirError;
+pub const getAppDataDir = @import("os/get_app_data_dir.zig").getAppDataDir;
+pub const GetAppDataDirError = @import("os/get_app_data_dir.zig").GetAppDataDirError;
const debug = std.debug;
const assert = debug.assert;
@@ -3406,3 +3406,27 @@ pub fn linuxINotifyRmWatch(inotify_fd: i32, wd: i32) !void {
else => unreachable,
}
}
+
+pub const MProtectError = error{
+ AccessDenied,
+ OutOfMemory,
+ Unexpected,
+};
+
+/// address and length must be page-aligned
+pub fn posixMProtect(address: usize, length: usize, protection: u32) MProtectError!void {
+ const negative_page_size = @bitCast(usize, -isize(page_size));
+ const aligned_address = address & negative_page_size;
+ const aligned_end = (address + length + page_size - 1) & negative_page_size;
+ assert(address == aligned_address);
+ assert(length == aligned_end - aligned_address);
+ const rc = posix.mprotect(address, length, protection);
+ const err = posix.getErrno(rc);
+ switch (err) {
+ 0 => return,
+ posix.EINVAL => unreachable,
+ posix.EACCES => return error.AccessDenied,
+ posix.ENOMEM => return error.OutOfMemory,
+ else => return unexpectedErrorPosix(err),
+ }
+}
diff --git a/std/os/child_process.zig b/std/os/child_process.zig
index 1da0b3492b..653c776239 100644
--- a/std/os/child_process.zig
+++ b/std/os/child_process.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const cstr = std.cstr;
const unicode = std.unicode;
const io = std.io;
diff --git a/std/os/darwin.zig b/std/os/darwin.zig
index 3e883abbab..4ce631c6ab 100644
--- a/std/os/darwin.zig
+++ b/std/os/darwin.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const c = std.c;
const assert = std.debug.assert;
const maxInt = std.math.maxInt;
diff --git a/std/os/file.zig b/std/os/file.zig
index 23469a3c37..c9a0e2b696 100644
--- a/std/os/file.zig
+++ b/std/os/file.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const os = std.os;
const io = std.io;
diff --git a/std/os/freebsd/index.zig b/std/os/freebsd.zig
similarity index 99%
rename from std/os/freebsd/index.zig
rename to std/os/freebsd.zig
index 48c0ea5b1e..90e8de1557 100644
--- a/std/os/freebsd/index.zig
+++ b/std/os/freebsd.zig
@@ -1,8 +1,8 @@
const builtin = @import("builtin");
-pub use @import("errno.zig");
+pub use @import("freebsd/errno.zig");
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
const c = std.c;
const assert = std.debug.assert;
@@ -119,7 +119,6 @@ pub const X_OK = 1; // test for execute or search permission
pub const W_OK = 2; // test for write permission
pub const R_OK = 4; // test for read permission
-
pub const O_RDONLY = 0x0000;
pub const O_WRONLY = 0x0001;
pub const O_RDWR = 0x0002;
diff --git a/std/os/get_app_data_dir.zig b/std/os/get_app_data_dir.zig
index a49d164f46..e69c03edb9 100644
--- a/std/os/get_app_data_dir.zig
+++ b/std/os/get_app_data_dir.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const unicode = std.unicode;
const mem = std.mem;
diff --git a/std/os/get_user_id.zig b/std/os/get_user_id.zig
index 6747cc4557..db44c6838f 100644
--- a/std/os/get_user_id.zig
+++ b/std/os/get_user_id.zig
@@ -1,6 +1,6 @@
const builtin = @import("builtin");
const Os = builtin.Os;
-const os = @import("index.zig");
+const os = @import("../os.zig");
const io = @import("../io.zig");
pub const UserInfo = struct {
diff --git a/std/os/linux/index.zig b/std/os/linux.zig
similarity index 99%
rename from std/os/linux/index.zig
rename to std/os/linux.zig
index b78c1b3da5..e7f822185b 100644
--- a/std/os/linux/index.zig
+++ b/std/os/linux.zig
@@ -1,15 +1,15 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const builtin = @import("builtin");
const maxInt = std.math.maxInt;
-const vdso = @import("vdso.zig");
+const vdso = @import("linux/vdso.zig");
pub use switch (builtin.arch) {
- builtin.Arch.x86_64 => @import("x86_64.zig"),
- builtin.Arch.i386 => @import("i386.zig"),
- builtin.Arch.aarch64 => @import("arm64.zig"),
+ builtin.Arch.x86_64 => @import("linux/x86_64.zig"),
+ builtin.Arch.i386 => @import("linux/i386.zig"),
+ builtin.Arch.aarch64 => @import("linux/arm64.zig"),
else => @compileError("unsupported arch"),
};
-pub use @import("errno.zig");
+pub use @import("linux/errno.zig");
pub const PATH_MAX = 4096;
@@ -806,6 +806,10 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of
return syscall6(SYS_mmap, @ptrToInt(address), length, prot, flags, @bitCast(usize, isize(fd)), @bitCast(usize, offset));
}
+pub fn mprotect(address: usize, length: usize, protection: usize) usize {
+ return syscall3(SYS_mprotect, address, length, protection);
+}
+
pub fn munmap(address: usize, length: usize) usize {
return syscall2(SYS_munmap, address, length);
}
@@ -1532,6 +1536,6 @@ pub const dirent64 = extern struct {
test "import" {
if (builtin.os == builtin.Os.linux) {
- _ = @import("test.zig");
+ _ = @import("linux/test.zig");
}
}
diff --git a/std/os/linux/arm64.zig b/std/os/linux/arm64.zig
index 91e4a49679..ac2c18ee5f 100644
--- a/std/os/linux/arm64.zig
+++ b/std/os/linux/arm64.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const linux = std.os.linux;
const socklen_t = linux.socklen_t;
const iovec = linux.iovec;
diff --git a/std/os/linux/test.zig b/std/os/linux/test.zig
index 40fb7823d2..286748b70c 100644
--- a/std/os/linux/test.zig
+++ b/std/os/linux/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const builtin = @import("builtin");
const linux = std.os.linux;
const expect = std.testing.expect;
diff --git a/std/os/linux/vdso.zig b/std/os/linux/vdso.zig
index 07745ad1eb..efd69d8542 100644
--- a/std/os/linux/vdso.zig
+++ b/std/os/linux/vdso.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const elf = std.elf;
const linux = std.os.linux;
const cstr = std.cstr;
diff --git a/std/os/linux/x86_64.zig b/std/os/linux/x86_64.zig
index 2ea369d9f2..d194cd4003 100644
--- a/std/os/linux/x86_64.zig
+++ b/std/os/linux/x86_64.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const linux = std.os.linux;
const socklen_t = linux.socklen_t;
const iovec = linux.iovec;
diff --git a/std/os/netbsd/index.zig b/std/os/netbsd.zig
similarity index 99%
rename from std/os/netbsd/index.zig
rename to std/os/netbsd.zig
index ebabc3c801..2d4b6ff124 100644
--- a/std/os/netbsd/index.zig
+++ b/std/os/netbsd.zig
@@ -1,8 +1,8 @@
const builtin = @import("builtin");
-pub use @import("errno.zig");
+pub use @import("netbsd/errno.zig");
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
const c = std.c;
const assert = std.debug.assert;
@@ -110,7 +110,6 @@ pub const X_OK = 1; // test for execute or search permission
pub const W_OK = 2; // test for write permission
pub const R_OK = 4; // test for read permission
-
pub const O_RDONLY = 0x0000;
pub const O_WRONLY = 0x0001;
pub const O_RDWR = 0x0002;
diff --git a/std/os/path.zig b/std/os/path.zig
index 290f8ba17f..b68ff32408 100644
--- a/std/os/path.zig
+++ b/std/os/path.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const Os = builtin.Os;
const debug = std.debug;
diff --git a/std/os/test.zig b/std/os/test.zig
index b2a4d96651..ab21ea1568 100644
--- a/std/os/test.zig
+++ b/std/os/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const os = std.os;
const expect = std.testing.expect;
const io = std.io;
diff --git a/std/os/time.zig b/std/os/time.zig
index bce6f265de..66ceedb1b6 100644
--- a/std/os/time.zig
+++ b/std/os/time.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const Os = builtin.Os;
const debug = std.debug;
diff --git a/std/os/windows/index.zig b/std/os/windows.zig
similarity index 96%
rename from std/os/windows/index.zig
rename to std/os/windows.zig
index 8e9ed8b8db..96274632ce 100644
--- a/std/os/windows/index.zig
+++ b/std/os/windows.zig
@@ -1,18 +1,18 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const maxInt = std.math.maxInt;
-pub use @import("advapi32.zig");
-pub use @import("kernel32.zig");
-pub use @import("ntdll.zig");
-pub use @import("ole32.zig");
-pub use @import("shell32.zig");
+pub use @import("windows/advapi32.zig");
+pub use @import("windows/kernel32.zig");
+pub use @import("windows/ntdll.zig");
+pub use @import("windows/ole32.zig");
+pub use @import("windows/shell32.zig");
test "import" {
- _ = @import("util.zig");
+ _ = @import("windows/util.zig");
}
-pub const ERROR = @import("error.zig");
+pub const ERROR = @import("windows/error.zig");
pub const SHORT = c_short;
pub const BOOL = c_int;
@@ -396,4 +396,4 @@ pub const IMAGE_TLS_DIRECTORY = extern struct {
pub const IMAGE_TLS_DIRECTORY64 = IMAGE_TLS_DIRECTORY;
pub const IMAGE_TLS_DIRECTORY32 = IMAGE_TLS_DIRECTORY;
-pub const PIMAGE_TLS_CALLBACK = ?extern fn(PVOID, DWORD, PVOID) void;
+pub const PIMAGE_TLS_CALLBACK = ?extern fn (PVOID, DWORD, PVOID) void;
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig
index 185c1424c6..9672767500 100644
--- a/std/os/windows/advapi32.zig
+++ b/std/os/windows/advapi32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
pub const PROV_RSA_FULL = 1;
diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig
index ce8443de02..64a97ca87d 100644
--- a/std/os/windows/kernel32.zig
+++ b/std/os/windows/kernel32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL;
@@ -262,12 +262,10 @@ pub const INIT_ONCE_STATIC_INIT = RTL_RUN_ONCE_INIT;
pub extern "kernel32" stdcallcc fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) BOOL;
-pub const INIT_ONCE_FN = extern fn(InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL;
+pub const INIT_ONCE_FN = extern fn (InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL;
pub const RTL_RUN_ONCE = extern struct {
Ptr: ?*c_void,
};
-pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE {
- .Ptr = null,
-};
+pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE{ .Ptr = null };
diff --git a/std/os/windows/ntdll.zig b/std/os/windows/ntdll.zig
index acb78a59f4..1b63c1e7ec 100644
--- a/std/os/windows/ntdll.zig
+++ b/std/os/windows/ntdll.zig
@@ -1,3 +1,3 @@
-use @import("index.zig");
+use @import("../windows.zig");
pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: **c_void, BackTraceHash: ?*DWORD) WORD;
diff --git a/std/os/windows/ole32.zig b/std/os/windows/ole32.zig
index 8f34b45bbf..1ecfecba3c 100644
--- a/std/os/windows/ole32.zig
+++ b/std/os/windows/ole32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void;
pub extern "ole32" stdcallcc fn CoUninitialize() void;
diff --git a/std/os/windows/shell32.zig b/std/os/windows/shell32.zig
index 139babc7a8..c299e01f17 100644
--- a/std/os/windows/shell32.zig
+++ b/std/os/windows/shell32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: *const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: *[*]WCHAR) HRESULT;
diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig
index 849c15a6f5..0952343051 100644
--- a/std/os/windows/util.zig
+++ b/std/os/windows/util.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
const builtin = @import("builtin");
const os = std.os;
const unicode = std.unicode;
diff --git a/std/os/zen.zig b/std/os/zen.zig
index 76c4df9d62..0564956b24 100644
--- a/std/os/zen.zig
+++ b/std/os/zen.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
//////////////////////////
diff --git a/std/pdb.zig b/std/pdb.zig
index b6e48ad2f7..2b02a84871 100644
--- a/std/pdb.zig
+++ b/std/pdb.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
const io = std.io;
const math = std.math;
const mem = std.mem;
@@ -12,7 +12,6 @@ const ArrayList = std.ArrayList;
// Note: most of this is based on information gathered from LLVM source code,
// documentation and/or contributors.
-
// https://llvm.org/docs/PDB/DbiStream.html#stream-header
pub const DbiStreamHeader = packed struct {
VersionSignature: i32,
@@ -393,10 +392,9 @@ pub const LineNumberEntry = packed struct {
Flags: u32,
/// TODO runtime crash when I make the actual type of Flags this
- const Flags = packed struct {
+ pub const Flags = packed struct {
/// Start line number
Start: u24,
-
/// Delta of lines to the end of the expression. Still unclear.
// TODO figure out the point of this field.
End: u7,
diff --git a/std/priority_queue.zig b/std/priority_queue.zig
index 33b5a963c6..d2c493af3e 100644
--- a/std/priority_queue.zig
+++ b/std/priority_queue.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const Allocator = std.mem.Allocator;
const debug = std.debug;
const expect = std.testing.expect;
diff --git a/std/rand/index.zig b/std/rand.zig
similarity index 99%
rename from std/rand/index.zig
rename to std/rand.zig
index 12dd763aee..a2fdfed6fd 100644
--- a/std/rand/index.zig
+++ b/std/rand.zig
@@ -14,13 +14,13 @@
//
// TODO(tiehuis): Benchmark these against other reference implementations.
-const std = @import("../index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const expect = std.testing.expect;
const mem = std.mem;
const math = std.math;
-const ziggurat = @import("ziggurat.zig");
+const ziggurat = @import("rand/ziggurat.zig");
const maxInt = std.math.maxInt;
// When you need fast unbiased random numbers
diff --git a/std/rand/ziggurat.zig b/std/rand/ziggurat.zig
index 0636a5bfc4..995248415b 100644
--- a/std/rand/ziggurat.zig
+++ b/std/rand/ziggurat.zig
@@ -8,7 +8,7 @@
// NOTE: This seems interesting but reference code is a bit hard to grok:
// https://sbarral.github.io/etf.
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const math = std.math;
const Random = std.rand.Random;
diff --git a/std/rb.zig b/std/rb.zig
index 27e60dca6a..0b28550a13 100644
--- a/std/rb.zig
+++ b/std/rb.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const mem = std.mem; // For mem.Compare
diff --git a/std/segmented_list.zig b/std/segmented_list.zig
index 26b7fa48f5..0600fbba3f 100644
--- a/std/segmented_list.zig
+++ b/std/segmented_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const Allocator = std.mem.Allocator;
diff --git a/std/sort.zig b/std/sort.zig
index 86a6724fee..69dc148f31 100644
--- a/std/sort.zig
+++ b/std/sort.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const mem = std.mem;
diff --git a/std/special/bootstrap.zig b/std/special/bootstrap.zig
index 950fd5cbb9..04b29d6709 100644
--- a/std/special/bootstrap.zig
+++ b/std/special/bootstrap.zig
@@ -46,7 +46,7 @@ nakedcc fn _start() noreturn {
extern fn WinMainCRTStartup() noreturn {
@setAlignStack(16);
if (!builtin.single_threaded) {
- _ = @import("../os/windows/tls.zig");
+ _ = @import("bootstrap_windows_tls.zig");
}
std.os.windows.ExitProcess(callMain());
}
diff --git a/std/os/windows/tls.zig b/std/special/bootstrap_windows_tls.zig
similarity index 96%
rename from std/os/windows/tls.zig
rename to std/special/bootstrap_windows_tls.zig
index 9e62a7c5c6..71165d355b 100644
--- a/std/os/windows/tls.zig
+++ b/std/special/bootstrap_windows_tls.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("std");
export var _tls_index: u32 = std.os.windows.TLS_OUT_OF_INDEXES;
export var _tls_start: u8 linksection(".tls") = 0;
@@ -26,7 +26,7 @@ pub const IMAGE_TLS_DIRECTORY = extern struct {
SizeOfZeroFill: u32,
Characteristics: u32,
};
-export const _tls_used linksection(".rdata$T") = IMAGE_TLS_DIRECTORY {
+export const _tls_used linksection(".rdata$T") = IMAGE_TLS_DIRECTORY{
.StartAddressOfRawData = &_tls_start,
.EndAddressOfRawData = &_tls_end,
.AddressOfIndex = &_tls_index,
diff --git a/std/special/builtin.zig b/std/special/builtin.zig
index ad50eecc27..38c1493ba2 100644
--- a/std/special/builtin.zig
+++ b/std/special/builtin.zig
@@ -134,7 +134,7 @@ nakedcc fn clone() void {
}
}
-const math = @import("../math/index.zig");
+const math = std.math;
export fn fmodf(x: f32, y: f32) f32 {
return generic_fmod(f32, x, y);
diff --git a/std/special/compiler_rt/index.zig b/std/special/compiler_rt.zig
similarity index 79%
rename from std/special/compiler_rt/index.zig
rename to std/special/compiler_rt.zig
index 7657ce6118..6521dc1aaf 100644
--- a/std/special/compiler_rt/index.zig
+++ b/std/special/compiler_rt.zig
@@ -5,68 +5,68 @@ comptime {
const linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Weak;
const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong;
- @export("__letf2", @import("comparetf2.zig").__letf2, linkage);
- @export("__getf2", @import("comparetf2.zig").__getf2, linkage);
+ @export("__letf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+ @export("__getf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage);
if (!is_test) {
// only create these aliases when not testing
- @export("__cmptf2", @import("comparetf2.zig").__letf2, linkage);
- @export("__eqtf2", @import("comparetf2.zig").__letf2, linkage);
- @export("__lttf2", @import("comparetf2.zig").__letf2, linkage);
- @export("__netf2", @import("comparetf2.zig").__letf2, linkage);
- @export("__gttf2", @import("comparetf2.zig").__getf2, linkage);
- @export("__gnu_h2f_ieee", @import("extendXfYf2.zig").__extendhfsf2, linkage);
- @export("__gnu_f2h_ieee", @import("truncXfYf2.zig").__truncsfhf2, linkage);
+ @export("__cmptf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+ @export("__eqtf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+ @export("__lttf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+ @export("__netf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+ @export("__gttf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage);
+ @export("__gnu_h2f_ieee", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage);
+ @export("__gnu_f2h_ieee", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage);
}
- @export("__unordtf2", @import("comparetf2.zig").__unordtf2, linkage);
+ @export("__unordtf2", @import("compiler_rt/comparetf2.zig").__unordtf2, linkage);
- @export("__addtf3", @import("addXf3.zig").__addtf3, linkage);
- @export("__subtf3", @import("addXf3.zig").__subtf3, linkage);
+ @export("__addtf3", @import("compiler_rt/addXf3.zig").__addtf3, linkage);
+ @export("__subtf3", @import("compiler_rt/addXf3.zig").__subtf3, linkage);
- @export("__floattitf", @import("floattitf.zig").__floattitf, linkage);
- @export("__floattidf", @import("floattidf.zig").__floattidf, linkage);
- @export("__floattisf", @import("floattisf.zig").__floattisf, linkage);
+ @export("__floattitf", @import("compiler_rt/floattitf.zig").__floattitf, linkage);
+ @export("__floattidf", @import("compiler_rt/floattidf.zig").__floattidf, linkage);
+ @export("__floattisf", @import("compiler_rt/floattisf.zig").__floattisf, linkage);
- @export("__floatunditf", @import("floatunditf.zig").__floatunditf, linkage);
- @export("__floatunsitf", @import("floatunsitf.zig").__floatunsitf, linkage);
+ @export("__floatunditf", @import("compiler_rt/floatunditf.zig").__floatunditf, linkage);
+ @export("__floatunsitf", @import("compiler_rt/floatunsitf.zig").__floatunsitf, linkage);
- @export("__floatuntitf", @import("floatuntitf.zig").__floatuntitf, linkage);
- @export("__floatuntidf", @import("floatuntidf.zig").__floatuntidf, linkage);
- @export("__floatuntisf", @import("floatuntisf.zig").__floatuntisf, linkage);
+ @export("__floatuntitf", @import("compiler_rt/floatuntitf.zig").__floatuntitf, linkage);
+ @export("__floatuntidf", @import("compiler_rt/floatuntidf.zig").__floatuntidf, linkage);
+ @export("__floatuntisf", @import("compiler_rt/floatuntisf.zig").__floatuntisf, linkage);
- @export("__extenddftf2", @import("extendXfYf2.zig").__extenddftf2, linkage);
- @export("__extendsftf2", @import("extendXfYf2.zig").__extendsftf2, linkage);
- @export("__extendhfsf2", @import("extendXfYf2.zig").__extendhfsf2, linkage);
+ @export("__extenddftf2", @import("compiler_rt/extendXfYf2.zig").__extenddftf2, linkage);
+ @export("__extendsftf2", @import("compiler_rt/extendXfYf2.zig").__extendsftf2, linkage);
+ @export("__extendhfsf2", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage);
- @export("__truncsfhf2", @import("truncXfYf2.zig").__truncsfhf2, linkage);
- @export("__truncdfhf2", @import("truncXfYf2.zig").__truncdfhf2, linkage);
- @export("__trunctfdf2", @import("truncXfYf2.zig").__trunctfdf2, linkage);
- @export("__trunctfsf2", @import("truncXfYf2.zig").__trunctfsf2, linkage);
+ @export("__truncsfhf2", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage);
+ @export("__truncdfhf2", @import("compiler_rt/truncXfYf2.zig").__truncdfhf2, linkage);
+ @export("__trunctfdf2", @import("compiler_rt/truncXfYf2.zig").__trunctfdf2, linkage);
+ @export("__trunctfsf2", @import("compiler_rt/truncXfYf2.zig").__trunctfsf2, linkage);
- @export("__fixunssfsi", @import("fixunssfsi.zig").__fixunssfsi, linkage);
- @export("__fixunssfdi", @import("fixunssfdi.zig").__fixunssfdi, linkage);
- @export("__fixunssfti", @import("fixunssfti.zig").__fixunssfti, linkage);
+ @export("__fixunssfsi", @import("compiler_rt/fixunssfsi.zig").__fixunssfsi, linkage);
+ @export("__fixunssfdi", @import("compiler_rt/fixunssfdi.zig").__fixunssfdi, linkage);
+ @export("__fixunssfti", @import("compiler_rt/fixunssfti.zig").__fixunssfti, linkage);
- @export("__fixunsdfsi", @import("fixunsdfsi.zig").__fixunsdfsi, linkage);
- @export("__fixunsdfdi", @import("fixunsdfdi.zig").__fixunsdfdi, linkage);
- @export("__fixunsdfti", @import("fixunsdfti.zig").__fixunsdfti, linkage);
+ @export("__fixunsdfsi", @import("compiler_rt/fixunsdfsi.zig").__fixunsdfsi, linkage);
+ @export("__fixunsdfdi", @import("compiler_rt/fixunsdfdi.zig").__fixunsdfdi, linkage);
+ @export("__fixunsdfti", @import("compiler_rt/fixunsdfti.zig").__fixunsdfti, linkage);
- @export("__fixunstfsi", @import("fixunstfsi.zig").__fixunstfsi, linkage);
- @export("__fixunstfdi", @import("fixunstfdi.zig").__fixunstfdi, linkage);
- @export("__fixunstfti", @import("fixunstfti.zig").__fixunstfti, linkage);
+ @export("__fixunstfsi", @import("compiler_rt/fixunstfsi.zig").__fixunstfsi, linkage);
+ @export("__fixunstfdi", @import("compiler_rt/fixunstfdi.zig").__fixunstfdi, linkage);
+ @export("__fixunstfti", @import("compiler_rt/fixunstfti.zig").__fixunstfti, linkage);
- @export("__fixdfdi", @import("fixdfdi.zig").__fixdfdi, linkage);
- @export("__fixdfsi", @import("fixdfsi.zig").__fixdfsi, linkage);
- @export("__fixdfti", @import("fixdfti.zig").__fixdfti, linkage);
- @export("__fixsfdi", @import("fixsfdi.zig").__fixsfdi, linkage);
- @export("__fixsfsi", @import("fixsfsi.zig").__fixsfsi, linkage);
- @export("__fixsfti", @import("fixsfti.zig").__fixsfti, linkage);
- @export("__fixtfdi", @import("fixtfdi.zig").__fixtfdi, linkage);
- @export("__fixtfsi", @import("fixtfsi.zig").__fixtfsi, linkage);
- @export("__fixtfti", @import("fixtfti.zig").__fixtfti, linkage);
+ @export("__fixdfdi", @import("compiler_rt/fixdfdi.zig").__fixdfdi, linkage);
+ @export("__fixdfsi", @import("compiler_rt/fixdfsi.zig").__fixdfsi, linkage);
+ @export("__fixdfti", @import("compiler_rt/fixdfti.zig").__fixdfti, linkage);
+ @export("__fixsfdi", @import("compiler_rt/fixsfdi.zig").__fixsfdi, linkage);
+ @export("__fixsfsi", @import("compiler_rt/fixsfsi.zig").__fixsfsi, linkage);
+ @export("__fixsfti", @import("compiler_rt/fixsfti.zig").__fixsfti, linkage);
+ @export("__fixtfdi", @import("compiler_rt/fixtfdi.zig").__fixtfdi, linkage);
+ @export("__fixtfsi", @import("compiler_rt/fixtfsi.zig").__fixtfsi, linkage);
+ @export("__fixtfti", @import("compiler_rt/fixtfti.zig").__fixtfti, linkage);
- @export("__udivmoddi4", @import("udivmoddi4.zig").__udivmoddi4, linkage);
+ @export("__udivmoddi4", @import("compiler_rt/udivmoddi4.zig").__udivmoddi4, linkage);
@export("__udivsi3", __udivsi3, linkage);
@export("__udivdi3", __udivdi3, linkage);
@@ -85,30 +85,30 @@ comptime {
@export("_chkstk", _chkstk, strong_linkage);
@export("__chkstk_ms", __chkstk_ms, linkage);
}
- @export("_aulldiv", @import("aulldiv.zig")._aulldiv, strong_linkage);
- @export("_aullrem", @import("aullrem.zig")._aullrem, strong_linkage);
+ @export("_aulldiv", @import("compiler_rt/aulldiv.zig")._aulldiv, strong_linkage);
+ @export("_aullrem", @import("compiler_rt/aullrem.zig")._aullrem, strong_linkage);
},
builtin.Arch.x86_64 => {
if (!builtin.link_libc) {
@export("__chkstk", __chkstk, strong_linkage);
@export("___chkstk_ms", ___chkstk_ms, linkage);
}
- @export("__divti3", @import("divti3.zig").__divti3_windows_x86_64, linkage);
- @export("__multi3", @import("multi3.zig").__multi3_windows_x86_64, linkage);
- @export("__muloti4", @import("muloti4.zig").__muloti4_windows_x86_64, linkage);
- @export("__udivti3", @import("udivti3.zig").__udivti3_windows_x86_64, linkage);
- @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4_windows_x86_64, linkage);
- @export("__umodti3", @import("umodti3.zig").__umodti3_windows_x86_64, linkage);
+ @export("__divti3", @import("compiler_rt/divti3.zig").__divti3_windows_x86_64, linkage);
+ @export("__multi3", @import("compiler_rt/multi3.zig").__multi3_windows_x86_64, linkage);
+ @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4_windows_x86_64, linkage);
+ @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3_windows_x86_64, linkage);
+ @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4_windows_x86_64, linkage);
+ @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3_windows_x86_64, linkage);
},
else => {},
}
} else {
- @export("__divti3", @import("divti3.zig").__divti3, linkage);
- @export("__multi3", @import("multi3.zig").__multi3, linkage);
- @export("__muloti4", @import("muloti4.zig").__muloti4, linkage);
- @export("__udivti3", @import("udivti3.zig").__udivti3, linkage);
- @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4, linkage);
- @export("__umodti3", @import("umodti3.zig").__umodti3, linkage);
+ @export("__divti3", @import("compiler_rt/divti3.zig").__divti3, linkage);
+ @export("__multi3", @import("compiler_rt/multi3.zig").__multi3, linkage);
+ @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4, linkage);
+ @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3, linkage);
+ @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4, linkage);
+ @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3, linkage);
}
}
@@ -116,7 +116,7 @@ const std = @import("std");
const assert = std.debug.assert;
const testing = std.testing;
-const __udivmoddi4 = @import("udivmoddi4.zig").__udivmoddi4;
+const __udivmoddi4 = @import("compiler_rt/udivmoddi4.zig").__udivmoddi4;
// Avoid dragging in the runtime safety mechanisms into this .o file,
// unless we're trying to test this file.
@@ -165,20 +165,8 @@ extern fn __aeabi_uldivmod(numerator: u64, denominator: u64) AeabiUlDivModResult
}
const is_arm_64 = switch (builtin.arch) {
- builtin.Arch.aarch64v8_3a,
- builtin.Arch.aarch64v8_2a,
- builtin.Arch.aarch64v8_1a,
- builtin.Arch.aarch64v8,
- builtin.Arch.aarch64v8r,
- builtin.Arch.aarch64v8m_baseline,
- builtin.Arch.aarch64v8m_mainline,
- builtin.Arch.aarch64_bev8_3a,
- builtin.Arch.aarch64_bev8_2a,
- builtin.Arch.aarch64_bev8_1a,
- builtin.Arch.aarch64_bev8,
- builtin.Arch.aarch64_bev8r,
- builtin.Arch.aarch64_bev8m_baseline,
- builtin.Arch.aarch64_bev8m_mainline,
+ builtin.Arch.aarch64,
+ builtin.Arch.aarch64_be,
=> true,
else => false,
};
diff --git a/std/special/compiler_rt/addXf3.zig b/std/special/compiler_rt/addXf3.zig
index 09413b2328..c7e80e4e71 100644
--- a/std/special/compiler_rt/addXf3.zig
+++ b/std/special/compiler_rt/addXf3.zig
@@ -4,7 +4,7 @@
const std = @import("std");
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
pub extern fn __addtf3(a: f128, b: f128) f128 {
return addXf3(f128, a, b);
diff --git a/std/special/compiler_rt/divti3.zig b/std/special/compiler_rt/divti3.zig
index 712cccba82..e89a1ada5c 100644
--- a/std/special/compiler_rt/divti3.zig
+++ b/std/special/compiler_rt/divti3.zig
@@ -1,6 +1,6 @@
const udivmod = @import("udivmod.zig").udivmod;
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
pub extern fn __divti3(a: i128, b: i128) i128 {
@setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/muloti4.zig b/std/special/compiler_rt/muloti4.zig
index 866077c80c..fd6855072b 100644
--- a/std/special/compiler_rt/muloti4.zig
+++ b/std/special/compiler_rt/muloti4.zig
@@ -1,6 +1,6 @@
const udivmod = @import("udivmod.zig").udivmod;
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
pub extern fn __muloti4(a: i128, b: i128, overflow: *c_int) i128 {
@setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/multi3.zig b/std/special/compiler_rt/multi3.zig
index 1152a8bda0..a0c84adaf4 100644
--- a/std/special/compiler_rt/multi3.zig
+++ b/std/special/compiler_rt/multi3.zig
@@ -1,5 +1,5 @@
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
// Ported from git@github.com:llvm-project/llvm-project-20170507.git
// ae684fad6d34858c014c94da69c15e7774a633c3
diff --git a/std/special/compiler_rt/udivmodti4.zig b/std/special/compiler_rt/udivmodti4.zig
index 3fa596442f..6a037d3bae 100644
--- a/std/special/compiler_rt/udivmodti4.zig
+++ b/std/special/compiler_rt/udivmodti4.zig
@@ -1,6 +1,6 @@
const udivmod = @import("udivmod.zig").udivmod;
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?*u128) u128 {
@setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/umodti3.zig b/std/special/compiler_rt/umodti3.zig
index 9551e63a6f..12aca8b036 100644
--- a/std/special/compiler_rt/umodti3.zig
+++ b/std/special/compiler_rt/umodti3.zig
@@ -1,6 +1,6 @@
const udivmodti4 = @import("udivmodti4.zig");
const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
pub extern fn __umodti3(a: u128, b: u128) u128 {
@setRuntimeSafety(builtin.is_test);
diff --git a/std/special/panic.zig b/std/special/panic.zig
index bd3ad971e0..7cb7143955 100644
--- a/std/special/panic.zig
+++ b/std/special/panic.zig
@@ -18,7 +18,7 @@ pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn
std.os.abort();
},
else => {
- const first_trace_addr = @ptrToInt(@returnAddress());
+ const first_trace_addr = @returnAddress();
std.debug.panicExtra(error_return_trace, first_trace_addr, "{}", msg);
},
}
diff --git a/std/spinlock.zig b/std/spinlock.zig
index 75fdf9f6e1..905460a2d0 100644
--- a/std/spinlock.zig
+++ b/std/spinlock.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const AtomicOrder = builtin.AtomicOrder;
const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/statically_initialized_mutex.zig b/std/statically_initialized_mutex.zig
index 16bcd7adaf..cfcaf036d3 100644
--- a/std/statically_initialized_mutex.zig
+++ b/std/statically_initialized_mutex.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
const builtin = @import("builtin");
const AtomicOrder = builtin.AtomicOrder;
const AtomicRmwOp = builtin.AtomicRmwOp;
@@ -13,7 +13,7 @@ const windows = std.os.windows;
/// On Windows, this mutex allocates resources when it is
/// first used, and the resources cannot be freed.
/// On Linux, this is an alias of std.Mutex.
-pub const StaticallyInitializedMutex = switch(builtin.os) {
+pub const StaticallyInitializedMutex = switch (builtin.os) {
builtin.Os.linux => std.Mutex,
builtin.Os.windows => struct {
lock: windows.CRITICAL_SECTION,
@@ -28,7 +28,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) {
};
pub fn init() StaticallyInitializedMutex {
- return StaticallyInitializedMutex {
+ return StaticallyInitializedMutex{
.lock = undefined,
.init_once = windows.INIT_ONCE_STATIC_INIT,
};
@@ -54,7 +54,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) {
pub fn acquire(self: *StaticallyInitializedMutex) Held {
assert(windows.InitOnceExecuteOnce(&self.init_once, initCriticalSection, &self.lock, null) != 0);
windows.EnterCriticalSection(&self.lock);
- return Held { .mutex = self };
+ return Held{ .mutex = self };
}
},
else => std.Mutex,
@@ -89,10 +89,7 @@ test "std.StaticallyInitializedMutex" {
var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);
var a = &fixed_buffer_allocator.allocator;
-
- var context = TestContext{
- .data = 0,
- };
+ var context = TestContext{ .data = 0 };
if (builtin.single_threaded) {
TestContext.worker(&context);
diff --git a/std/index.zig b/std/std.zig
similarity index 76%
rename from std/index.zig
rename to std/std.zig
index f8c1b065e9..4a81fc7c35 100644
--- a/std/index.zig
+++ b/std/std.zig
@@ -14,43 +14,43 @@ pub const StaticallyInitializedMutex = @import("statically_initialized_mutex.zig
pub const SegmentedList = @import("segmented_list.zig").SegmentedList;
pub const SpinLock = @import("spinlock.zig").SpinLock;
-pub const atomic = @import("atomic/index.zig");
+pub const atomic = @import("atomic.zig");
pub const base64 = @import("base64.zig");
pub const build = @import("build.zig");
-pub const c = @import("c/index.zig");
+pub const c = @import("c.zig");
pub const coff = @import("coff.zig");
-pub const crypto = @import("crypto/index.zig");
+pub const crypto = @import("crypto.zig");
pub const cstr = @import("cstr.zig");
-pub const debug = @import("debug/index.zig");
+pub const debug = @import("debug.zig");
pub const dwarf = @import("dwarf.zig");
pub const elf = @import("elf.zig");
pub const empty_import = @import("empty.zig");
pub const event = @import("event.zig");
-pub const fmt = @import("fmt/index.zig");
-pub const hash = @import("hash/index.zig");
+pub const fmt = @import("fmt.zig");
+pub const hash = @import("hash.zig");
pub const hash_map = @import("hash_map.zig");
pub const heap = @import("heap.zig");
pub const io = @import("io.zig");
pub const json = @import("json.zig");
pub const lazyInit = @import("lazy_init.zig").lazyInit;
pub const macho = @import("macho.zig");
-pub const math = @import("math/index.zig");
+pub const math = @import("math.zig");
pub const mem = @import("mem.zig");
-pub const meta = @import("meta/index.zig");
+pub const meta = @import("meta.zig");
pub const net = @import("net.zig");
-pub const os = @import("os/index.zig");
+pub const os = @import("os.zig");
pub const pdb = @import("pdb.zig");
-pub const rand = @import("rand/index.zig");
+pub const rand = @import("rand.zig");
pub const rb = @import("rb.zig");
pub const sort = @import("sort.zig");
pub const testing = @import("testing.zig");
pub const unicode = @import("unicode.zig");
-pub const zig = @import("zig/index.zig");
+pub const zig = @import("zig.zig");
test "std" {
// run tests from these
_ = @import("array_list.zig");
- _ = @import("atomic/index.zig");
+ _ = @import("atomic.zig");
_ = @import("buf_map.zig");
_ = @import("buf_set.zig");
_ = @import("buffer.zig");
@@ -63,33 +63,33 @@ test "std" {
_ = @import("base64.zig");
_ = @import("build.zig");
- _ = @import("c/index.zig");
+ _ = @import("c.zig");
_ = @import("coff.zig");
- _ = @import("crypto/index.zig");
+ _ = @import("crypto.zig");
_ = @import("cstr.zig");
- _ = @import("debug/index.zig");
+ _ = @import("debug.zig");
_ = @import("dwarf.zig");
_ = @import("dynamic_library.zig");
_ = @import("elf.zig");
_ = @import("empty.zig");
_ = @import("event.zig");
- _ = @import("fmt/index.zig");
- _ = @import("hash/index.zig");
+ _ = @import("fmt.zig");
+ _ = @import("hash.zig");
_ = @import("heap.zig");
_ = @import("io.zig");
_ = @import("json.zig");
_ = @import("lazy_init.zig");
_ = @import("macho.zig");
- _ = @import("math/index.zig");
+ _ = @import("math.zig");
_ = @import("mem.zig");
- _ = @import("meta/index.zig");
+ _ = @import("meta.zig");
_ = @import("net.zig");
- _ = @import("os/index.zig");
+ _ = @import("os.zig");
_ = @import("pdb.zig");
_ = @import("priority_queue.zig");
- _ = @import("rand/index.zig");
+ _ = @import("rand.zig");
_ = @import("sort.zig");
_ = @import("testing.zig");
_ = @import("unicode.zig");
- _ = @import("zig/index.zig");
+ _ = @import("zig.zig");
}
diff --git a/std/testing.zig b/std/testing.zig
index 2f14974481..be414181f2 100644
--- a/std/testing.zig
+++ b/std/testing.zig
@@ -1,6 +1,6 @@
const builtin = @import("builtin");
const TypeId = builtin.TypeId;
-const std = @import("index.zig");
+const std = @import("std.zig");
/// This function is intended to be used only in tests. It prints diagnostics to stderr
/// and then aborts when actual_error_union is not expected_error.
@@ -44,7 +44,6 @@ pub fn expectEqual(expected: var, actual: @typeOf(expected)) void {
TypeId.ComptimeFloat,
TypeId.ComptimeInt,
TypeId.Enum,
- TypeId.Namespace,
TypeId.Fn,
TypeId.Promise,
TypeId.Vector,
diff --git a/std/unicode.zig b/std/unicode.zig
index fccdf513b9..37a73d7500 100644
--- a/std/unicode.zig
+++ b/std/unicode.zig
@@ -1,4 +1,4 @@
-const std = @import("./index.zig");
+const std = @import("./std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const testing = std.testing;
diff --git a/std/zig.zig b/std/zig.zig
new file mode 100644
index 0000000000..2d4978a4ae
--- /dev/null
+++ b/std/zig.zig
@@ -0,0 +1,16 @@
+const tokenizer = @import("zig/tokenizer.zig");
+pub const Token = tokenizer.Token;
+pub const Tokenizer = tokenizer.Tokenizer;
+pub const parse = @import("zig/parse.zig").parse;
+pub const parseStringLiteral = @import("zig/parse_string_literal.zig").parseStringLiteral;
+pub const render = @import("zig/render.zig").render;
+pub const ast = @import("zig/ast.zig");
+
+test "std.zig tests" {
+ _ = @import("zig/ast.zig");
+ _ = @import("zig/parse.zig");
+ _ = @import("zig/render.zig");
+ _ = @import("zig/tokenizer.zig");
+ _ = @import("zig/parse_string_literal.zig");
+}
+
diff --git a/std/zig/ast.zig b/std/zig/ast.zig
index ea32634566..421c657619 100644
--- a/std/zig/ast.zig
+++ b/std/zig/ast.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const testing = std.testing;
const SegmentedList = std.SegmentedList;
@@ -617,7 +617,7 @@ pub const Node = struct {
pub const DeclList = Root.DeclList;
- const InitArg = union(enum) {
+ pub const InitArg = union(enum) {
None,
Enum: ?*Node,
Type: *Node,
@@ -1744,7 +1744,7 @@ pub const Node = struct {
kind: Kind,
rhs: ?*Node,
- const Kind = union(enum) {
+ pub const Kind = union(enum) {
Break: ?*Node,
Continue: ?*Node,
Return,
@@ -2022,7 +2022,7 @@ pub const Node = struct {
kind: Kind,
rparen: TokenIndex,
- const Kind = union(enum) {
+ pub const Kind = union(enum) {
Variable: *Identifier,
Return: *Node,
};
@@ -2101,9 +2101,9 @@ pub const Node = struct {
clobbers: ClobberList,
rparen: TokenIndex,
- const OutputList = SegmentedList(*AsmOutput, 2);
- const InputList = SegmentedList(*AsmInput, 2);
- const ClobberList = SegmentedList(TokenIndex, 2);
+ pub const OutputList = SegmentedList(*AsmOutput, 2);
+ pub const InputList = SegmentedList(*AsmInput, 2);
+ pub const ClobberList = SegmentedList(TokenIndex, 2);
pub fn iterate(self: *Asm, index: usize) ?*Node {
var i = index;
diff --git a/std/zig/bench.zig b/std/zig/bench.zig
index 6a9e8495bd..ed6ae9a128 100644
--- a/std/zig/bench.zig
+++ b/std/zig/bench.zig
@@ -5,7 +5,7 @@ const Tokenizer = std.zig.Tokenizer;
const Parser = std.zig.Parser;
const io = std.io;
-const source = @embedFile("../os/index.zig");
+const source = @embedFile("../os.zig");
var fixed_buffer_mem: [10 * 1024 * 1024]u8 = undefined;
pub fn main() !void {
diff --git a/std/zig/index.zig b/std/zig/index.zig
deleted file mode 100644
index da84bc5bb0..0000000000
--- a/std/zig/index.zig
+++ /dev/null
@@ -1,16 +0,0 @@
-const tokenizer = @import("tokenizer.zig");
-pub const Token = tokenizer.Token;
-pub const Tokenizer = tokenizer.Tokenizer;
-pub const parse = @import("parse.zig").parse;
-pub const parseStringLiteral = @import("parse_string_literal.zig").parseStringLiteral;
-pub const render = @import("render.zig").render;
-pub const ast = @import("ast.zig");
-
-test "std.zig tests" {
- _ = @import("ast.zig");
- _ = @import("parse.zig");
- _ = @import("render.zig");
- _ = @import("tokenizer.zig");
- _ = @import("parse_string_literal.zig");
-}
-
diff --git a/std/zig/parse.zig b/std/zig/parse.zig
index 867dd11592..e957d1d3e1 100644
--- a/std/zig/parse.zig
+++ b/std/zig/parse.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const mem = std.mem;
const ast = std.zig.ast;
diff --git a/std/zig/parse_string_literal.zig b/std/zig/parse_string_literal.zig
index 00c92a7651..acae0b64c7 100644
--- a/std/zig/parse_string_literal.zig
+++ b/std/zig/parse_string_literal.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const assert = std.debug.assert;
const State = enum {
diff --git a/std/zig/render.zig b/std/zig/render.zig
index 1abc845b7c..50e928c0d8 100644
--- a/std/zig/render.zig
+++ b/std/zig/render.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const builtin = @import("builtin");
const assert = std.debug.assert;
const mem = std.mem;
diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig
index 877e4e8db3..79fd1c5612 100644
--- a/std/zig/tokenizer.zig
+++ b/std/zig/tokenizer.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
const mem = std.mem;
pub const Token = struct {
diff --git a/test/build_examples.zig b/test/build_examples.zig
index c8a47bb093..c51fdfdf89 100644
--- a/test/build_examples.zig
+++ b/test/build_examples.zig
@@ -7,8 +7,10 @@ pub fn addCases(cases: *tests.BuildExamplesContext) void {
cases.addC("example/hello_world/hello_libc.zig");
cases.add("example/cat/main.zig");
cases.add("example/guess_number/main.zig");
+ cases.addBuildFile("test/standalone/main_pkg_path/build.zig");
cases.addBuildFile("example/shared_library/build.zig");
cases.addBuildFile("example/mix_o_files/build.zig");
+ cases.addBuildFile("test/standalone/static_c_lib/build.zig");
if (builtin.os != builtin.Os.macosx) {
// TODO https://github.com/ziglang/zig/issues/1126
cases.addBuildFile("test/standalone/issue_339/build.zig");
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index 1e6dc84605..92df4d2d14 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -2,6 +2,122 @@ const tests = @import("tests.zig");
const builtin = @import("builtin");
pub fn addCases(cases: *tests.CompileErrorContext) void {
+ cases.add(
+ "import outside package path",
+ \\comptime{
+ \\ _ = @import("../a.zig");
+ \\}
+ ,
+ "tmp.zig:2:9: error: import of file outside package path: '../a.zig'",
+ );
+
+ cases.add(
+ "bogus compile var",
+ \\const x = @import("builtin").bogus;
+ \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
+ ,
+ "tmp.zig:1:29: error: container 'builtin' has no member called 'bogus'",
+ );
+
+ cases.add(
+ "wrong panic signature, runtime function",
+ \\test "" {}
+ \\
+ \\pub fn panic() void {}
+ \\
+ ,
+ "tmp.zig:3:5: error: expected type 'fn([]const u8, ?*builtin.StackTrace) noreturn', found 'fn() void'",
+ );
+
+ cases.add(
+ "wrong panic signature, generic function",
+ \\pub fn panic(comptime msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn {
+ \\ while (true) {}
+ \\}
+ ,
+ "tmp.zig:1:5: error: expected type 'fn([]const u8, ?*builtin.StackTrace) noreturn', found 'fn([]const u8,var)var'",
+ "tmp.zig:1:5: note: only one of the functions is generic",
+ );
+
+ cases.add(
+ "direct struct loop",
+ \\const A = struct { a : A, };
+ \\export fn entry() usize { return @sizeOf(A); }
+ ,
+ "tmp.zig:1:11: error: struct 'A' contains itself",
+ );
+
+ cases.add(
+ "indirect struct loop",
+ \\const A = struct { b : B, };
+ \\const B = struct { c : C, };
+ \\const C = struct { a : A, };
+ \\export fn entry() usize { return @sizeOf(A); }
+ ,
+ "tmp.zig:1:11: error: struct 'A' contains itself",
+ );
+
+ cases.add(
+ "instantiating an undefined value for an invalid struct that contains itself",
+ \\const Foo = struct {
+ \\ x: Foo,
+ \\};
+ \\
+ \\var foo: Foo = undefined;
+ \\
+ \\export fn entry() usize {
+ \\ return @sizeOf(@typeOf(foo.x));
+ \\}
+ ,
+ "tmp.zig:1:13: error: struct 'Foo' contains itself",
+ "tmp.zig:8:28: note: referenced here",
+ );
+
+ cases.add(
+ "@typeInfo causing depend on itself compile error",
+ \\const start = struct {
+ \\ fn crash() bug() {
+ \\ return bug;
+ \\ }
+ \\};
+ \\fn bug() void {
+ \\ _ = @typeInfo(start).Struct;
+ \\}
+ \\export fn entry() void {
+ \\ var boom = start.crash();
+ \\}
+ ,
+ "tmp.zig:7:9: error: dependency loop detected",
+ "tmp.zig:2:19: note: called from here",
+ "tmp.zig:10:21: note: referenced here",
+ );
+
+ cases.add(
+ "enum field value references enum",
+ \\pub const Foo = extern enum {
+ \\ A = Foo.B,
+ \\ C = D,
+ \\};
+ \\export fn entry() void {
+ \\ var s: Foo = Foo.E;
+ \\}
+ ,
+ "tmp.zig:1:17: error: 'Foo' depends on itself",
+ );
+
+ cases.add(
+ "top level decl dependency loop",
+ \\const a : @typeOf(b) = 0;
+ \\const b : @typeOf(a) = 0;
+ \\export fn entry() void {
+ \\ const c = a + b;
+ \\}
+ ,
+ "tmp.zig:2:19: error: dependency loop detected",
+ "tmp.zig:1:19: note: referenced here",
+ "tmp.zig:4:15: note: referenced here",
+ );
+
cases.addTest(
"not an enum type",
\\export fn entry() void {
@@ -18,7 +134,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const InvalidToken = struct {};
\\const ExpectedVarDeclOrFn = struct {};
,
- ".tmp_source.zig:4:9: error: not an enum type",
+ "tmp.zig:4:9: error: not an enum type",
);
cases.addTest(
@@ -29,7 +145,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: AB = undefined;
\\}
,
- ".tmp_source.zig:2:18: error: invalid operands to binary expression: 'error{A}' and 'error{B}'",
+ "tmp.zig:2:18: error: invalid operands to binary expression: 'error{A}' and 'error{B}'",
);
if (builtin.os == builtin.Os.linux) {
@@ -40,7 +156,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ exit(0);
\\}
,
- ".tmp_source.zig:3:5: error: dependency on library c must be explicitly specified in the build command",
+ "tmp.zig:3:5: error: dependency on library c must be explicitly specified in the build command",
);
cases.addTest(
@@ -50,8 +166,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = c.printf(c"hello, world!\n");
\\}
,
- ".tmp_source.zig:1:11: error: C import failed",
- ".tmp_source.zig:1:11: note: libc headers not available; compilation does not link against libc",
+ "tmp.zig:1:11: error: C import failed",
+ "tmp.zig:1:11: note: libc headers not available; compilation does not link against libc",
);
}
@@ -63,8 +179,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = a + b;
\\}
,
- ".tmp_source.zig:4:15: error: operation caused overflow",
- ".tmp_source.zig:4:15: note: when computing vector element at index 2",
+ "tmp.zig:4:15: error: operation caused overflow",
+ "tmp.zig:4:15: note: when computing vector element at index 2",
);
cases.addTest(
@@ -111,14 +227,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ B,
\\};
,
- ".tmp_source.zig:2:5: error: type 'anyerror' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:5:5: error: array of 'u24' not allowed in packed struct due to padding bits",
- ".tmp_source.zig:8:5: error: type 'anyerror' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:11:5: error: non-packed, non-extern struct 'S' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:14:5: error: non-packed, non-extern struct 'U' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:17:5: error: type '?anyerror' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:20:5: error: type 'Enum' not allowed in packed struct; no guaranteed in-memory representation",
- ".tmp_source.zig:38:14: note: enum declaration does not specify an integer tag type",
+ "tmp.zig:2:5: error: type 'anyerror' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:5:5: error: array of 'u24' not allowed in packed struct due to padding bits",
+ "tmp.zig:8:5: error: type 'anyerror' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:11:5: error: non-packed, non-extern struct 'S' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:14:5: error: non-packed, non-extern struct 'U' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:17:5: error: type '?anyerror' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:20:5: error: type 'Enum' not allowed in packed struct; no guaranteed in-memory representation",
+ "tmp.zig:38:14: note: enum declaration does not specify an integer tag type",
);
cases.addCase(x: {
@@ -131,7 +247,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ x += 1;
\\}
,
- ".tmp_source.zig:2:5: error: use of undeclared identifier 'x'",
+ "tmp.zig:2:5: error: use of undeclared identifier 'x'",
);
tc.expect_exact = true;
break :x tc;
@@ -143,7 +259,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 0;
\\}
,
- ".tmp_source.zig:1:15: error: parameter of type 'var' not allowed in function with calling convention 'ccc'",
+ "tmp.zig:1:15: error: parameter of type 'var' not allowed in function with calling convention 'ccc'",
);
cases.addTest(
@@ -153,7 +269,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y: [*c]c_void = x;
\\}
,
- ".tmp_source.zig:3:12: error: C pointers cannot point opaque types",
+ "tmp.zig:3:12: error: C pointers cannot point opaque types",
);
cases.addTest(
@@ -173,8 +289,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bar: Bar = undefined;
\\}
,
- ".tmp_source.zig:3:8: error: opaque types have unknown size and therefore cannot be directly embedded in structs",
- ".tmp_source.zig:7:10: error: opaque types have unknown size and therefore cannot be directly embedded in unions",
+ "tmp.zig:3:8: error: opaque types have unknown size and therefore cannot be directly embedded in structs",
+ "tmp.zig:7:10: error: opaque types have unknown size and therefore cannot be directly embedded in unions",
);
cases.addTest(
@@ -204,13 +320,13 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: [*c]u32 = y;
\\}
,
- ".tmp_source.zig:3:27: error: cast increases pointer alignment",
- ".tmp_source.zig:7:18: error: cast discards const qualifier",
- ".tmp_source.zig:11:19: error: expected type '*u32', found '[*c]u8'",
- ".tmp_source.zig:11:19: note: pointer type child 'u8' cannot cast into pointer type child 'u32'",
- ".tmp_source.zig:15:22: error: cast increases pointer alignment",
- ".tmp_source.zig:19:21: error: cast discards const qualifier",
- ".tmp_source.zig:23:22: error: expected type '[*c]u32', found '*u8'",
+ "tmp.zig:3:27: error: cast increases pointer alignment",
+ "tmp.zig:7:18: error: cast discards const qualifier",
+ "tmp.zig:11:19: error: expected type '*u32', found '[*c]u8'",
+ "tmp.zig:11:19: note: pointer type child 'u8' cannot cast into pointer type child 'u32'",
+ "tmp.zig:15:22: error: cast increases pointer alignment",
+ "tmp.zig:19:21: error: cast discards const qualifier",
+ "tmp.zig:23:22: error: expected type '[*c]u32', found '*u8'",
);
cases.addTest(
@@ -220,7 +336,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var zig_ptr: *u8 = c_ptr;
\\}
,
- ".tmp_source.zig:3:24: error: null pointer casted to type '*u8'",
+ "tmp.zig:3:24: error: null pointer casted to type '*u8'",
);
cases.addTest(
@@ -230,7 +346,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var zig_ptr: *u8 = c_ptr;
\\}
,
- ".tmp_source.zig:3:24: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:24: error: use of undefined value here causes undefined behavior",
);
cases.addTest(
@@ -250,12 +366,12 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var c_ptr: [*c][*c]const u8 = ptr_opt_many_ptr;
\\}
,
- ".tmp_source.zig:6:24: error: expected type '*const [*]const u8', found '[*c]const [*c]const u8'",
- ".tmp_source.zig:6:24: note: pointer type child '[*c]const u8' cannot cast into pointer type child '[*]const u8'",
- ".tmp_source.zig:6:24: note: '[*c]const u8' could have null values which are illegal in type '[*]const u8'",
- ".tmp_source.zig:13:35: error: expected type '[*c][*c]const u8', found '*[*]u8'",
- ".tmp_source.zig:13:35: note: pointer type child '[*]u8' cannot cast into pointer type child '[*c]const u8'",
- ".tmp_source.zig:13:35: note: mutable '[*c]const u8' allows illegal null values stored to type '[*]u8'",
+ "tmp.zig:6:24: error: expected type '*const [*]const u8', found '[*c]const [*c]const u8'",
+ "tmp.zig:6:24: note: pointer type child '[*c]const u8' cannot cast into pointer type child '[*]const u8'",
+ "tmp.zig:6:24: note: '[*c]const u8' could have null values which are illegal in type '[*]const u8'",
+ "tmp.zig:13:35: error: expected type '[*c][*c]const u8', found '*[*]u8'",
+ "tmp.zig:13:35: note: pointer type child '[*]u8' cannot cast into pointer type child '[*c]const u8'",
+ "tmp.zig:13:35: note: mutable '[*c]const u8' allows illegal null values stored to type '[*]u8'",
);
cases.addTest(
@@ -268,8 +384,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var ptr: [*c]u8 = x;
\\}
,
- ".tmp_source.zig:2:33: error: integer value 71615590737044764481 cannot be implicitly casted to type 'usize'",
- ".tmp_source.zig:6:23: error: integer type 'u65' too big for implicit @intToPtr to type '[*c]u8'",
+ "tmp.zig:2:33: error: integer value 71615590737044764481 cannot be implicitly casted to type 'usize'",
+ "tmp.zig:6:23: error: integer type 'u65' too big for implicit @intToPtr to type '[*c]u8'",
);
cases.addTest(
@@ -279,7 +395,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const T = [*c]Foo;
\\}
,
- ".tmp_source.zig:3:15: error: C pointers cannot point to non-C-ABI-compatible type 'Foo'",
+ "tmp.zig:3:15: error: C pointers cannot point to non-C-ABI-compatible type 'Foo'",
);
cases.addCase(x: {
@@ -294,7 +410,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ inline while (i < n) : (i += 1) { @compileLog("!@#$"); }
\\}
,
- ".tmp_source.zig:7:39: error: found compile log statement",
+ "tmp.zig:7:39: error: found compile log statement",
);
tc.expect_exact = true;
break :x tc;
@@ -306,7 +422,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ 'a'.* = 1;
\\}
,
- ".tmp_source.zig:2:8: error: attempt to dereference non-pointer type 'comptime_int'",
+ "tmp.zig:2:8: error: attempt to dereference non-pointer type 'comptime_int'",
);
cases.addTest(
@@ -315,7 +431,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = 'a'.*[0..];
\\}
,
- ".tmp_source.zig:2:18: error: attempt to dereference non-pointer type 'comptime_int'",
+ "tmp.zig:2:18: error: attempt to dereference non-pointer type 'comptime_int'",
);
cases.addTest(
@@ -324,14 +440,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var z = @truncate(u8, u16(undefined));
\\}
,
- ".tmp_source.zig:2:30: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:2:30: error: use of undefined value here causes undefined behavior",
);
cases.addTest(
"return invalid type from test",
\\test "example" { return 1; }
,
- ".tmp_source.zig:1:25: error: integer value 1 cannot be implicitly casted to type 'void'",
+ "tmp.zig:1:25: error: integer value 1 cannot be implicitly casted to type 'void'",
);
cases.add(
@@ -341,7 +457,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x;
\\}
,
- ".tmp_source.zig:1:13: error: threadlocal variable cannot be constant",
+ "tmp.zig:1:13: error: threadlocal variable cannot be constant",
);
cases.add(
@@ -350,7 +466,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ threadlocal var x: i32 = 1234;
\\}
,
- ".tmp_source.zig:2:5: error: function-local variable 'x' cannot be threadlocal",
+ "tmp.zig:2:5: error: function-local variable 'x' cannot be threadlocal",
);
cases.add(
@@ -359,7 +475,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var oops = @bitCast(u7, byte);
\\}
,
- ".tmp_source.zig:2:16: error: destination type 'u7' has 7 bits but source type 'u8' has 8 bits",
+ "tmp.zig:2:16: error: destination type 'u7' has 7 bits but source type 'u8' has 8 bits",
);
cases.add(
@@ -371,7 +487,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 5678;
\\}
,
- ".tmp_source.zig:2:12: error: `&&` is invalid. Note that `and` is boolean AND.",
+ "tmp.zig:2:12: error: `&&` is invalid. Note that `and` is boolean AND.",
);
cases.add(
@@ -383,8 +499,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 5678;
\\}
,
- ".tmp_source.zig:2:9: error: expected error set type, found 'bool'",
- ".tmp_source.zig:2:11: note: `||` merges error sets; `or` performs boolean OR",
+ "tmp.zig:2:9: error: expected error set type, found 'bool'",
+ "tmp.zig:2:11: note: `||` merges error sets; `or` performs boolean OR",
);
cases.add(
@@ -393,7 +509,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @compileLog(@ptrCast(*const c_void, &entry));
\\}
,
- ".tmp_source.zig:2:5: error: found compile log statement",
+ "tmp.zig:2:5: error: found compile log statement",
);
cases.add(
@@ -413,8 +529,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:5:9: error: duplicate switch value",
- ".tmp_source.zig:12:9: error: duplicate switch value",
+ "tmp.zig:5:9: error: duplicate switch value",
+ "tmp.zig:12:9: error: duplicate switch value",
);
cases.add(
@@ -430,8 +546,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:2:15: error: switch must handle all possibilities",
- ".tmp_source.zig:7:15: error: switch must handle all possibilities",
+ "tmp.zig:2:15: error: switch must handle all possibilities",
+ "tmp.zig:7:15: error: switch must handle all possibilities",
);
cases.add(
@@ -443,7 +559,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const deref = int_ptr.*;
\\}
,
- ".tmp_source.zig:5:26: error: attempt to read 4 bytes from [4]u8 at index 1 which is 3 bytes",
+ "tmp.zig:5:26: error: attempt to read 4 bytes from [4]u8 at index 1 which is 3 bytes",
);
cases.add(
@@ -454,8 +570,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ do_the_thing(bar);
\\}
,
- ".tmp_source.zig:4:18: error: expected type 'fn(i32) void', found 'fn(bool) void",
- ".tmp_source.zig:4:18: note: parameter 0: 'bool' cannot cast into 'i32'",
+ "tmp.zig:4:18: error: expected type 'fn(i32) void', found 'fn(bool) void",
+ "tmp.zig:4:18: note: parameter 0: 'bool' cannot cast into 'i32'",
);
cases.add(
@@ -469,8 +585,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const unsigned: u32 = value;
\\}
,
- ".tmp_source.zig:3:36: error: cannot cast negative value -1 to unsigned integer type 'u32'",
- ".tmp_source.zig:7:27: error: cannot cast negative value -1 to unsigned integer type 'u32'",
+ "tmp.zig:3:36: error: cannot cast negative value -1 to unsigned integer type 'u32'",
+ "tmp.zig:7:27: error: cannot cast negative value -1 to unsigned integer type 'u32'",
);
cases.add(
@@ -488,9 +604,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var byte: u8 = spartan_count;
\\}
,
- ".tmp_source.zig:3:31: error: integer value 300 cannot be implicitly casted to type 'u8'",
- ".tmp_source.zig:7:22: error: integer value 300 cannot be implicitly casted to type 'u8'",
- ".tmp_source.zig:11:20: error: expected type 'u8', found 'u16'",
+ "tmp.zig:3:31: error: integer value 300 cannot be implicitly casted to type 'u8'",
+ "tmp.zig:7:22: error: integer value 300 cannot be implicitly casted to type 'u8'",
+ "tmp.zig:11:20: error: expected type 'u8', found 'u16'",
);
cases.add(
@@ -500,7 +616,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const y: f32 = x;
\\}
,
- ".tmp_source.zig:3:20: error: cast of value 16777217.000000 to type 'f32' loses information",
+ "tmp.zig:3:20: error: cast of value 16777217.000000 to type 'f32' loses information",
);
cases.add(
@@ -510,7 +626,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:2:14: error: expected type 'f32', found 'f64'",
+ "tmp.zig:2:14: error: expected type 'f32', found 'f64'",
);
cases.add(
@@ -522,28 +638,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: i65536 = 1;
\\}
,
- ".tmp_source.zig:2:31: error: integer value 65536 cannot be implicitly casted to type 'u16'",
- ".tmp_source.zig:5:12: error: primitive integer type 'i65536' exceeds maximum bit width of 65535",
- );
-
- cases.add(
- "wrong panic signature, runtime function",
- \\test "" {}
- \\
- \\pub fn panic() void {}
- \\
- ,
- ".tmp_source.zig:3:5: error: expected type 'fn([]const u8, ?*StackTrace) noreturn', found 'fn() void'",
- );
-
- cases.add(
- "wrong panic signature, generic function",
- \\pub fn panic(comptime msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn {
- \\ while (true) {}
- \\}
- ,
- ".tmp_source.zig:1:5: error: expected type 'fn([]const u8, ?*StackTrace) noreturn', found 'fn([]const u8,var)var'",
- ".tmp_source.zig:1:5: note: only one of the functions is generic",
+ "tmp.zig:2:31: error: integer value 65536 cannot be implicitly casted to type 'u16'",
+ "tmp.zig:5:12: error: primitive integer type 'i65536' exceeds maximum bit width of 65535",
);
cases.add(
@@ -556,7 +652,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const car = Car.init();
\\}
,
- ".tmp_source.zig:2:11: error: use of undeclared identifier 'SymbolThatDoesNotExist'",
+ "tmp.zig:2:11: error: use of undeclared identifier 'SymbolThatDoesNotExist'",
);
cases.add(
@@ -568,7 +664,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var ptr2: *c_void = &b;
\\}
,
- ".tmp_source.zig:5:26: error: expected type '*c_void', found '**u32'",
+ "tmp.zig:5:26: error: expected type '*c_void', found '**u32'",
);
cases.add(
@@ -584,7 +680,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const field = @typeInfo(Struct).Struct.fields[index];
\\}
,
- ".tmp_source.zig:9:51: error: values of type 'StructField' must be comptime known, but index value is runtime known",
+ "tmp.zig:9:51: error: values of type 'builtin.StructField' must be comptime known, but index value is runtime known",
);
cases.add(
@@ -598,7 +694,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @typeName(Foo(i32));
\\}
,
- ".tmp_source.zig:2:5: error: found compile log statement",
+ "tmp.zig:2:5: error: found compile log statement",
);
cases.add(
@@ -608,7 +704,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var b = a[0..10];
\\}
,
- ".tmp_source.zig:3:14: error: slice of undefined",
+ "tmp.zig:3:14: error: slice of undefined",
);
cases.add(
@@ -618,7 +714,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const sliceA: []u8 = &buffer;
\\}
,
- ".tmp_source.zig:3:27: error: expected type '[]u8', found '*const [1]u8'",
+ "tmp.zig:3:27: error: expected type '[]u8', found '*const [1]u8'",
);
cases.add(
@@ -628,7 +724,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a.*.len;
\\}
,
- ".tmp_source.zig:3:10: error: attempt to dereference non-pointer type '[]u8'",
+ "tmp.zig:3:10: error: attempt to dereference non-pointer type '[]u8'",
);
cases.add(
@@ -639,9 +735,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return p == null;
\\}
,
- ".tmp_source.zig:3:15: error: '*u0' and '?*u0' do not have the same in-memory representation",
- ".tmp_source.zig:3:31: note: '*u0' has no in-memory bits",
- ".tmp_source.zig:3:24: note: '?*u0' has in-memory bits",
+ "tmp.zig:3:15: error: '*u0' and '?*u0' do not have the same in-memory representation",
+ "tmp.zig:3:31: note: '*u0' has no in-memory bits",
+ "tmp.zig:3:24: note: '?*u0' has in-memory bits",
);
cases.add(
@@ -651,7 +747,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = &x == null;
\\}
,
- ".tmp_source.zig:3:12: error: comparison against null can only be done with optionals",
+ "tmp.zig:3:12: error: comparison against null can only be done with optionals",
);
cases.add(
@@ -663,10 +759,10 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const Errors = error{} || u16;
\\}
,
- ".tmp_source.zig:2:20: error: expected error set type, found type 'u8'",
- ".tmp_source.zig:2:23: note: `||` merges error sets; `or` performs boolean OR",
- ".tmp_source.zig:5:31: error: expected error set type, found type 'u16'",
- ".tmp_source.zig:5:28: note: `||` merges error sets; `or` performs boolean OR",
+ "tmp.zig:2:20: error: expected error set type, found type 'u8'",
+ "tmp.zig:2:23: note: `||` merges error sets; `or` performs boolean OR",
+ "tmp.zig:5:31: error: expected error set type, found type 'u16'",
+ "tmp.zig:5:28: note: `||` merges error sets; `or` performs boolean OR",
);
cases.add(
@@ -684,7 +780,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const S = Gen();
\\}
,
- ".tmp_source.zig:2:12: error: use of undeclared identifier 'T'",
+ "tmp.zig:2:12: error: use of undeclared identifier 'T'",
);
cases.add(
@@ -695,7 +791,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ f(i32);
\\}
,
- ".tmp_source.zig:4:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:4:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -713,9 +809,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = func(3);
\\}
,
- ".tmp_source.zig:4:24: error: 'y' not accessible from inner function",
- ".tmp_source.zig:3:28: note: crossed function definition here",
- ".tmp_source.zig:1:10: note: declared here",
+ "tmp.zig:4:24: error: 'y' not accessible from inner function",
+ "tmp.zig:3:28: note: crossed function definition here",
+ "tmp.zig:1:10: note: declared here",
);
cases.add(
@@ -724,7 +820,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @intToFloat(f32, 1.1);
\\}
,
- ".tmp_source.zig:2:32: error: expected int type, found 'comptime_float'",
+ "tmp.zig:2:32: error: expected int type, found 'comptime_float'",
);
cases.add(
@@ -733,7 +829,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @floatToInt(i32, i32(54));
\\}
,
- ".tmp_source.zig:2:35: error: expected float type, found 'i32'",
+ "tmp.zig:2:35: error: expected float type, found 'i32'",
);
cases.add(
@@ -742,7 +838,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @floatToInt(i8, 200);
\\}
,
- ".tmp_source.zig:2:31: error: integer value 200 cannot be implicitly casted to type 'i8'",
+ "tmp.zig:2:31: error: integer value 200 cannot be implicitly casted to type 'i8'",
);
cases.add(
@@ -754,7 +850,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const int_val = int_ptr.*;
\\}
,
- ".tmp_source.zig:5:28: error: attempt to read 8 bytes from pointer to f32 which is 4 bytes",
+ "tmp.zig:5:28: error: attempt to read 8 bytes from pointer to f32 which is 4 bytes",
);
cases.add(
@@ -767,7 +863,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a = items[0];
\\}
,
- ".tmp_source.zig:2:12: error: use of undeclared identifier 'SomeNonexistentType'",
+ "tmp.zig:2:12: error: use of undeclared identifier 'SomeNonexistentType'",
);
cases.add(
@@ -778,7 +874,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @noInlineCall(foo);
\\}
,
- ".tmp_source.zig:4:5: error: no-inline call of inline function",
+ "tmp.zig:4:5: error: no-inline call of inline function",
);
cases.add(
@@ -795,8 +891,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:6:19: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:6:19: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -812,8 +908,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:6:13: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:6:13: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -827,8 +923,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:23: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:5:23: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -842,8 +938,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:25: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:5:25: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -857,8 +953,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:20: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:5:20: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -872,8 +968,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:20: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:5:20: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -887,8 +983,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:22: error: comptime control flow inside runtime block",
- ".tmp_source.zig:5:9: note: runtime block created here",
+ "tmp.zig:5:22: error: comptime control flow inside runtime block",
+ "tmp.zig:5:9: note: runtime block created here",
);
cases.add(
@@ -904,7 +1000,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:7:17: error: switch on type 'type' provides no expression parameter",
+ "tmp.zig:7:17: error: switch on type 'type' provides no expression parameter",
);
cases.add(
@@ -914,24 +1010,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foo();
\\}
,
- ".tmp_source.zig:1:1: error: non-extern function has no body",
- );
-
- cases.add(
- "@typeInfo causing depend on itself compile error",
- \\const start = struct {
- \\ fn crash() bug() {
- \\ return bug;
- \\ }
- \\};
- \\fn bug() void {
- \\ _ = @typeInfo(start).Struct;
- \\}
- \\export fn entry() void {
- \\ var boom = start.crash();
- \\}
- ,
- ".tmp_source.zig:2:5: error: 'crash' depends on itself",
+ "tmp.zig:1:1: error: non-extern function has no body",
);
cases.add(
@@ -942,7 +1021,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return handle_undef == handle_dummy;
\\}
,
- ".tmp_source.zig:2:29: error: @handle() called outside of function definition",
+ "tmp.zig:2:29: error: @handle() called outside of function definition",
);
cases.add(
@@ -952,7 +1031,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return handle_undef == @handle();
\\}
,
- ".tmp_source.zig:3:28: error: @handle() in non-async function",
+ "tmp.zig:3:28: error: @handle() in non-async function",
);
cases.add(
@@ -962,8 +1041,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return _;
\\}
,
- ".tmp_source.zig:2:5: error: `_` is not a declarable symbol",
- ".tmp_source.zig:3:12: error: use of undeclared identifier '_'",
+ "tmp.zig:2:5: error: `_` is not a declarable symbol",
+ "tmp.zig:3:12: error: use of undeclared identifier '_'",
);
cases.add(
@@ -976,7 +1055,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:4:20: error: use of undeclared identifier '_'",
+ "tmp.zig:4:20: error: use of undeclared identifier '_'",
);
cases.add(
@@ -992,7 +1071,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 1;
\\}
,
- ".tmp_source.zig:4:20: error: use of undeclared identifier '_'",
+ "tmp.zig:4:20: error: use of undeclared identifier '_'",
);
cases.add(
@@ -1010,7 +1089,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return error.optionalReturnError;
\\}
,
- ".tmp_source.zig:6:17: error: use of undeclared identifier '_'",
+ "tmp.zig:6:17: error: use of undeclared identifier '_'",
);
cases.add(
@@ -1030,9 +1109,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ while (x) |_| returns() else |_| unreachable;
\\}
,
- ".tmp_source.zig:5:25: error: expression value is ignored",
- ".tmp_source.zig:9:26: error: expression value is ignored",
- ".tmp_source.zig:13:26: error: expression value is ignored",
+ "tmp.zig:5:25: error: expression value is ignored",
+ "tmp.zig:9:26: error: expression value is ignored",
+ "tmp.zig:13:26: error: expression value is ignored",
);
cases.add(
@@ -1043,7 +1122,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ dump(a);
\\}
,
- ".tmp_source.zig:1:9: error: missing parameter name",
+ "tmp.zig:1:9: error: missing parameter name",
);
cases.add(
@@ -1057,7 +1136,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ for (xx) |f| {}
\\}
,
- ".tmp_source.zig:7:15: error: variable of type 'Foo' must be const or comptime",
+ "tmp.zig:7:15: error: variable of type 'Foo' must be const or comptime",
);
cases.add(
@@ -1068,7 +1147,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ f(g);
\\}
,
- ".tmp_source.zig:1:9: error: parameter of type 'fn(var)var' must be declared comptime",
+ "tmp.zig:1:9: error: parameter of type 'fn(var)var' must be declared comptime",
);
cases.add(
@@ -1082,7 +1161,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\};
\\export fn entry(bar: *Bar) void {}
,
- ".tmp_source.zig:2:5: error: extern structs cannot contain fields of type '?*const void'",
+ "tmp.zig:2:5: error: extern structs cannot contain fields of type '?*const void'",
);
cases.add(
@@ -1095,7 +1174,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ command.exec();
\\}
,
- ".tmp_source.zig:6:12: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:6:12: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -1108,7 +1187,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ command.exec();
\\}
,
- ".tmp_source.zig:6:12: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:6:12: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -1118,7 +1197,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const aligned = @alignCast(4, ptr);
\\}
,
- ".tmp_source.zig:3:35: error: pointer address 0x1 is not aligned to 4 bytes",
+ "tmp.zig:3:35: error: pointer address 0x1 is not aligned to 4 bytes",
);
cases.add(
@@ -1127,7 +1206,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @ptrToInt(&{}) == @ptrToInt(&{});
\\}
,
- ".tmp_source.zig:2:23: error: pointer to size 0 type has no address",
+ "tmp.zig:2:23: error: pointer to size 0 type has no address",
);
cases.add(
@@ -1136,7 +1215,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @popCount(x);
\\}
,
- ".tmp_source.zig:2:22: error: expected integer type, found 'f32'",
+ "tmp.zig:2:22: error: expected integer type, found 'f32'",
);
cases.add(
@@ -1145,7 +1224,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @popCount(-1);
\\}
,
- ".tmp_source.zig:2:9: error: @popCount on negative comptime_int value -1",
+ "tmp.zig:2:9: error: @popCount on negative comptime_int value -1",
);
cases.addCase(x: {
@@ -1161,10 +1240,10 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\fn bar(x: *b.Foo) void {}
,
- ".tmp_source.zig:6:10: error: expected type '*Foo', found '*Foo'",
- ".tmp_source.zig:6:10: note: pointer type child 'Foo' cannot cast into pointer type child 'Foo'",
- "a.zig:1:17: note: Foo declared here",
- "b.zig:1:17: note: Foo declared here",
+ "tmp.zig:6:10: error: expected type '*b.Foo', found '*a.Foo'",
+ "tmp.zig:6:10: note: pointer type child 'a.Foo' cannot cast into pointer type child 'b.Foo'",
+ "a.zig:1:17: note: a.Foo declared here",
+ "b.zig:1:17: note: b.Foo declared here",
);
tc.addSourceFile("a.zig",
@@ -1182,19 +1261,6 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
break :x tc;
});
- cases.add(
- "enum field value references enum",
- \\pub const Foo = extern enum {
- \\ A = Foo.B,
- \\ C = D,
- \\};
- \\export fn entry() void {
- \\ var s: Foo = Foo.E;
- \\}
- ,
- ".tmp_source.zig:1:17: error: 'Foo' depends on itself",
- );
-
cases.add(
"@floatToInt comptime safety",
\\comptime {
@@ -1207,9 +1273,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @floatToInt(u8, f32(256.1));
\\}
,
- ".tmp_source.zig:2:9: error: integer value '-129' cannot be stored in type 'i8'",
- ".tmp_source.zig:5:9: error: integer value '-1' cannot be stored in type 'u8'",
- ".tmp_source.zig:8:9: error: integer value '256' cannot be stored in type 'u8'",
+ "tmp.zig:2:9: error: integer value '-129' cannot be stored in type 'i8'",
+ "tmp.zig:5:9: error: integer value '-1' cannot be stored in type 'u8'",
+ "tmp.zig:8:9: error: integer value '256' cannot be stored in type 'u8'",
);
cases.add(
@@ -1218,7 +1284,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: fn () c_void = undefined;
\\}
,
- ".tmp_source.zig:2:20: error: return type cannot be opaque",
+ "tmp.zig:2:20: error: return type cannot be opaque",
);
cases.add(
@@ -1231,7 +1297,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y = p.*;
\\}
,
- ".tmp_source.zig:4:23: error: expected type '*?*i32', found '**i32'",
+ "tmp.zig:4:23: error: expected type '*?*i32', found '**i32'",
);
cases.add(
@@ -1240,7 +1306,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x: [*]const bool = true;
\\}
,
- ".tmp_source.zig:2:30: error: expected type '[*]const bool', found 'bool'",
+ "tmp.zig:2:30: error: expected type '[*]const bool', found 'bool'",
);
cases.add(
@@ -1249,7 +1315,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x.*;
\\}
,
- ".tmp_source.zig:2:13: error: index syntax required for unknown-length pointer type '[*]i32'",
+ "tmp.zig:2:13: error: index syntax required for unknown-length pointer type '[*]i32'",
);
cases.add(
@@ -1262,14 +1328,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foo.a += 1;
\\}
,
- ".tmp_source.zig:6:8: error: type '[*]Foo' does not support field access",
+ "tmp.zig:6:8: error: type '[*]Foo' does not support field access",
);
cases.add(
"unknown length pointer to opaque",
\\export const T = [*]@OpaqueType();
,
- ".tmp_source.zig:1:18: error: unknown-length pointer to opaque",
+ "tmp.zig:1:18: error: unknown-length pointer to opaque",
);
cases.add(
@@ -1285,7 +1351,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var rule_set = try Foo.init();
\\}
,
- ".tmp_source.zig:2:13: error: expected type 'i32', found 'type'",
+ "tmp.zig:2:13: error: expected type 'i32', found 'type'",
);
cases.add(
@@ -1294,7 +1360,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const slice = ptr[0..2];
\\}
,
- ".tmp_source.zig:2:22: error: slice of single-item pointer",
+ "tmp.zig:2:22: error: slice of single-item pointer",
);
cases.add(
@@ -1303,7 +1369,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return ptr[1];
\\}
,
- ".tmp_source.zig:2:15: error: index of single-item pointer",
+ "tmp.zig:2:15: error: index of single-item pointer",
);
cases.add(
@@ -1319,10 +1385,10 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return null;
\\}
,
- ".tmp_source.zig:5:34: error: expected type '?NextError!i32', found '?OtherError!i32'",
- ".tmp_source.zig:5:34: note: optional type child 'OtherError!i32' cannot cast into optional type child 'NextError!i32'",
- ".tmp_source.zig:5:34: note: error set 'OtherError' cannot cast into error set 'NextError'",
- ".tmp_source.zig:2:26: note: 'error.OutOfMemory' not a member of destination error set",
+ "tmp.zig:5:34: error: expected type '?NextError!i32', found '?OtherError!i32'",
+ "tmp.zig:5:34: note: optional type child 'OtherError!i32' cannot cast into optional type child 'NextError!i32'",
+ "tmp.zig:5:34: note: error set 'OtherError' cannot cast into error set 'NextError'",
+ "tmp.zig:2:26: note: 'error.OutOfMemory' not a member of destination error set",
);
cases.add(
@@ -1339,14 +1405,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ Filled,
\\};
,
- ".tmp_source.zig:3:17: error: attempt to dereference non-pointer type 'Tile'",
+ "tmp.zig:3:17: error: attempt to dereference non-pointer type 'Tile'",
);
cases.add(
"invalid field access in comptime",
\\comptime { var x = doesnt_exist.whatever; }
,
- ".tmp_source.zig:1:20: error: use of undeclared identifier 'doesnt_exist'",
+ "tmp.zig:1:20: error: use of undeclared identifier 'doesnt_exist'",
);
cases.add(
@@ -1367,8 +1433,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:12:9: error: cannot suspend inside suspend block",
- ".tmp_source.zig:11:5: note: other suspend block here",
+ "tmp.zig:12:9: error: cannot suspend inside suspend block",
+ "tmp.zig:11:5: note: other suspend block here",
);
cases.add(
@@ -1378,8 +1444,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\inline fn b() void { }
,
- ".tmp_source.zig:2:5: error: functions marked inline must be stored in const or comptime var",
- ".tmp_source.zig:4:1: note: declared here",
+ "tmp.zig:2:5: error: functions marked inline must be stored in const or comptime var",
+ "tmp.zig:4:1: note: declared here",
);
cases.add(
@@ -1389,7 +1455,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @panic(e);
\\}
,
- ".tmp_source.zig:3:12: error: expected type '[]const u8', found 'error{Foo}'",
+ "tmp.zig:3:12: error: expected type '[]const u8', found 'error{Foo}'",
);
cases.add(
@@ -1403,8 +1469,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var tagName = @tagName(fi);
\\}
,
- ".tmp_source.zig:7:19: error: union has no associated enum",
- ".tmp_source.zig:1:18: note: declared here",
+ "tmp.zig:7:19: error: union has no associated enum",
+ "tmp.zig:1:18: note: declared here",
);
cases.add(
@@ -1417,7 +1483,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return error.ShouldBeCompileError;
\\}
,
- ".tmp_source.zig:6:17: error: expected type 'void', found 'error{ShouldBeCompileError}'",
+ "tmp.zig:6:17: error: expected type 'void', found 'error{ShouldBeCompileError}'",
);
cases.add(
@@ -1426,7 +1492,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var s = (struct{v: var}){.v=i32(10)};
\\}
,
- ".tmp_source.zig:2:23: error: invalid token: 'var'",
+ "tmp.zig:2:23: error: invalid token: 'var'",
);
cases.add(
@@ -1436,7 +1502,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const y = @ptrCast(*i32, &x);
\\}
,
- ".tmp_source.zig:3:15: error: cast discards const qualifier",
+ "tmp.zig:3:15: error: cast discards const qualifier",
);
cases.add(
@@ -1445,7 +1511,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const slice = ([*]i32)(undefined)[0..1];
\\}
,
- ".tmp_source.zig:2:38: error: non-zero length slice of undefined pointer",
+ "tmp.zig:2:38: error: non-zero length slice of undefined pointer",
);
cases.add(
@@ -1460,7 +1526,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a(c);
\\}
,
- ".tmp_source.zig:8:7: error: expected type 'fn(*const u8) void', found 'fn(u8) void'",
+ "tmp.zig:8:7: error: expected type 'fn(*const u8) void', found 'fn(u8) void'",
);
cases.add(
@@ -1474,7 +1540,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:5: error: else prong required when switching on type 'anyerror'",
+ "tmp.zig:5:5: error: else prong required when switching on type 'anyerror'",
);
cases.add(
@@ -1485,7 +1551,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn foo() !void {
\\}
,
- ".tmp_source.zig:4:11: error: function with inferred error set must return at least one possible error",
+ "tmp.zig:4:11: error: function with inferred error set must return at least one possible error",
);
cases.add(
@@ -1504,8 +1570,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:2:26: error: error.Baz not handled in switch",
- ".tmp_source.zig:2:26: error: error.Bar not handled in switch",
+ "tmp.zig:2:26: error: error.Baz not handled in switch",
+ "tmp.zig:2:26: error: error.Bar not handled in switch",
);
cases.add(
@@ -1526,8 +1592,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:14: error: duplicate switch value: '@typeOf(foo).ReturnType.ErrorSet.Foo'",
- ".tmp_source.zig:3:14: note: other value is here",
+ "tmp.zig:5:14: error: duplicate switch value: '@typeOf(foo).ReturnType.ErrorSet.Foo'",
+ "tmp.zig:3:14: note: other value is here",
);
cases.add("invalid cast from integral type to enum",
@@ -1542,7 +1608,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ E.One => {},
\\ }
\\}
- , ".tmp_source.zig:9:10: error: expected type 'usize', found 'E'");
+ , "tmp.zig:9:10: error: expected type 'usize', found 'E'");
cases.add(
"range operator in switch used on error set",
@@ -1560,7 +1626,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:3:17: error: operator not allowed for errors",
+ "tmp.zig:3:17: error: operator not allowed for errors",
);
cases.add(
@@ -1569,7 +1635,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const z: ?fn()!void = null;
\\}
,
- ".tmp_source.zig:2:15: error: inferring error set of return type valid only for function definitions",
+ "tmp.zig:2:15: error: inferring error set of return type valid only for function definitions",
);
cases.add(
@@ -1579,7 +1645,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const z = Foo.Bar;
\\}
,
- ".tmp_source.zig:3:18: error: no error named 'Bar' in 'Foo'",
+ "tmp.zig:3:18: error: no error named 'Bar' in 'Foo'",
);
cases.add(
@@ -1588,7 +1654,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const z = i32!i32;
\\}
,
- ".tmp_source.zig:2:15: error: expected error set type, found type 'i32'",
+ "tmp.zig:2:15: error: expected error set type, found type 'i32'",
);
cases.add(
@@ -1604,7 +1670,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:7:11: error: error sets 'Set1' and 'Set2' have no common errors",
+ "tmp.zig:7:11: error: error sets 'Set1' and 'Set2' have no common errors",
);
cases.add(
@@ -1613,7 +1679,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const z = error.A > error.B;
\\}
,
- ".tmp_source.zig:2:23: error: operator not allowed for errors",
+ "tmp.zig:2:23: error: operator not allowed for errors",
);
cases.add(
@@ -1625,7 +1691,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y = @errSetCast(Set2, x);
\\}
,
- ".tmp_source.zig:5:13: error: error.B not a member of error set 'Set2'",
+ "tmp.zig:5:13: error: error.B not a member of error set 'Set2'",
);
cases.add(
@@ -1638,9 +1704,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return error.B;
\\}
,
- ".tmp_source.zig:3:35: error: expected type 'SmallErrorSet!i32', found 'anyerror!i32'",
- ".tmp_source.zig:3:35: note: error set 'anyerror' cannot cast into error set 'SmallErrorSet'",
- ".tmp_source.zig:3:35: note: cannot cast global error set into smaller set",
+ "tmp.zig:3:35: error: expected type 'SmallErrorSet!i32', found 'anyerror!i32'",
+ "tmp.zig:3:35: note: error set 'anyerror' cannot cast into error set 'SmallErrorSet'",
+ "tmp.zig:3:35: note: cannot cast global error set into smaller set",
);
cases.add(
@@ -1653,10 +1719,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return error.B;
\\}
,
- ".tmp_source.zig:3:31: error: expected type 'SmallErrorSet', found 'anyerror'",
- ".tmp_source.zig:3:31: note: cannot cast global error set into smaller set",
+ "tmp.zig:3:31: error: expected type 'SmallErrorSet', found 'anyerror'",
+ "tmp.zig:3:31: note: cannot cast global error set into smaller set",
);
-
cases.add(
"recursive inferred error set",
\\export fn entry() void {
@@ -1666,7 +1731,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ try foo();
\\}
,
- ".tmp_source.zig:5:5: error: cannot resolve inferred error set '@typeOf(foo).ReturnType.ErrorSet': function 'foo' not fully analyzed yet",
+ "tmp.zig:5:5: error: cannot resolve inferred error set '@typeOf(foo).ReturnType.ErrorSet': function 'foo' not fully analyzed yet",
);
cases.add(
@@ -1680,8 +1745,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: Set2 = set1;
\\}
,
- ".tmp_source.zig:7:19: error: expected type 'Set2', found 'Set1'",
- ".tmp_source.zig:1:23: note: 'error.B' not a member of destination error set",
+ "tmp.zig:7:19: error: expected type 'Set2', found 'Set1'",
+ "tmp.zig:1:23: note: 'error.B' not a member of destination error set",
);
cases.add(
@@ -1695,7 +1760,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y = @intToError(x);
\\}
,
- ".tmp_source.zig:7:13: error: integer value 3 represents no error",
+ "tmp.zig:7:13: error: integer value 3 represents no error",
);
cases.add(
@@ -1713,7 +1778,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y = @errSetCast(Set2, @intToError(x));
\\}
,
- ".tmp_source.zig:11:13: error: error.B not a member of error set 'Set2'",
+ "tmp.zig:11:13: error: error.B not a member of error set 'Set2'",
);
cases.add(
@@ -1722,7 +1787,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @memberCount(anyerror);
\\}
,
- ".tmp_source.zig:2:9: error: global error set member count not available at comptime",
+ "tmp.zig:2:9: error: global error set member count not available at comptime",
);
cases.add(
@@ -1735,8 +1800,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: Foo = undefined;
\\}
,
- ".tmp_source.zig:3:5: error: duplicate error: 'Bar'",
- ".tmp_source.zig:2:5: note: other error here",
+ "tmp.zig:3:5: error: duplicate error: 'Bar'",
+ "tmp.zig:2:5: note: other error here",
);
cases.add(
@@ -1745,7 +1810,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = usize(-10);
\\}
,
- ".tmp_source.zig:2:21: error: cannot cast negative value -10 to unsigned integer type 'usize'",
+ "tmp.zig:2:21: error: cannot cast negative value -10 to unsigned integer type 'usize'",
);
cases.add(
@@ -1755,7 +1820,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var arr: [v]u8 = undefined;
\\}
,
- ".tmp_source.zig:1:1: error: unable to infer variable type",
+ "tmp.zig:1:1: error: unable to infer variable type",
);
cases.add(
@@ -1768,8 +1833,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: Foo = undefined;
\\}
,
- ".tmp_source.zig:3:5: error: duplicate struct field: 'Bar'",
- ".tmp_source.zig:2:5: note: other field here",
+ "tmp.zig:3:5: error: duplicate struct field: 'Bar'",
+ "tmp.zig:2:5: note: other field here",
);
cases.add(
@@ -1782,8 +1847,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: Foo = undefined;
\\}
,
- ".tmp_source.zig:3:5: error: duplicate union field: 'Bar'",
- ".tmp_source.zig:2:5: note: other field here",
+ "tmp.zig:3:5: error: duplicate union field: 'Bar'",
+ "tmp.zig:2:5: note: other field here",
);
cases.add(
@@ -1797,8 +1862,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: Foo = undefined;
\\}
,
- ".tmp_source.zig:3:5: error: duplicate enum field: 'Bar'",
- ".tmp_source.zig:2:5: note: other field here",
+ "tmp.zig:3:5: error: duplicate enum field: 'Bar'",
+ "tmp.zig:2:5: note: other field here",
);
cases.add(
@@ -1808,15 +1873,15 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\nakedcc fn foo() void { }
,
- ".tmp_source.zig:2:5: error: unable to call function with naked calling convention",
- ".tmp_source.zig:4:1: note: declared here",
+ "tmp.zig:2:5: error: unable to call function with naked calling convention",
+ "tmp.zig:4:1: note: declared here",
);
cases.add(
"function with invalid return type",
\\export fn foo() boid {}
,
- ".tmp_source.zig:1:17: error: use of undeclared identifier 'boid'",
+ "tmp.zig:1:17: error: use of undeclared identifier 'boid'",
);
cases.add(
@@ -1824,7 +1889,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const Foo = enum { A, B, C };
\\export fn entry(foo: Foo) void { }
,
- ".tmp_source.zig:2:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
+ "tmp.zig:2:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -1836,7 +1901,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\};
\\export fn entry(foo: Foo) void { }
,
- ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
+ "tmp.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -1848,7 +1913,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\};
\\export fn entry(foo: Foo) void { }
,
- ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
+ "tmp.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -1860,7 +1925,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ switch (f) {}
\\}
,
- ".tmp_source.zig:5:5: error: enumeration value 'Foo.M' not handled in switch",
+ "tmp.zig:5:5: error: enumeration value 'Foo.M' not handled in switch",
);
cases.add(
@@ -1869,7 +1934,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = 1 >> -1;
\\}
,
- ".tmp_source.zig:2:18: error: shift by negative value -1",
+ "tmp.zig:2:18: error: shift by negative value -1",
);
cases.add(
@@ -1880,7 +1945,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:3:9: error: encountered @panic at compile-time",
+ "tmp.zig:3:9: error: encountered @panic at compile-time",
);
cases.add(
@@ -1910,7 +1975,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ bogus;
\\}
,
- ".tmp_source.zig:8:5: error: use of undeclared identifier 'bogus'",
+ "tmp.zig:8:5: error: use of undeclared identifier 'bogus'",
);
cases.add(
@@ -1923,7 +1988,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:4:13: error: label not found: 'outer'",
+ "tmp.zig:4:13: error: label not found: 'outer'",
);
cases.add(
@@ -1937,7 +2002,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:5:13: error: labeled loop not found: 'outer'",
+ "tmp.zig:5:13: error: labeled loop not found: 'outer'",
);
cases.add(
@@ -1950,8 +2015,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\extern fn bar(x: *void) void { }
,
- ".tmp_source.zig:1:30: error: parameter of type '*void' has 0 bits; not allowed in function with calling convention 'ccc'",
- ".tmp_source.zig:7:18: error: parameter of type '*void' has 0 bits; not allowed in function with calling convention 'ccc'",
+ "tmp.zig:1:30: error: parameter of type '*void' has 0 bits; not allowed in function with calling convention 'ccc'",
+ "tmp.zig:7:18: error: parameter of type '*void' has 0 bits; not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -1963,7 +2028,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -1975,7 +2040,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -1987,7 +2052,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -1999,7 +2064,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2011,7 +2076,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2023,7 +2088,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2035,7 +2100,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2047,7 +2112,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2059,7 +2124,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2071,7 +2136,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2083,7 +2148,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2095,7 +2160,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2107,7 +2172,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2119,7 +2184,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2131,7 +2196,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2143,7 +2208,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2155,7 +2220,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2167,7 +2232,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2179,7 +2244,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2191,7 +2256,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2203,7 +2268,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var bad = {};
\\}
,
- ".tmp_source.zig:5:5: error: expected token ';', found 'var'",
+ "tmp.zig:5:5: error: expected token ';', found 'var'",
);
cases.add(
@@ -2212,7 +2277,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn a() void {}
\\export fn entry() void { a(); }
,
- ".tmp_source.zig:2:1: error: redefinition of 'a'",
+ "tmp.zig:2:1: error: redefinition of 'a'",
);
cases.add(
@@ -2220,7 +2285,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn a() noreturn {return;}
\\export fn entry() void { a(); }
,
- ".tmp_source.zig:1:18: error: expected type 'noreturn', found 'void'",
+ "tmp.zig:1:18: error: expected type 'noreturn', found 'void'",
);
cases.add(
@@ -2228,7 +2293,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn a() i32 {}
\\export fn entry() void { _ = a(); }
,
- ".tmp_source.zig:1:12: error: expected type 'i32', found 'void'",
+ "tmp.zig:1:12: error: expected type 'i32', found 'void'",
);
cases.add(
@@ -2237,7 +2302,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ b();
\\}
,
- ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'",
+ "tmp.zig:2:5: error: use of undeclared identifier 'b'",
);
cases.add(
@@ -2247,7 +2312,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn b(a: i32, b: i32, c: i32) void { }
,
- ".tmp_source.zig:2:6: error: expected 3 arguments, found 1",
+ "tmp.zig:2:6: error: expected 3 arguments, found 1",
);
cases.add(
@@ -2255,7 +2320,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn a() bogus {}
\\export fn entry() void { _ = a(); }
,
- ".tmp_source.zig:1:8: error: use of undeclared identifier 'bogus'",
+ "tmp.zig:1:8: error: use of undeclared identifier 'bogus'",
);
cases.add(
@@ -2263,7 +2328,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn a() *noreturn {}
\\export fn entry() void { _ = a(); }
,
- ".tmp_source.zig:1:8: error: pointer to noreturn not allowed",
+ "tmp.zig:1:8: error: pointer to noreturn not allowed",
);
cases.add(
@@ -2275,7 +2340,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\fn b() void {}
,
- ".tmp_source.zig:3:5: error: unreachable code",
+ "tmp.zig:3:5: error: unreachable code",
);
cases.add(
@@ -2283,7 +2348,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const bogus = @import("bogus-does-not-exist.zig",);
\\export fn entry() void { bogus.bogo(); }
,
- ".tmp_source.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'",
+ "tmp.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'",
);
cases.add(
@@ -2294,8 +2359,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ c;
\\}
,
- ".tmp_source.zig:3:5: error: use of undeclared identifier 'b'",
- ".tmp_source.zig:4:5: error: use of undeclared identifier 'c'",
+ "tmp.zig:3:5: error: use of undeclared identifier 'b'",
+ "tmp.zig:4:5: error: use of undeclared identifier 'c'",
);
cases.add(
@@ -2304,7 +2369,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { f(1, 2); }
,
- ".tmp_source.zig:1:15: error: redeclaration of variable 'a'",
+ "tmp.zig:1:15: error: redeclaration of variable 'a'",
);
cases.add(
@@ -2314,7 +2379,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a = 0;
\\}
,
- ".tmp_source.zig:3:5: error: redeclaration of variable 'a'",
+ "tmp.zig:3:5: error: redeclaration of variable 'a'",
);
cases.add(
@@ -2324,7 +2389,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { f(1); }
,
- ".tmp_source.zig:2:5: error: redeclaration of variable 'a'",
+ "tmp.zig:2:5: error: redeclaration of variable 'a'",
);
cases.add(
@@ -2334,7 +2399,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return a;
\\}
,
- ".tmp_source.zig:3:12: error: expected type 'i32', found '[*]const u8'",
+ "tmp.zig:3:12: error: expected type 'i32', found '[*]const u8'",
);
cases.add(
@@ -2343,7 +2408,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ if (0) {}
\\}
,
- ".tmp_source.zig:2:9: error: expected type 'bool', found 'comptime_int'",
+ "tmp.zig:2:9: error: expected type 'bool', found 'comptime_int'",
);
cases.add(
@@ -2352,7 +2417,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a = return;
\\}
,
- ".tmp_source.zig:2:5: error: unreachable code",
+ "tmp.zig:2:5: error: unreachable code",
);
cases.add(
@@ -2361,7 +2426,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: noreturn = {};
\\}
,
- ".tmp_source.zig:2:14: error: variable of type 'noreturn' not allowed",
+ "tmp.zig:2:14: error: variable of type 'noreturn' not allowed",
);
cases.add(
@@ -2369,7 +2434,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn f(a: noreturn) void {}
\\export fn entry() void { f(); }
,
- ".tmp_source.zig:1:9: error: parameter of type 'noreturn' not allowed",
+ "tmp.zig:1:9: error: parameter of type 'noreturn' not allowed",
);
cases.add(
@@ -2378,7 +2443,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ 3 = 3;
\\}
,
- ".tmp_source.zig:2:7: error: cannot assign to constant",
+ "tmp.zig:2:7: error: cannot assign to constant",
);
cases.add(
@@ -2388,7 +2453,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a = 4;
\\}
,
- ".tmp_source.zig:3:7: error: cannot assign to constant",
+ "tmp.zig:3:7: error: cannot assign to constant",
);
cases.add(
@@ -2397,7 +2462,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ b = 3;
\\}
,
- ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'",
+ "tmp.zig:2:5: error: use of undeclared identifier 'b'",
);
cases.add(
@@ -2406,7 +2471,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ (const a = 0);
\\}
,
- ".tmp_source.zig:2:6: error: invalid token: 'const'",
+ "tmp.zig:2:6: error: invalid token: 'const'",
);
cases.add(
@@ -2415,7 +2480,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ i[i] = i[i];
\\}
,
- ".tmp_source.zig:2:5: error: use of undeclared identifier 'i'",
+ "tmp.zig:2:5: error: use of undeclared identifier 'i'",
);
cases.add(
@@ -2425,8 +2490,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ bad[bad] = bad[bad];
\\}
,
- ".tmp_source.zig:3:8: error: array access of non-array type 'bool'",
- ".tmp_source.zig:3:19: error: array access of non-array type 'bool'",
+ "tmp.zig:3:8: error: array access of non-array type 'bool'",
+ "tmp.zig:3:19: error: array access of non-array type 'bool'",
);
cases.add(
@@ -2437,8 +2502,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ array[bad] = array[bad];
\\}
,
- ".tmp_source.zig:4:11: error: expected type 'usize', found 'bool'",
- ".tmp_source.zig:4:24: error: expected type 'usize', found 'bool'",
+ "tmp.zig:4:11: error: expected type 'usize', found 'bool'",
+ "tmp.zig:4:24: error: expected type 'usize', found 'bool'",
);
cases.add(
@@ -2449,7 +2514,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { f(); }
,
- ".tmp_source.zig:3:7: error: cannot assign to constant",
+ "tmp.zig:3:7: error: cannot assign to constant",
);
cases.add(
@@ -2460,26 +2525,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { f(true); }
,
- ".tmp_source.zig:2:42: error: integer value 1 cannot be implicitly casted to type 'void'",
- ".tmp_source.zig:3:15: error: incompatible types: 'i32' and 'void'",
- );
-
- cases.add(
- "direct struct loop",
- \\const A = struct { a : A, };
- \\export fn entry() usize { return @sizeOf(A); }
- ,
- ".tmp_source.zig:1:11: error: struct 'A' contains itself",
- );
-
- cases.add(
- "indirect struct loop",
- \\const A = struct { b : B, };
- \\const B = struct { c : C, };
- \\const C = struct { a : A, };
- \\export fn entry() usize { return @sizeOf(A); }
- ,
- ".tmp_source.zig:1:11: error: struct 'A' contains itself",
+ "tmp.zig:2:42: error: integer value 1 cannot be implicitly casted to type 'void'",
+ "tmp.zig:3:15: error: incompatible types: 'i32' and 'void'",
);
cases.add(
@@ -2491,8 +2538,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const y = a.bar;
\\}
,
- ".tmp_source.zig:4:6: error: no member named 'foo' in struct 'A'",
- ".tmp_source.zig:5:16: error: no member named 'bar' in struct 'A'",
+ "tmp.zig:4:6: error: no member named 'foo' in struct 'A'",
+ "tmp.zig:5:16: error: no member named 'bar' in struct 'A'",
);
cases.add(
@@ -2500,7 +2547,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const A = struct { x : i32, };
\\const A = struct { y : i32, };
,
- ".tmp_source.zig:2:1: error: redefinition of 'A'",
+ "tmp.zig:2:1: error: redefinition of 'A'",
);
cases.add(
@@ -2508,7 +2555,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const A = enum {};
\\const A = enum {};
,
- ".tmp_source.zig:2:1: error: redefinition of 'A'",
+ "tmp.zig:2:1: error: redefinition of 'A'",
);
cases.add(
@@ -2516,8 +2563,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\var a : i32 = 1;
\\var a : i32 = 2;
,
- ".tmp_source.zig:2:1: error: redefinition of 'a'",
- ".tmp_source.zig:1:1: note: previous definition is here",
+ "tmp.zig:2:1: error: redefinition of 'a'",
+ "tmp.zig:1:1: note: previous definition is here",
);
cases.add(
@@ -2536,7 +2583,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:11:9: error: duplicate field",
+ "tmp.zig:11:9: error: duplicate field",
);
cases.add(
@@ -2555,7 +2602,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:9:17: error: missing field: 'x'",
+ "tmp.zig:9:17: error: missing field: 'x'",
);
cases.add(
@@ -2573,7 +2620,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:10:9: error: no member named 'foo' in struct 'A'",
+ "tmp.zig:10:9: error: no member named 'foo' in struct 'A'",
);
cases.add(
@@ -2582,7 +2629,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ break;
\\}
,
- ".tmp_source.zig:2:5: error: break expression outside loop",
+ "tmp.zig:2:5: error: break expression outside loop",
);
cases.add(
@@ -2591,7 +2638,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ continue;
\\}
,
- ".tmp_source.zig:2:5: error: continue expression outside loop",
+ "tmp.zig:2:5: error: continue expression outside loop",
);
cases.add(
@@ -2600,7 +2647,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ if (true) |x| { }
\\}
,
- ".tmp_source.zig:2:9: error: expected optional type, found 'bool'",
+ "tmp.zig:2:9: error: expected optional type, found 'bool'",
);
cases.add(
@@ -2610,7 +2657,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { _ = f(); }
,
- ".tmp_source.zig:2:15: error: unreachable code",
+ "tmp.zig:2:15: error: unreachable code",
);
cases.add(
@@ -2619,18 +2666,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() void { _ = f(); }
,
- ".tmp_source.zig:1:8: error: invalid builtin function: 'bogus'",
- );
-
- cases.add(
- "top level decl dependency loop",
- \\const a : @typeOf(b) = 0;
- \\const b : @typeOf(a) = 0;
- \\export fn entry() void {
- \\ const c = a + b;
- \\}
- ,
- ".tmp_source.zig:1:1: error: 'a' depends on itself",
+ "tmp.zig:1:8: error: invalid builtin function: 'bogus'",
);
cases.add(
@@ -2638,7 +2674,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn f(noalias x: i32) void {}
\\export fn entry() void { f(1234); }
,
- ".tmp_source.zig:1:6: error: noalias on non-pointer parameter",
+ "tmp.zig:1:6: error: noalias on non-pointer parameter",
);
cases.add(
@@ -2646,7 +2682,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const foo = []u16{.x = 1024,};
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:1:18: error: type '[]u16' does not support struct initialization syntax",
+ "tmp.zig:1:18: error: type '[]u16' does not support struct initialization syntax",
);
cases.add(
@@ -2656,7 +2692,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 1;
\\}
,
- ".tmp_source.zig:1:1: error: variable of type 'type' must be constant",
+ "tmp.zig:1:1: error: variable of type 'type' must be constant",
);
cases.add(
@@ -2672,10 +2708,10 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ f(1234);
\\}
,
- ".tmp_source.zig:4:6: error: redefinition of 'Foo'",
- ".tmp_source.zig:1:1: note: previous definition is here",
- ".tmp_source.zig:5:5: error: redefinition of 'Bar'",
- ".tmp_source.zig:2:1: note: previous definition is here",
+ "tmp.zig:4:6: error: redefinition of 'Foo'",
+ "tmp.zig:1:1: note: previous definition is here",
+ "tmp.zig:5:5: error: redefinition of 'Bar'",
+ "tmp.zig:2:1: note: previous definition is here",
);
cases.add(
@@ -2696,7 +2732,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:8:5: error: enumeration value 'Number.Four' not handled in switch",
+ "tmp.zig:8:5: error: enumeration value 'Number.Four' not handled in switch",
);
cases.add(
@@ -2719,8 +2755,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:13:15: error: duplicate switch value",
- ".tmp_source.zig:10:15: note: other value is here",
+ "tmp.zig:13:15: error: duplicate switch value",
+ "tmp.zig:10:15: note: other value is here",
);
cases.add(
@@ -2744,8 +2780,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:13:15: error: duplicate switch value",
- ".tmp_source.zig:10:15: note: other value is here",
+ "tmp.zig:13:15: error: duplicate switch value",
+ "tmp.zig:10:15: note: other value is here",
);
cases.add(
@@ -2761,7 +2797,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ f(1234);
\\}
,
- ".tmp_source.zig:5:9: error: multiple else prongs in switch expression",
+ "tmp.zig:5:9: error: multiple else prongs in switch expression",
);
cases.add(
@@ -2773,7 +2809,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:2:5: error: switch must handle all possibilities",
+ "tmp.zig:2:5: error: switch must handle all possibilities",
);
cases.add(
@@ -2788,8 +2824,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:6:9: error: duplicate switch value",
- ".tmp_source.zig:5:14: note: previous value is here",
+ "tmp.zig:6:9: error: duplicate switch value",
+ "tmp.zig:5:14: note: previous value is here",
);
cases.add(
@@ -2802,7 +2838,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const y: u8 = 100;
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:2:5: error: else prong required when switching on type '*u8'",
+ "tmp.zig:2:5: error: else prong required when switching on type '*u8'",
);
cases.add(
@@ -2811,7 +2847,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const x = foo();
\\export fn entry() i32 { return x; }
,
- ".tmp_source.zig:2:11: error: unable to evaluate constant expression",
+ "tmp.zig:2:11: error: unable to evaluate constant expression",
);
cases.add(
@@ -2822,7 +2858,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
,
- ".tmp_source.zig:3:11: error: expected array or C string literal, found 'usize'",
+ "tmp.zig:3:11: error: expected array or C string literal, found 'usize'",
);
cases.add(
@@ -2833,7 +2869,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\var s: [10]u8 = undefined;
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:2:12: error: unable to evaluate constant expression",
+ "tmp.zig:2:12: error: unable to evaluate constant expression",
);
cases.add(
@@ -2841,7 +2877,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const c = @cImport(@cInclude("bogus.h"));
\\export fn entry() usize { return @sizeOf(@typeOf(c.bogo)); }
,
- ".tmp_source.zig:1:11: error: C import failed",
+ "tmp.zig:1:11: error: C import failed",
".h:1:10: note: 'bogus.h' file not found",
);
@@ -2852,7 +2888,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn foo() *const i32 { return y; }
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:3:30: error: expected type '*const i32', found '*const comptime_int'",
+ "tmp.zig:3:30: error: expected type '*const i32', found '*const comptime_int'",
);
cases.add(
@@ -2860,7 +2896,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const x : u8 = 300;
\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
,
- ".tmp_source.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'",
+ "tmp.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'",
);
cases.add(
@@ -2871,8 +2907,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() u16 { return f(); }
,
- ".tmp_source.zig:3:14: error: RHS of shift is too large for LHS type",
- ".tmp_source.zig:3:17: note: value 8 cannot fit into type u3",
+ "tmp.zig:3:14: error: RHS of shift is too large for LHS type",
+ "tmp.zig:3:17: note: value 8 cannot fit into type u3",
);
cases.add(
@@ -2880,7 +2916,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const x = 2 == 2.0;
\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
,
- ".tmp_source.zig:1:11: error: integer value 2 cannot be implicitly casted to type 'comptime_float'",
+ "tmp.zig:1:11: error: integer value 2 cannot be implicitly casted to type 'comptime_float'",
);
cases.add(
@@ -2909,7 +2945,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:20:34: error: expected 1 arguments, found 0",
+ "tmp.zig:20:34: error: expected 1 arguments, found 0",
);
cases.add(
@@ -2918,8 +2954,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn f(i32) void {}
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:1:1: error: missing function name",
- ".tmp_source.zig:2:6: error: missing parameter name",
+ "tmp.zig:1:1: error: missing function name",
+ "tmp.zig:2:6: error: missing parameter name",
);
cases.add(
@@ -2930,7 +2966,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn c() i32 {return 2;}
\\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
,
- ".tmp_source.zig:1:27: error: expected type 'fn() void', found 'fn() i32'",
+ "tmp.zig:1:27: error: expected type 'fn() void', found 'fn() i32'",
);
cases.add(
@@ -2942,7 +2978,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
,
- ".tmp_source.zig:1:36: error: expected type 'fn(i32) i32', found 'extern fn(i32) i32'",
+ "tmp.zig:1:36: error: expected type 'fn(i32) i32', found 'extern fn(i32) i32'",
);
cases.add(
@@ -2951,16 +2987,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn func() bogus {}
\\export fn entry() usize { return @sizeOf(@typeOf(func)); }
,
- ".tmp_source.zig:2:1: error: redefinition of 'func'",
- ".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'",
- );
-
- cases.add(
- "bogus compile var",
- \\const x = @import("builtin").bogus;
- \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
- ,
- ".tmp_source.zig:1:29: error: no member named 'bogus' in '",
+ "tmp.zig:2:1: error: redefinition of 'func'",
+ "tmp.zig:1:11: error: use of undeclared identifier 'bogus'",
);
cases.add(
@@ -2973,9 +3001,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(Foo)); }
,
- ".tmp_source.zig:5:25: error: unable to evaluate constant expression",
- ".tmp_source.zig:2:12: note: called from here",
- ".tmp_source.zig:2:8: note: called from here",
+ "tmp.zig:5:25: error: unable to evaluate constant expression",
+ "tmp.zig:2:12: note: called from here",
+ "tmp.zig:2:8: note: called from here",
);
cases.add(
@@ -2987,7 +3015,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
,
- ".tmp_source.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'",
+ "tmp.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'",
);
cases.add(
@@ -3002,10 +3030,10 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\export fn entry3() usize { return @sizeOf(@typeOf(int_x)); }
\\export fn entry4() usize { return @sizeOf(@typeOf(float_x)); }
,
- ".tmp_source.zig:1:21: error: division by zero",
- ".tmp_source.zig:2:25: error: division by zero",
- ".tmp_source.zig:3:22: error: division by zero",
- ".tmp_source.zig:4:26: error: division by zero",
+ "tmp.zig:1:21: error: division by zero",
+ "tmp.zig:2:25: error: division by zero",
+ "tmp.zig:3:22: error: division by zero",
+ "tmp.zig:4:26: error: division by zero",
);
cases.add(
@@ -3015,7 +3043,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:1:15: error: newline not allowed in string literal",
+ "tmp.zig:1:15: error: newline not allowed in string literal",
);
cases.add(
@@ -3025,7 +3053,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(invalid)); }
,
- ".tmp_source.zig:2:21: error: operator not allowed for type 'fn() void'",
+ "tmp.zig:2:21: error: operator not allowed for type 'fn() void'",
);
cases.add(
@@ -3037,7 +3065,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(test1)); }
,
- ".tmp_source.zig:3:16: error: unable to evaluate constant expression",
+ "tmp.zig:3:16: error: unable to evaluate constant expression",
);
cases.add(
@@ -3046,7 +3074,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
,
- ".tmp_source.zig:1:16: error: expected type '*u8', found '(null)'",
+ "tmp.zig:1:16: error: expected type '*u8', found '(null)'",
);
cases.add(
@@ -3056,7 +3084,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const pointer = &array[0];
\\}
,
- ".tmp_source.zig:3:27: error: index 0 outside array of size 0",
+ "tmp.zig:3:27: error: index 0 outside array of size 0",
);
cases.add(
@@ -3068,8 +3096,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:3:14: error: division by zero",
- ".tmp_source.zig:1:14: note: called from here",
+ "tmp.zig:3:14: error: division by zero",
+ "tmp.zig:1:14: note: called from here",
);
cases.add(
@@ -3078,7 +3106,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
,
- ".tmp_source.zig:1:15: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:1:15: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3088,7 +3116,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a / a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3098,7 +3126,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a /= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3108,7 +3136,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a % a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3118,7 +3146,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a %= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3128,7 +3156,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a + a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3138,7 +3166,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a += a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3148,7 +3176,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a +% a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3158,7 +3186,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a +%= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3168,7 +3196,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a - a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3178,7 +3206,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a -= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3188,7 +3216,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a -% a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3198,7 +3226,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a -%= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3208,7 +3236,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a * a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3218,7 +3246,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a *= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3228,7 +3256,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a *% a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3238,7 +3266,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a *%= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3248,7 +3276,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a << 2;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3258,7 +3286,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a <<= 2;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3268,7 +3296,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a >> 2;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3278,7 +3306,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a >>= 2;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3288,7 +3316,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a & a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3298,7 +3326,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a &= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3308,7 +3336,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a | a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3318,7 +3346,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a |= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3328,7 +3356,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a ^ a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3338,7 +3366,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ a ^= a;
\\}
,
- ".tmp_source.zig:3:5: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:5: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3348,7 +3376,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a == a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3358,7 +3386,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a != a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3368,7 +3396,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a > a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3378,7 +3406,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a >= a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3388,7 +3416,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a < a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3398,7 +3426,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a <= a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3408,7 +3436,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a and a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3418,7 +3446,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a or a;
\\}
,
- ".tmp_source.zig:3:9: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:9: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3428,7 +3456,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = -a;
\\}
,
- ".tmp_source.zig:3:10: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:10: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3438,7 +3466,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = -%a;
\\}
,
- ".tmp_source.zig:3:11: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:11: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3448,7 +3476,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = ~a;
\\}
,
- ".tmp_source.zig:3:10: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:10: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3458,7 +3486,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = !a;
\\}
,
- ".tmp_source.zig:3:10: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:10: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3468,7 +3496,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a orelse false;
\\}
,
- ".tmp_source.zig:3:11: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:11: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3478,7 +3506,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a catch |err| false;
\\}
,
- ".tmp_source.zig:3:11: error: use of undefined value here causes undefined behavior",
+ "tmp.zig:3:11: error: use of undefined value here causes undefined behavior",
);
cases.add(
@@ -3488,7 +3516,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = a.*;
\\}
,
- ".tmp_source.zig:3:9: error: attempt to dereference undefined value",
+ "tmp.zig:3:9: error: attempt to dereference undefined value",
);
cases.add(
@@ -3500,8 +3528,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(seventh_fib_number)); }
,
- ".tmp_source.zig:3:21: error: evaluation exceeded 1000 backwards branches",
- ".tmp_source.zig:3:21: note: called from here",
+ "tmp.zig:3:21: error: evaluation exceeded 1000 backwards branches",
+ "tmp.zig:3:21: note: called from here",
);
cases.add(
@@ -3510,7 +3538,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(resource)); }
,
- ".tmp_source.zig:1:29: error: unable to find '",
+ "tmp.zig:1:29: error: unable to find '",
"bogus.txt'",
);
@@ -3524,7 +3552,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
,
- ".tmp_source.zig:4:21: error: unable to evaluate constant expression",
+ "tmp.zig:4:21: error: unable to evaluate constant expression",
);
cases.add(
@@ -3541,8 +3569,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
,
- ".tmp_source.zig:6:24: error: unable to evaluate constant expression",
- ".tmp_source.zig:4:17: note: called from here",
+ "tmp.zig:6:24: error: unable to evaluate constant expression",
+ "tmp.zig:4:17: note: called from here",
);
cases.add(
@@ -3554,7 +3582,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ bad_fn_call();
\\}
,
- ".tmp_source.zig:5:5: error: use of undeclared identifier 'bad_fn_call'",
+ "tmp.zig:5:5: error: use of undeclared identifier 'bad_fn_call'",
);
cases.add(
@@ -3573,8 +3601,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\export fn entry1() usize { return @sizeOf(@typeOf(bad_eql_1)); }
\\export fn entry2() usize { return @sizeOf(@typeOf(bad_eql_2)); }
,
- ".tmp_source.zig:2:14: error: operator not allowed for type '[]u8'",
- ".tmp_source.zig:9:16: error: operator not allowed for type 'EnumWithData'",
+ "tmp.zig:2:14: error: operator not allowed for type '[]u8'",
+ "tmp.zig:9:16: error: operator not allowed for type 'EnumWithData'",
);
cases.add(
@@ -3590,7 +3618,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 2;
\\}
,
- ".tmp_source.zig:2:15: error: values of type 'comptime_int' must be comptime known",
+ "tmp.zig:2:15: error: values of type 'comptime_int' must be comptime known",
);
cases.add(
@@ -3601,7 +3629,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, AtomicOrder.Monotonic, AtomicOrder.SeqCst)) {}
\\}
,
- ".tmp_source.zig:4:81: error: failure atomic ordering must be no stricter than success",
+ "tmp.zig:4:81: error: failure atomic ordering must be no stricter than success",
);
cases.add(
@@ -3612,7 +3640,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, AtomicOrder.Unordered, AtomicOrder.Unordered)) {}
\\}
,
- ".tmp_source.zig:4:58: error: success atomic ordering must be Monotonic or stricter",
+ "tmp.zig:4:58: error: success atomic ordering must be Monotonic or stricter",
);
cases.add(
@@ -3624,8 +3652,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:3:12: error: negation caused overflow",
- ".tmp_source.zig:1:14: note: called from here",
+ "tmp.zig:3:12: error: negation caused overflow",
+ "tmp.zig:1:14: note: called from here",
);
cases.add(
@@ -3637,8 +3665,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:3:14: error: operation caused overflow",
- ".tmp_source.zig:1:14: note: called from here",
+ "tmp.zig:3:14: error: operation caused overflow",
+ "tmp.zig:1:14: note: called from here",
);
cases.add(
@@ -3650,8 +3678,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:3:14: error: operation caused overflow",
- ".tmp_source.zig:1:14: note: called from here",
+ "tmp.zig:3:14: error: operation caused overflow",
+ "tmp.zig:1:14: note: called from here",
);
cases.add(
@@ -3663,8 +3691,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
,
- ".tmp_source.zig:3:14: error: operation caused overflow",
- ".tmp_source.zig:1:14: note: called from here",
+ "tmp.zig:3:14: error: operation caused overflow",
+ "tmp.zig:1:14: note: called from here",
);
cases.add(
@@ -3676,7 +3704,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:3:26: error: expected signed integer type, found 'u32'",
+ "tmp.zig:3:26: error: expected signed integer type, found 'u32'",
);
cases.add(
@@ -3686,8 +3714,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn something() anyerror!void { }
,
- ".tmp_source.zig:2:5: error: expected type 'void', found 'anyerror'",
- ".tmp_source.zig:1:15: note: return type declared here",
+ "tmp.zig:2:5: error: expected type 'void', found 'anyerror'",
+ "tmp.zig:1:15: note: return type declared here",
);
cases.add(
@@ -3700,7 +3728,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:2:13: error: unable to evaluate constant expression",
+ "tmp.zig:2:13: error: unable to evaluate constant expression",
);
cases.add(
@@ -3709,7 +3737,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x + y;
\\}
,
- ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
+ "tmp.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -3720,7 +3748,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
+ "tmp.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
);
cases.add(
@@ -3730,8 +3758,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var foo = @bytesToSlice(u32, array)[0];
\\}
,
- ".tmp_source.zig:3:15: error: unable to convert [5]u8 to []align(1) const u32: size mismatch",
- ".tmp_source.zig:3:29: note: u32 has size 4; remaining bytes: 1",
+ "tmp.zig:3:15: error: unable to convert [5]u8 to []align(1) const u32: size mismatch",
+ "tmp.zig:3:29: note: u32 has size 4; remaining bytes: 1",
);
cases.add(
@@ -3755,8 +3783,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ list.length = 10;
\\}
,
- ".tmp_source.zig:3:7: error: unable to evaluate constant expression",
- ".tmp_source.zig:16:19: note: called from here",
+ "tmp.zig:3:7: error: unable to evaluate constant expression",
+ "tmp.zig:16:19: note: called from here",
);
cases.add(
@@ -3767,7 +3795,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:3:6: error: no member named 'copy' in '[]const u8'",
+ "tmp.zig:3:6: error: no member named 'copy' in '[]const u8'",
);
cases.add(
@@ -3781,7 +3809,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
,
- ".tmp_source.zig:6:15: error: expected 2 arguments, found 3",
+ "tmp.zig:6:15: error: expected 2 arguments, found 3",
);
cases.add(
@@ -3791,7 +3819,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ cstr[0] = 'W';
\\}
,
- ".tmp_source.zig:3:11: error: cannot assign to constant",
+ "tmp.zig:3:11: error: cannot assign to constant",
);
cases.add(
@@ -3801,14 +3829,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ cstr[0] = 'W';
\\}
,
- ".tmp_source.zig:3:11: error: cannot assign to constant",
+ "tmp.zig:3:11: error: cannot assign to constant",
);
cases.add(
"main function with bogus args type",
\\pub fn main(args: [][]bogus) !void {}
,
- ".tmp_source.zig:1:23: error: use of undeclared identifier 'bogus'",
+ "tmp.zig:1:23: error: use of undeclared identifier 'bogus'",
);
cases.add(
@@ -3844,7 +3872,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:5:16: error: use of undeclared identifier 'JsonList'",
+ "tmp.zig:5:16: error: use of undeclared identifier 'JsonList'",
);
cases.add(
@@ -3865,7 +3893,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ derp.init();
\\}
,
- ".tmp_source.zig:14:5: error: expected type 'i32', found 'Foo'",
+ "tmp.zig:14:5: error: expected type 'i32', found 'Foo'",
);
cases.add(
@@ -3895,7 +3923,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ x.init();
\\}
,
- ".tmp_source.zig:23:5: error: expected type '*Allocator', found '*List'",
+ "tmp.zig:23:5: error: expected type '*Allocator', found '*List'",
);
cases.add(
@@ -3906,7 +3934,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(block_aligned_stuff)); }
,
- ".tmp_source.zig:3:60: error: unable to perform binary not operation on type 'comptime_int'",
+ "tmp.zig:3:60: error: unable to perform binary not operation on type 'comptime_int'",
);
cases.addCase(x: {
@@ -3918,7 +3946,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foo.privateFunction();
\\}
,
- ".tmp_source.zig:4:8: error: 'privateFunction' is private",
+ "tmp.zig:4:8: error: 'privateFunction' is private",
"foo.zig:1:1: note: declared here",
);
@@ -3936,7 +3964,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
,
- ".tmp_source.zig:2:11: error: expected type 'type', found 'i32'",
+ "tmp.zig:2:11: error: expected type 'type', found 'i32'",
);
cases.add(
@@ -3949,7 +3977,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ f.field = 0;
\\}
,
- ".tmp_source.zig:6:13: error: cannot assign to constant",
+ "tmp.zig:6:13: error: cannot assign to constant",
);
cases.add(
@@ -3970,7 +3998,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(testTrickyDefer)); }
,
- ".tmp_source.zig:4:11: error: cannot return from defer expression",
+ "tmp.zig:4:11: error: cannot return from defer expression",
);
cases.add(
@@ -3985,8 +4013,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:2:26: error: index 1 outside argument list of size 1",
- ".tmp_source.zig:6:15: note: called from here",
+ "tmp.zig:2:26: error: index 1 outside argument list of size 1",
+ "tmp.zig:6:15: note: called from here",
);
cases.add(
@@ -4005,7 +4033,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(bar)); }
,
- ".tmp_source.zig:10:16: error: compiler bug: integer and float literals in var args function must be casted",
+ "tmp.zig:10:16: error: compiler bug: integer and float literals in var args function must be casted",
);
cases.add(
@@ -4014,7 +4042,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var vga_mem: u16 = 0xB8000;
\\}
,
- ".tmp_source.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'",
+ "tmp.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'",
);
cases.add(
@@ -4022,7 +4050,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\const some_data: [100]u8 align(3) = undefined;
\\export fn entry() usize { return @sizeOf(@typeOf(some_data)); }
,
- ".tmp_source.zig:1:32: error: alignment value 3 is not a power of 2",
+ "tmp.zig:1:32: error: alignment value 3 is not a power of 2",
);
cases.add(
@@ -4030,7 +4058,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\extern fn foo() align(3) void;
\\export fn entry() void { return foo(); }
,
- ".tmp_source.zig:1:23: error: alignment value 3 is not a power of 2",
+ "tmp.zig:1:23: error: alignment value 3 is not a power of 2",
);
cases.add(
@@ -4044,9 +4072,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @compileLog("end",);
\\}
,
- ".tmp_source.zig:5:5: error: found compile log statement",
- ".tmp_source.zig:6:5: error: found compile log statement",
- ".tmp_source.zig:7:5: error: found compile log statement",
+ "tmp.zig:5:5: error: found compile log statement",
+ "tmp.zig:6:5: error: found compile log statement",
+ "tmp.zig:7:5: error: found compile log statement",
);
cases.add(
@@ -4067,7 +4095,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:8:26: error: expected type '*const u3', found '*align(:3:1) const u3'",
+ "tmp.zig:8:26: error: expected type '*const u3', found '*align(:3:1) const u3'",
);
cases.add(
@@ -4084,8 +4112,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ if (!ok) unreachable;
\\}
,
- ".tmp_source.zig:10:14: error: unable to evaluate constant expression",
- ".tmp_source.zig:6:20: note: called from here",
+ "tmp.zig:10:14: error: unable to evaluate constant expression",
+ "tmp.zig:6:20: note: called from here",
);
cases.add(
@@ -4099,8 +4127,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\fn bar() void { }
,
- ".tmp_source.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
- ".tmp_source.zig:3:24: note: compile-time variable assigned here",
+ "tmp.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
+ "tmp.zig:3:24: note: compile-time variable assigned here",
);
cases.add(
@@ -4110,7 +4138,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() i32 { return 0; }
,
- ".tmp_source.zig:2:8: error: expression value is ignored",
+ "tmp.zig:2:8: error: expression value is ignored",
);
cases.add(
@@ -4120,7 +4148,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() anyerror!i32 { return 0; }
,
- ".tmp_source.zig:2:11: error: expression value is ignored",
+ "tmp.zig:2:11: error: expression value is ignored",
);
cases.add(
@@ -4129,7 +4157,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ 1;
\\}
,
- ".tmp_source.zig:2:5: error: expression value is ignored",
+ "tmp.zig:2:5: error: expression value is ignored",
);
cases.add(
@@ -4138,7 +4166,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ comptime {1;}
\\}
,
- ".tmp_source.zig:2:15: error: expression value is ignored",
+ "tmp.zig:2:15: error: expression value is ignored",
);
cases.add(
@@ -4147,7 +4175,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ comptime 1;
\\}
,
- ".tmp_source.zig:2:5: error: expression value is ignored",
+ "tmp.zig:2:5: error: expression value is ignored",
);
cases.add(
@@ -4156,7 +4184,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ defer {1;}
\\}
,
- ".tmp_source.zig:2:12: error: expression value is ignored",
+ "tmp.zig:2:12: error: expression value is ignored",
);
cases.add(
@@ -4166,7 +4194,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() anyerror!i32 { return 0; }
,
- ".tmp_source.zig:2:14: error: expression value is ignored",
+ "tmp.zig:2:14: error: expression value is ignored",
);
cases.add(
@@ -4180,7 +4208,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(pass)); }
,
- ".tmp_source.zig:4:10: error: attempt to dereference non-pointer type '[10]u8'",
+ "tmp.zig:4:10: error: attempt to dereference non-pointer type '[10]u8'",
);
cases.add(
@@ -4196,7 +4224,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\
\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
,
- ".tmp_source.zig:4:19: error: expected type '*[]const u8', found '*const []const u8'",
+ "tmp.zig:4:19: error: expected type '*[]const u8', found '*const []const u8'",
);
cases.addCase(x: {
@@ -4209,7 +4237,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
,
"foo.zig:1:1: error: exported symbol collision: 'bar'",
- ".tmp_source.zig:3:1: note: other symbol here",
+ "tmp.zig:3:1: note: other symbol here",
);
tc.addSourceFile("foo.zig",
@@ -4228,7 +4256,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foo(global_array);
\\}
,
- ".tmp_source.zig:4:9: error: expected type '[]i32', found '[10]i32'",
+ "tmp.zig:4:9: error: expected type '[]i32', found '[10]i32'",
);
cases.add(
@@ -4237,7 +4265,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @ptrCast(usize, a);
\\}
,
- ".tmp_source.zig:2:21: error: expected pointer, found 'usize'",
+ "tmp.zig:2:21: error: expected pointer, found 'usize'",
);
cases.add(
@@ -4254,7 +4282,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ );
\\}
,
- ".tmp_source.zig:6:5: error: unable to evaluate constant expression",
+ "tmp.zig:6:5: error: unable to evaluate constant expression",
);
cases.add(
@@ -4264,7 +4292,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const foo = builtin.Arch.x86;
\\}
,
- ".tmp_source.zig:3:29: error: container 'Arch' has no member called 'x86'",
+ "tmp.zig:3:29: error: container 'builtin.Arch' has no member called 'x86'",
);
cases.add(
@@ -4274,7 +4302,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y: *void = @intToPtr(*void, x);
\\}
,
- ".tmp_source.zig:3:30: error: type '*void' has 0 bits and cannot store information",
+ "tmp.zig:3:30: error: type '*void' has 0 bits and cannot store information",
);
cases.add(
@@ -4284,7 +4312,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @fieldParentPtr(Foo, "a", a);
\\}
,
- ".tmp_source.zig:3:28: error: expected struct type, found 'i32'",
+ "tmp.zig:3:28: error: expected struct type, found 'i32'",
);
cases.add(
@@ -4296,7 +4324,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @fieldParentPtr(Foo, "a", a);
\\}
,
- ".tmp_source.zig:5:33: error: struct 'Foo' has no field 'a'",
+ "tmp.zig:5:33: error: struct 'Foo' has no field 'a'",
);
cases.add(
@@ -4308,7 +4336,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @fieldParentPtr(Foo, "a", a);
\\}
,
- ".tmp_source.zig:5:38: error: expected pointer, found 'i32'",
+ "tmp.zig:5:38: error: expected pointer, found 'i32'",
);
cases.add(
@@ -4324,7 +4352,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const another_foo_ptr = @fieldParentPtr(Foo, "b", field_ptr);
\\}
,
- ".tmp_source.zig:9:55: error: pointer value not based on parent struct",
+ "tmp.zig:9:55: error: pointer value not based on parent struct",
);
cases.add(
@@ -4339,7 +4367,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const another_foo_ptr = @fieldParentPtr(Foo, "b", &foo.a);
\\}
,
- ".tmp_source.zig:8:29: error: field 'b' has index 1 but pointer value is index 0 of struct 'Foo'",
+ "tmp.zig:8:29: error: field 'b' has index 1 but pointer value is index 0 of struct 'Foo'",
);
cases.add(
@@ -4349,7 +4377,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @byteOffsetOf(Foo, "a",);
\\}
,
- ".tmp_source.zig:3:26: error: expected struct type, found 'i32'",
+ "tmp.zig:3:26: error: expected struct type, found 'i32'",
);
cases.add(
@@ -4361,14 +4389,14 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @byteOffsetOf(Foo, "a",);
\\}
,
- ".tmp_source.zig:5:31: error: struct 'Foo' has no field 'a'",
+ "tmp.zig:5:31: error: struct 'Foo' has no field 'a'",
);
cases.addExe(
"missing main fn in executable",
\\
,
- "error: no member named 'main' in '",
+ "error: root source file has no member called 'main'",
);
cases.addExe(
@@ -4376,7 +4404,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\fn main() void {}
,
"error: 'main' is private",
- ".tmp_source.zig:1:1: note: declared here",
+ "tmp.zig:1:1: note: declared here",
);
cases.add(
@@ -4386,7 +4414,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return foo;
\\}
,
- ".tmp_source.zig:1:33: error: cannot set section of external variable 'foo'",
+ "tmp.zig:1:33: error: cannot set section of external variable 'foo'",
);
cases.add(
@@ -4396,7 +4424,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return foo;
\\}
,
- ".tmp_source.zig:2:30: error: cannot set section of local variable 'foo'",
+ "tmp.zig:2:30: error: cannot set section of local variable 'foo'",
);
cases.add(
@@ -4406,7 +4434,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foo();
\\}
,
- ".tmp_source.zig:1:29: error: cannot set section of external function 'foo'",
+ "tmp.zig:1:29: error: cannot set section of external function 'foo'",
);
cases.add(
@@ -4416,7 +4444,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return &a;
\\}
,
- ".tmp_source.zig:3:13: error: function returns address of local variable",
+ "tmp.zig:3:13: error: function returns address of local variable",
);
cases.add(
@@ -4427,7 +4455,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return if (c) &a else &b;
\\}
,
- ".tmp_source.zig:4:12: error: function returns address of local variable",
+ "tmp.zig:4:12: error: function returns address of local variable",
);
cases.add(
@@ -4452,8 +4480,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ if (!ok) unreachable;
\\}
,
- ".tmp_source.zig:9:17: error: redefinition of 'Self'",
- ".tmp_source.zig:5:9: note: previous definition is here",
+ "tmp.zig:9:17: error: redefinition of 'Self'",
+ "tmp.zig:5:9: note: previous definition is here",
);
cases.add(
@@ -4463,7 +4491,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() ?i32 { return 1; }
,
- ".tmp_source.zig:2:15: error: expected type 'bool', found '?i32'",
+ "tmp.zig:2:15: error: expected type 'bool', found '?i32'",
);
cases.add(
@@ -4473,7 +4501,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() anyerror!i32 { return 1; }
,
- ".tmp_source.zig:2:15: error: expected type 'bool', found 'anyerror!i32'",
+ "tmp.zig:2:15: error: expected type 'bool', found 'anyerror!i32'",
);
cases.add(
@@ -4483,7 +4511,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() bool { return true; }
,
- ".tmp_source.zig:2:15: error: expected optional type, found 'bool'",
+ "tmp.zig:2:15: error: expected optional type, found 'bool'",
);
cases.add(
@@ -4493,7 +4521,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() anyerror!i32 { return 1; }
,
- ".tmp_source.zig:2:15: error: expected optional type, found 'anyerror!i32'",
+ "tmp.zig:2:15: error: expected optional type, found 'anyerror!i32'",
);
cases.add(
@@ -4503,7 +4531,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() bool { return true; }
,
- ".tmp_source.zig:2:15: error: expected error union type, found 'bool'",
+ "tmp.zig:2:15: error: expected error union type, found 'bool'",
);
cases.add(
@@ -4513,7 +4541,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn bar() ?i32 { return 1; }
,
- ".tmp_source.zig:2:15: error: expected error union type, found '?i32'",
+ "tmp.zig:2:15: error: expected error union type, found '?i32'",
);
cases.add(
@@ -4531,7 +4559,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\extern fn quux() void;
,
- ".tmp_source.zig:4:1: error: unable to inline function",
+ "tmp.zig:4:1: error: unable to inline function",
);
cases.add(
@@ -4542,7 +4570,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\inline fn bar() void { }
\\extern fn quux(usize) void;
,
- ".tmp_source.zig:4:1: error: unable to inline function",
+ "tmp.zig:4:1: error: unable to inline function",
);
cases.add(
@@ -4551,7 +4579,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return a / b;
\\}
,
- ".tmp_source.zig:2:14: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact",
+ "tmp.zig:2:14: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact",
);
cases.add(
@@ -4560,7 +4588,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return a % b;
\\}
,
- ".tmp_source.zig:2:14: error: remainder division with 'i32' and 'i32': signed integers and floats must use @rem or @mod",
+ "tmp.zig:2:14: error: remainder division with 'i32' and 'i32': signed integers and floats must use @rem or @mod",
);
cases.add(
@@ -4571,7 +4599,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const c = a / b;
\\}
,
- ".tmp_source.zig:4:17: error: division by zero",
+ "tmp.zig:4:17: error: division by zero",
);
cases.add(
@@ -4582,7 +4610,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const c = a % b;
\\}
,
- ".tmp_source.zig:4:17: error: division by zero",
+ "tmp.zig:4:17: error: division by zero",
);
cases.add(
@@ -4592,8 +4620,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setRuntimeSafety(false);
\\}
,
- ".tmp_source.zig:3:5: error: runtime safety set twice for same scope",
- ".tmp_source.zig:2:5: note: first set here",
+ "tmp.zig:3:5: error: runtime safety set twice for same scope",
+ "tmp.zig:2:5: note: first set here",
);
cases.add(
@@ -4603,8 +4631,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setFloatMode(@import("builtin").FloatMode.Optimized);
\\}
,
- ".tmp_source.zig:3:5: error: float mode set twice for same scope",
- ".tmp_source.zig:2:5: note: first set here",
+ "tmp.zig:3:5: error: float mode set twice for same scope",
+ "tmp.zig:2:5: note: first set here",
);
cases.add(
@@ -4613,7 +4641,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var b: u8[40] = undefined;
\\}
,
- ".tmp_source.zig:2:14: error: array access of non-array type 'type'",
+ "tmp.zig:2:14: error: array access of non-array type 'type'",
);
cases.add(
@@ -4626,7 +4654,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:4:13: error: cannot break out of defer expression",
+ "tmp.zig:4:13: error: cannot break out of defer expression",
);
cases.add(
@@ -4639,7 +4667,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:4:13: error: cannot continue out of defer expression",
+ "tmp.zig:4:13: error: cannot continue out of defer expression",
);
cases.add(
@@ -4653,7 +4681,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foos[0]();
\\}
,
- ".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value",
+ "tmp.zig:7:9: error: calling a generic function requires compile-time known function value",
);
cases.add(
@@ -4667,7 +4695,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ foos[0](true);
\\}
,
- ".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value",
+ "tmp.zig:7:9: error: calling a generic function requires compile-time known function value",
);
cases.add(
@@ -4681,24 +4709,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return bar;
\\}
,
- ".tmp_source.zig:1:13: error: aoeu",
- ".tmp_source.zig:3:19: note: referenced here",
- ".tmp_source.zig:7:12: note: referenced here",
- );
-
- cases.add(
- "instantiating an undefined value for an invalid struct that contains itself",
- \\const Foo = struct {
- \\ x: Foo,
- \\};
- \\
- \\var foo: Foo = undefined;
- \\
- \\export fn entry() usize {
- \\ return @sizeOf(@typeOf(foo.x));
- \\}
- ,
- ".tmp_source.zig:1:13: error: struct 'Foo' contains itself",
+ "tmp.zig:1:13: error: aoeu",
+ "tmp.zig:3:19: note: referenced here",
+ "tmp.zig:7:12: note: referenced here",
);
cases.add(
@@ -4707,7 +4720,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a = 0x1.0p16384;
\\}
,
- ".tmp_source.zig:2:15: error: float literal out of range of any type",
+ "tmp.zig:2:15: error: float literal out of range of any type",
);
cases.add(
@@ -4716,7 +4729,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a = 0x1.0p-16384;
\\}
,
- ".tmp_source.zig:2:15: error: float literal out of range of any type",
+ "tmp.zig:2:15: error: float literal out of range of any type",
);
cases.add(
@@ -4725,7 +4738,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return i32(12.34);
\\}
,
- ".tmp_source.zig:2:16: error: fractional component prevents float value 12.340000 from being casted to type 'i32'",
+ "tmp.zig:2:16: error: fractional component prevents float value 12.340000 from being casted to type 'i32'",
);
cases.add(
@@ -4734,7 +4747,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @ptrToInt(x);
\\}
,
- ".tmp_source.zig:2:22: error: expected pointer, found 'i32'",
+ "tmp.zig:2:22: error: expected pointer, found 'i32'",
);
cases.add(
@@ -4743,7 +4756,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @shlExact(u8(0b01010101), 2);
\\}
,
- ".tmp_source.zig:2:15: error: operation caused overflow",
+ "tmp.zig:2:15: error: operation caused overflow",
);
cases.add(
@@ -4752,7 +4765,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @shrExact(u8(0b10101010), 2);
\\}
,
- ".tmp_source.zig:2:15: error: exact shift shifted out 1 bits",
+ "tmp.zig:2:15: error: exact shift shifted out 1 bits",
);
cases.add(
@@ -4761,7 +4774,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 0x11 << x;
\\}
,
- ".tmp_source.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known",
+ "tmp.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known",
);
cases.add(
@@ -4770,7 +4783,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x << y;
\\}
,
- ".tmp_source.zig:2:17: error: expected type 'u3', found 'u8'",
+ "tmp.zig:2:17: error: expected type 'u3', found 'u8'",
);
cases.add(
@@ -4780,7 +4793,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const a: u16 = 300;
\\}
,
- ".tmp_source.zig:1:1: error: declaration shadows primitive type 'u16'",
+ "tmp.zig:1:1: error: declaration shadows primitive type 'u16'",
);
cases.add(
@@ -4799,7 +4812,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ x.* += 1;
\\}
,
- ".tmp_source.zig:8:13: error: expected type '*u32', found '*align(1) u32'",
+ "tmp.zig:8:13: error: expected type '*u32', found '*align(1) u32'",
);
cases.add(
@@ -4819,9 +4832,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ x[0] += 1;
\\}
,
- ".tmp_source.zig:9:18: error: cast increases pointer alignment",
- ".tmp_source.zig:9:23: note: '*align(1) u32' has alignment 1",
- ".tmp_source.zig:9:18: note: '*[1]u32' has alignment 4",
+ "tmp.zig:9:18: error: cast increases pointer alignment",
+ "tmp.zig:9:23: note: '*align(1) u32' has alignment 1",
+ "tmp.zig:9:18: note: '*[1]u32' has alignment 4",
);
cases.add(
@@ -4832,9 +4845,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return ptr.*;
\\}
,
- ".tmp_source.zig:3:17: error: cast increases pointer alignment",
- ".tmp_source.zig:3:38: note: '*u8' has alignment 1",
- ".tmp_source.zig:3:26: note: '*u32' has alignment 4",
+ "tmp.zig:3:17: error: cast increases pointer alignment",
+ "tmp.zig:3:38: note: '*u8' has alignment 1",
+ "tmp.zig:3:26: note: '*u32' has alignment 4",
);
cases.add(
@@ -4843,7 +4856,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @alignCast(4, u32(3));
\\}
,
- ".tmp_source.zig:2:22: error: expected pointer or slice, found 'u32'",
+ "tmp.zig:2:22: error: expected pointer or slice, found 'u32'",
);
cases.add(
@@ -4856,7 +4869,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn alignedSmall() align(4) i32 { return 1234; }
,
- ".tmp_source.zig:2:35: error: expected type 'fn() align(8) i32', found 'fn() align(4) i32'",
+ "tmp.zig:2:35: error: expected type 'fn() align(8) i32', found 'fn() align(4) i32'",
);
cases.add(
@@ -4868,7 +4881,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x == 5678;
\\}
,
- ".tmp_source.zig:4:32: error: expected type '*i32', found '*align(1) i32'",
+ "tmp.zig:4:32: error: expected type '*i32', found '*align(1) i32'",
);
cases.add(
@@ -4877,7 +4890,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const array = [2]u8{1, 2, 3};
\\}
,
- ".tmp_source.zig:2:24: error: expected [2]u8 literal, found [3]u8 literal",
+ "tmp.zig:2:24: error: expected [2]u8 literal, found [3]u8 literal",
);
cases.add(
@@ -4889,7 +4902,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ bar(@ptrCast(*c_void, &x));
\\}
,
- ".tmp_source.zig:5:9: error: expected type '*Derp', found '*c_void'",
+ "tmp.zig:5:9: error: expected type '*Derp', found '*c_void'",
);
cases.add(
@@ -4906,7 +4919,6 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var d = null;
\\ var e = opaque.*;
\\ var f = i32;
- \\ var g = @import("std",);
\\ var h = (Foo {}).bar;
\\
\\ var z: noreturn = return;
@@ -4916,16 +4928,15 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ fn bar(self: *const Foo) void {}
\\};
,
- ".tmp_source.zig:4:4: error: variable of type '*comptime_int' must be const or comptime",
- ".tmp_source.zig:7:4: error: variable of type '(undefined)' must be const or comptime",
- ".tmp_source.zig:8:4: error: variable of type 'comptime_int' must be const or comptime",
- ".tmp_source.zig:9:4: error: variable of type 'comptime_float' must be const or comptime",
- ".tmp_source.zig:10:4: error: variable of type '(null)' must be const or comptime",
- ".tmp_source.zig:11:4: error: variable of type 'Opaque' not allowed",
- ".tmp_source.zig:12:4: error: variable of type 'type' must be const or comptime",
- ".tmp_source.zig:13:4: error: variable of type '(namespace)' must be const or comptime",
- ".tmp_source.zig:14:4: error: variable of type '(bound fn(*const Foo) void)' must be const or comptime",
- ".tmp_source.zig:16:4: error: unreachable code",
+ "tmp.zig:4:4: error: variable of type '*comptime_int' must be const or comptime",
+ "tmp.zig:7:4: error: variable of type '(undefined)' must be const or comptime",
+ "tmp.zig:8:4: error: variable of type 'comptime_int' must be const or comptime",
+ "tmp.zig:9:4: error: variable of type 'comptime_float' must be const or comptime",
+ "tmp.zig:10:4: error: variable of type '(null)' must be const or comptime",
+ "tmp.zig:11:4: error: variable of type 'Opaque' not allowed",
+ "tmp.zig:12:4: error: variable of type 'type' must be const or comptime",
+ "tmp.zig:13:4: error: variable of type '(bound fn(*const Foo) void)' must be const or comptime",
+ "tmp.zig:15:4: error: unreachable code",
);
cases.add(
@@ -4935,7 +4946,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, u32(1234), u32(1234))) {}
\\}
,
- ".tmp_source.zig:3:50: error: expected type 'AtomicOrder', found 'u32'",
+ "tmp.zig:3:50: error: expected type 'builtin.AtomicOrder', found 'u32'",
);
cases.add(
@@ -4945,7 +4956,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @export("entry", entry, u32(1234));
\\}
,
- ".tmp_source.zig:3:32: error: expected type 'GlobalLinkage', found 'u32'",
+ "tmp.zig:3:32: error: expected type 'builtin.GlobalLinkage', found 'u32'",
);
cases.add(
@@ -4974,7 +4985,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ };
\\}
,
- ".tmp_source.zig:14:17: error: use of undeclared identifier 'HeaderValue'",
+ "tmp.zig:14:17: error: use of undeclared identifier 'HeaderValue'",
);
cases.add(
@@ -4983,7 +4994,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setAlignStack(16);
\\}
,
- ".tmp_source.zig:2:5: error: @setAlignStack outside function",
+ "tmp.zig:2:5: error: @setAlignStack outside function",
);
cases.add(
@@ -4992,7 +5003,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setAlignStack(16);
\\}
,
- ".tmp_source.zig:2:5: error: @setAlignStack in naked function",
+ "tmp.zig:2:5: error: @setAlignStack in naked function",
);
cases.add(
@@ -5004,7 +5015,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setAlignStack(16);
\\}
,
- ".tmp_source.zig:5:5: error: @setAlignStack in inline function",
+ "tmp.zig:5:5: error: @setAlignStack in inline function",
);
cases.add(
@@ -5014,8 +5025,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setAlignStack(16);
\\}
,
- ".tmp_source.zig:3:5: error: alignstack set twice",
- ".tmp_source.zig:2:5: note: first set here",
+ "tmp.zig:3:5: error: alignstack set twice",
+ "tmp.zig:2:5: note: first set here",
);
cases.add(
@@ -5024,7 +5035,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ @setAlignStack(511 + 1);
\\}
,
- ".tmp_source.zig:2:5: error: attempt to @setAlignStack(512); maximum is 256",
+ "tmp.zig:2:5: error: attempt to @setAlignStack(512); maximum is 256",
);
cases.add(
@@ -5071,7 +5082,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:37:16: error: cannot store runtime value in compile time variable",
+ "tmp.zig:37:16: error: cannot store runtime value in compile time variable",
);
cases.add(
@@ -5087,7 +5098,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return x.blah;
\\}
,
- ".tmp_source.zig:9:13: error: type '*MyType' does not support field access",
+ "tmp.zig:9:13: error: type '*MyType' does not support field access",
);
cases.add(
@@ -5095,7 +5106,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
"fn test() bool {\r\n" ++
" true\r\n" ++
"}\r\n",
- ".tmp_source.zig:1:17: error: invalid carriage return, only '\\n' line endings are supported",
+ "tmp.zig:1:17: error: invalid carriage return, only '\\n' line endings are supported",
);
cases.add(
@@ -5105,7 +5116,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ true\r
\\}
,
- ".tmp_source.zig:1:1: error: invalid character: '\\xff'",
+ "tmp.zig:1:1: error: invalid character: '\\xff'",
);
cases.add(
@@ -5113,7 +5124,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
"fn test() bool {\n" ++
"\ttrue\n" ++
"}\n",
- ".tmp_source.zig:2:1: error: invalid character: '\\t'",
+ "tmp.zig:2:1: error: invalid character: '\\t'",
);
cases.add(
@@ -5122,7 +5133,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @ArgType(i32, 3);
\\}
,
- ".tmp_source.zig:2:18: error: expected function, found 'i32'",
+ "tmp.zig:2:18: error: expected function, found 'i32'",
);
cases.add(
@@ -5132,7 +5143,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\fn add(a: i32, b: i32) i32 { return a + b; }
,
- ".tmp_source.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) i32' has 2 arguments",
+ "tmp.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) i32' has 2 arguments",
);
cases.add(
@@ -5141,7 +5152,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @memberType(i32, 0);
\\}
,
- ".tmp_source.zig:2:21: error: type 'i32' does not support @memberType",
+ "tmp.zig:2:21: error: type 'i32' does not support @memberType",
);
cases.add(
@@ -5151,7 +5162,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = enum {A,};
,
- ".tmp_source.zig:2:21: error: type 'Foo' does not support @memberType",
+ "tmp.zig:2:21: error: type 'Foo' does not support @memberType",
);
cases.add(
@@ -5161,7 +5172,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = struct {};
,
- ".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
+ "tmp.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
);
cases.add(
@@ -5171,7 +5182,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = union {A: void,};
,
- ".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
+ "tmp.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
);
cases.add(
@@ -5180,7 +5191,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @memberName(i32, 0);
\\}
,
- ".tmp_source.zig:2:21: error: type 'i32' does not support @memberName",
+ "tmp.zig:2:21: error: type 'i32' does not support @memberName",
);
cases.add(
@@ -5190,7 +5201,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = struct {};
,
- ".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
+ "tmp.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
);
cases.add(
@@ -5200,7 +5211,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = enum {A,};
,
- ".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
+ "tmp.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
);
cases.add(
@@ -5210,7 +5221,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\const Foo = union {A:i32,};
,
- ".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
+ "tmp.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
);
cases.add(
@@ -5220,7 +5231,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\}
\\pub extern fn foo(format: *const u8, ...) void;
,
- ".tmp_source.zig:2:9: error: expected type '*const u8', found '[5]u8'",
+ "tmp.zig:2:9: error: expected type '*const u8', found '[5]u8'",
);
cases.add(
@@ -5239,9 +5250,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var allocator: ContextAllocator = undefined;
\\}
,
- ".tmp_source.zig:4:25: error: aoeu",
- ".tmp_source.zig:1:36: note: called from here",
- ".tmp_source.zig:12:20: note: referenced here",
+ "tmp.zig:4:25: error: aoeu",
+ "tmp.zig:1:36: note: called from here",
+ "tmp.zig:12:20: note: referenced here",
);
cases.add(
@@ -5258,7 +5269,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = Small.One;
\\}
,
- ".tmp_source.zig:1:21: error: 'u2' too small to hold all bits; must be at least 'u3'",
+ "tmp.zig:1:21: error: 'u2' too small to hold all bits; must be at least 'u3'",
);
cases.add(
@@ -5273,7 +5284,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = Small.One;
\\}
,
- ".tmp_source.zig:1:21: error: expected integer, found 'f32'",
+ "tmp.zig:1:21: error: expected integer, found 'f32'",
);
cases.add(
@@ -5289,7 +5300,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: u2 = Small.Two;
\\}
,
- ".tmp_source.zig:9:22: error: expected type 'u2', found 'Small'",
+ "tmp.zig:9:22: error: expected type 'u2', found 'Small'",
);
cases.add(
@@ -5306,7 +5317,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = @intToEnum(Small, y);
\\}
,
- ".tmp_source.zig:10:31: error: expected type 'u2', found 'u3'",
+ "tmp.zig:10:31: error: expected type 'u2', found 'u3'",
);
cases.add(
@@ -5322,7 +5333,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var y = Small.Two;
\\}
,
- ".tmp_source.zig:1:20: error: expected unsigned integer, found 'i2'",
+ "tmp.zig:1:20: error: expected unsigned integer, found 'i2'",
);
cases.add(
@@ -5334,7 +5345,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: MultipleChoice = undefined;
\\}
,
- ".tmp_source.zig:2:14: error: enums, not structs, support field assignment",
+ "tmp.zig:2:14: error: enums, not structs, support field assignment",
);
cases.add(
@@ -5346,8 +5357,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: MultipleChoice = undefined;
\\}
,
- ".tmp_source.zig:2:14: error: non-enum union field assignment",
- ".tmp_source.zig:1:24: note: consider 'union(enum)' here",
+ "tmp.zig:2:14: error: non-enum union field assignment",
+ "tmp.zig:1:24: note: consider 'union(enum)' here",
);
cases.add(
@@ -5357,7 +5368,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @sizeOf(Foo);
\\}
,
- ".tmp_source.zig:1:13: error: enums must have 1 or more fields",
+ "tmp.zig:1:13: error: enums must have 1 or more fields",
);
cases.add(
@@ -5367,7 +5378,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @sizeOf(Foo);
\\}
,
- ".tmp_source.zig:1:13: error: unions must have 1 or more fields",
+ "tmp.zig:1:13: error: unions must have 1 or more fields",
);
cases.add(
@@ -5383,8 +5394,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = MultipleChoice.C;
\\}
,
- ".tmp_source.zig:6:9: error: enum tag value 60 already taken",
- ".tmp_source.zig:4:9: note: other occurrence here",
+ "tmp.zig:6:9: error: enum tag value 60 already taken",
+ "tmp.zig:4:9: note: other occurrence here",
);
cases.add(
@@ -5402,8 +5413,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return @sizeOf(Payload);
\\}
,
- ".tmp_source.zig:6:17: error: enum field missing: 'C'",
- ".tmp_source.zig:4:5: note: declared here",
+ "tmp.zig:6:17: error: enum field missing: 'C'",
+ "tmp.zig:4:5: note: declared here",
);
cases.add(
@@ -5415,8 +5426,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @TagType(Foo);
\\}
,
- ".tmp_source.zig:5:24: error: union 'Foo' has no tag",
- ".tmp_source.zig:1:13: note: consider 'union(enum)' here",
+ "tmp.zig:5:24: error: union 'Foo' has no tag",
+ "tmp.zig:1:13: note: consider 'union(enum)' here",
);
cases.add(
@@ -5428,7 +5439,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @TagType(Foo);
\\}
,
- ".tmp_source.zig:1:24: error: expected integer tag type, found 'f32'",
+ "tmp.zig:1:24: error: expected integer tag type, found 'f32'",
);
cases.add(
@@ -5440,7 +5451,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const x = @TagType(Foo);
\\}
,
- ".tmp_source.zig:1:19: error: expected enum tag type, found 'u32'",
+ "tmp.zig:1:19: error: expected enum tag type, found 'u32'",
);
cases.add(
@@ -5456,8 +5467,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = MultipleChoice { .C = {} };
\\}
,
- ".tmp_source.zig:6:9: error: enum tag value 60 already taken",
- ".tmp_source.zig:4:9: note: other occurrence here",
+ "tmp.zig:6:9: error: enum tag value 60 already taken",
+ "tmp.zig:4:9: note: other occurrence here",
);
cases.add(
@@ -5477,8 +5488,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = Payload {.A = 1234};
\\}
,
- ".tmp_source.zig:10:5: error: enum field not found: 'D'",
- ".tmp_source.zig:1:16: note: enum declared here",
+ "tmp.zig:10:5: error: enum field not found: 'D'",
+ "tmp.zig:1:16: note: enum declared here",
);
cases.add(
@@ -5492,8 +5503,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var b = Letter.B;
\\}
,
- ".tmp_source.zig:2:8: error: structs and unions, not enums, support field types",
- ".tmp_source.zig:1:16: note: consider 'union(enum)' here",
+ "tmp.zig:2:8: error: structs and unions, not enums, support field types",
+ "tmp.zig:1:16: note: consider 'union(enum)' here",
);
cases.add(
@@ -5505,7 +5516,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = Letter { .A = {} };
\\}
,
- ".tmp_source.zig:2:5: error: struct field missing type",
+ "tmp.zig:2:5: error: struct field missing type",
);
cases.add(
@@ -5517,7 +5528,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = Letter { .A = {} };
\\}
,
- ".tmp_source.zig:2:5: error: union field missing type",
+ "tmp.zig:2:5: error: union field missing type",
);
cases.add(
@@ -5536,7 +5547,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = Payload { .A = 1234 };
\\}
,
- ".tmp_source.zig:6:30: error: extern union does not support enum tag type",
+ "tmp.zig:6:30: error: extern union does not support enum tag type",
);
cases.add(
@@ -5555,7 +5566,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var a = Payload { .A = 1234 };
\\}
,
- ".tmp_source.zig:6:30: error: packed union does not support enum tag type",
+ "tmp.zig:6:30: error: packed union does not support enum tag type",
);
cases.add(
@@ -5576,8 +5587,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
- ".tmp_source.zig:11:14: error: switch on union which has no attached enum",
- ".tmp_source.zig:1:17: note: consider 'union(enum)' here",
+ "tmp.zig:11:14: error: switch on union which has no attached enum",
+ "tmp.zig:1:17: note: consider 'union(enum)' here",
);
cases.add(
@@ -5590,8 +5601,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x = @intToEnum(Foo, 0);
\\}
,
- ".tmp_source.zig:6:13: error: enum 'Foo' has no tag matching integer value 0",
- ".tmp_source.zig:1:13: note: 'Foo' declared here",
+ "tmp.zig:6:13: error: enum 'Foo' has no tag matching integer value 0",
+ "tmp.zig:1:13: note: 'Foo' declared here",
);
cases.add(
@@ -5606,8 +5617,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: Value = Letter.A;
\\}
,
- ".tmp_source.zig:8:26: error: cast to union 'Value' must initialize 'i32' field 'A'",
- ".tmp_source.zig:3:5: note: field 'A' declared here",
+ "tmp.zig:8:26: error: cast to union 'Value' must initialize 'i32' field 'A'",
+ "tmp.zig:3:5: note: field 'A' declared here",
);
cases.add(
@@ -5625,8 +5636,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var x: Value = l;
\\}
,
- ".tmp_source.zig:11:20: error: runtime cast to union 'Value' which has non-void fields",
- ".tmp_source.zig:3:5: note: field 'A' has type 'i32'",
+ "tmp.zig:11:20: error: runtime cast to union 'Value' which has non-void fields",
+ "tmp.zig:3:5: note: field 'A' has type 'i32'",
);
cases.add(
@@ -5638,7 +5649,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const fieldOffset = @byteOffsetOf(Empty, "val",);
\\}
,
- ".tmp_source.zig:5:46: error: zero-bit field 'val' in struct 'Empty' has no offset",
+ "tmp.zig:5:46: error: zero-bit field 'val' in struct 'Empty' has no offset",
);
cases.add(
@@ -5650,7 +5661,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const fieldOffset = @bitOffsetOf(Empty, "val",);
\\}
,
- ".tmp_source.zig:5:45: error: zero-bit field 'val' in struct 'Empty' has no offset",
+ "tmp.zig:5:45: error: zero-bit field 'val' in struct 'Empty' has no offset",
);
cases.add(
@@ -5664,7 +5675,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const bar_val = foo.Bar;
\\}
,
- ".tmp_source.zig:7:24: error: accessing union field 'Bar' while field 'Baz' is set",
+ "tmp.zig:7:24: error: accessing union field 'Bar' while field 'Baz' is set",
);
cases.add(
@@ -5674,7 +5685,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @typeOf(generic).ReturnType;
\\}
,
- ".tmp_source.zig:3:25: error: ReturnType has not been resolved because 'fn(var)var' is generic",
+ "tmp.zig:3:25: error: ReturnType has not been resolved because 'fn(var)var' is generic",
);
cases.add(
@@ -5684,7 +5695,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ _ = @ArgType(@typeOf(generic), 0);
\\}
,
- ".tmp_source.zig:3:36: error: @ArgType could not resolve the type of arg 0 because 'fn(var)var' is generic",
+ "tmp.zig:3:36: error: @ArgType could not resolve the type of arg 0 because 'fn(var)var' is generic",
);
cases.add(
@@ -5694,7 +5705,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ asm volatile ("" : [baz]"+r"(bar) : : "");
\\}
,
- ".tmp_source.zig:3:5: error: invalid modifier starting output constraint for 'baz': '+', only '=' is supported. Compiler TODO: see https://github.com/ziglang/zig/issues/215",
+ "tmp.zig:3:5: error: invalid modifier starting output constraint for 'baz': '+', only '=' is supported. Compiler TODO: see https://github.com/ziglang/zig/issues/215",
);
cases.add(
@@ -5703,7 +5714,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ asm volatile ("" : : [bar]"r"(3) : "");
\\}
,
- ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_int",
+ "tmp.zig:2:35: error: expected sized integer or sized float, found comptime_int",
);
cases.add(
@@ -5712,7 +5723,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ asm volatile ("" : : [bar]"r"(3.17) : "");
\\}
,
- ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_float",
+ "tmp.zig:2:35: error: expected sized integer or sized float, found comptime_float",
);
cases.add(
@@ -5726,7 +5737,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const foo = Foo { .Bar = x, .Baz = u8 };
\\}
,
- ".tmp_source.zig:7:30: error: unable to evaluate constant expression",
+ "tmp.zig:7:30: error: unable to evaluate constant expression",
);
cases.add(
@@ -5740,7 +5751,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const foo = Foo { .Bar = x };
\\}
,
- ".tmp_source.zig:7:30: error: unable to evaluate constant expression",
+ "tmp.zig:7:30: error: unable to evaluate constant expression",
);
cases.addTest(
@@ -5750,7 +5761,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var v: V = undefined;
\\}
,
- ".tmp_source.zig:2:26: error: vector element type must be integer, float, or pointer; '@Vector(4, u8)' is invalid",
+ "tmp.zig:2:26: error: vector element type must be integer, float, or pointer; '@Vector(4, u8)' is invalid",
);
cases.add("compileLog of tagged enum doesn't crash the compiler",
@@ -5765,5 +5776,5 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\pub fn main () void {
\\ comptime testCompileLog(Bar{.X = 123});
\\}
- , ".tmp_source.zig:6:5: error: found compile log statement");
+ , "tmp.zig:6:5: error: found compile log statement");
}
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index d1286cbf8a..9940a76af1 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -18,6 +18,7 @@ comptime {
_ = @import("behavior/bugs/1421.zig");
_ = @import("behavior/bugs/1442.zig");
_ = @import("behavior/bugs/1486.zig");
+ _ = @import("behavior/bugs/1500.zig");
_ = @import("behavior/bugs/1851.zig");
_ = @import("behavior/bugs/2006.zig");
_ = @import("behavior/bugs/394.zig");
@@ -25,6 +26,7 @@ comptime {
_ = @import("behavior/bugs/529.zig");
_ = @import("behavior/bugs/655.zig");
_ = @import("behavior/bugs/656.zig");
+ _ = @import("behavior/bugs/679.zig");
_ = @import("behavior/bugs/704.zig");
_ = @import("behavior/bugs/718.zig");
_ = @import("behavior/bugs/726.zig");
@@ -54,14 +56,14 @@ comptime {
_ = @import("behavior/math.zig");
_ = @import("behavior/merge_error_sets.zig");
_ = @import("behavior/misc.zig");
- _ = @import("behavior/namespace_depends_on_compile_var/index.zig");
+ _ = @import("behavior/namespace_depends_on_compile_var.zig");
_ = @import("behavior/new_stack_call.zig");
_ = @import("behavior/null.zig");
_ = @import("behavior/optional.zig");
_ = @import("behavior/pointers.zig");
_ = @import("behavior/popcount.zig");
_ = @import("behavior/ptrcast.zig");
- _ = @import("behavior/pub_enum/index.zig");
+ _ = @import("behavior/pub_enum.zig");
_ = @import("behavior/ref_var_in_if_after_if_2nd_switch_prong.zig");
_ = @import("behavior/reflection.zig");
_ = @import("behavior/sizeof_and_typeof.zig");
@@ -78,6 +80,7 @@ comptime {
_ = @import("behavior/truncate.zig");
_ = @import("behavior/try.zig");
_ = @import("behavior/type_info.zig");
+ _ = @import("behavior/typename.zig");
_ = @import("behavior/undefined.zig");
_ = @import("behavior/underscore.zig");
_ = @import("behavior/union.zig");
diff --git a/test/stage1/behavior/asm.zig b/test/stage1/behavior/asm.zig
index 845d80777a..414fa42e1e 100644
--- a/test/stage1/behavior/asm.zig
+++ b/test/stage1/behavior/asm.zig
@@ -4,16 +4,16 @@ const expect = @import("std").testing.expect;
comptime {
if (config.arch == config.Arch.x86_64 and config.os == config.Os.linux) {
asm volatile (
- \\.globl aoeu;
- \\.type aoeu, @function;
- \\.set aoeu, derp;
+ \\.globl this_is_my_alias;
+ \\.type this_is_my_alias, @function;
+ \\.set this_is_my_alias, derp;
);
}
}
test "module level assembly" {
if (config.arch == config.Arch.x86_64 and config.os == config.Os.linux) {
- expect(aoeu() == 1234);
+ expect(this_is_my_alias() == 1234);
}
}
@@ -85,7 +85,7 @@ test "sized integer/float in asm input" {
);
}
-extern fn aoeu() i32;
+extern fn this_is_my_alias() i32;
export fn derp() i32 {
return 1234;
diff --git a/test/stage1/behavior/bugs/1500.zig b/test/stage1/behavior/bugs/1500.zig
new file mode 100644
index 0000000000..e24cfe5a9c
--- /dev/null
+++ b/test/stage1/behavior/bugs/1500.zig
@@ -0,0 +1,10 @@
+const A = struct {
+ b: B,
+};
+
+const B = fn (A) void;
+
+test "allow these dependencies" {
+ var a: A = undefined;
+ var b: B = undefined;
+}
diff --git a/test/stage1/behavior/bugs/679.zig b/test/stage1/behavior/bugs/679.zig
new file mode 100644
index 0000000000..20b2b7b02a
--- /dev/null
+++ b/test/stage1/behavior/bugs/679.zig
@@ -0,0 +1,17 @@
+const std = @import("std");
+const expect = std.testing.expect;
+
+pub fn List(comptime T: type) type {
+ return u32;
+}
+
+const ElementList = List(Element);
+const Element = struct {
+ link: ElementList,
+};
+
+test "false dependency loop in struct definition" {
+ const listType = ElementList;
+ var x: listType = 42;
+ expect(x == 42);
+}
diff --git a/test/stage1/behavior/misc.zig b/test/stage1/behavior/misc.zig
index 91cab78bc7..a2d752457c 100644
--- a/test/stage1/behavior/misc.zig
+++ b/test/stage1/behavior/misc.zig
@@ -1,5 +1,6 @@
const std = @import("std");
const expect = std.testing.expect;
+const expectEqualSlices = std.testing.expectEqualSlices;
const mem = std.mem;
const cstr = std.cstr;
const builtin = @import("builtin");
@@ -469,7 +470,7 @@ test "@typeId" {
expect(@typeId(AUnionEnum) == Tid.Union);
expect(@typeId(AUnion) == Tid.Union);
expect(@typeId(fn () void) == Tid.Fn);
- expect(@typeId(@typeOf(builtin)) == Tid.Namespace);
+ expect(@typeId(@typeOf(builtin)) == Tid.Type);
// TODO bound fn
// TODO arg tuple
// TODO opaque
@@ -488,7 +489,7 @@ test "@typeName" {
expect(mem.eql(u8, @typeName(i64), "i64"));
expect(mem.eql(u8, @typeName(*usize), "*usize"));
// https://github.com/ziglang/zig/issues/675
- expect(mem.eql(u8, @typeName(TypeFromFn(u8)), "TypeFromFn(u8)"));
+ expectEqualSlices(u8, "behavior.misc.TypeFromFn(u8)", @typeName(TypeFromFn(u8)));
expect(mem.eql(u8, @typeName(Struct), "Struct"));
expect(mem.eql(u8, @typeName(Union), "Union"));
expect(mem.eql(u8, @typeName(Enum), "Enum"));
diff --git a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig b/test/stage1/behavior/namespace_depends_on_compile_var.zig
similarity index 68%
rename from test/stage1/behavior/namespace_depends_on_compile_var/index.zig
rename to test/stage1/behavior/namespace_depends_on_compile_var.zig
index 32feaced10..4c4fc4eefe 100644
--- a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig
+++ b/test/stage1/behavior/namespace_depends_on_compile_var.zig
@@ -9,6 +9,6 @@ test "namespace depends on compile var" {
}
}
const some_namespace = switch (builtin.os) {
- builtin.Os.linux => @import("a.zig"),
- else => @import("b.zig"),
+ builtin.Os.linux => @import("namespace_depends_on_compile_var/a.zig"),
+ else => @import("namespace_depends_on_compile_var/b.zig"),
};
diff --git a/test/stage1/behavior/pointers.zig b/test/stage1/behavior/pointers.zig
index eed7a765d7..1bb23866b4 100644
--- a/test/stage1/behavior/pointers.zig
+++ b/test/stage1/behavior/pointers.zig
@@ -124,3 +124,9 @@ test "implicit cast error unions with non-optional to optional pointer" {
S.doTheTest();
comptime S.doTheTest();
}
+
+test "initialize const optional C pointer to null" {
+ const a: ?[*c]i32 = null;
+ expect(a == null);
+ comptime expect(a == null);
+}
diff --git a/test/stage1/behavior/pub_enum/index.zig b/test/stage1/behavior/pub_enum.zig
similarity index 85%
rename from test/stage1/behavior/pub_enum/index.zig
rename to test/stage1/behavior/pub_enum.zig
index 15e4114c2d..6275be7a01 100644
--- a/test/stage1/behavior/pub_enum/index.zig
+++ b/test/stage1/behavior/pub_enum.zig
@@ -1,4 +1,4 @@
-const other = @import("other.zig");
+const other = @import("pub_enum/other.zig");
const expect = @import("std").testing.expect;
test "pub enum" {
diff --git a/test/stage1/behavior/slice.zig b/test/stage1/behavior/slice.zig
index 13fa84d0fa..19eb570150 100644
--- a/test/stage1/behavior/slice.zig
+++ b/test/stage1/behavior/slice.zig
@@ -1,5 +1,7 @@
-const expect = @import("std").testing.expect;
-const mem = @import("std").mem;
+const std = @import("std");
+const expect = std.testing.expect;
+const expectEqualSlices = std.testing.expectEqualSlices;
+const mem = std.mem;
const x = @intToPtr([*]i32, 0x1000)[0..0x500];
const y = x[0x100..];
@@ -38,3 +40,10 @@ test "implicitly cast array of size 0 to slice" {
fn assertLenIsZero(msg: []const u8) void {
expect(msg.len == 0);
}
+
+test "C pointer" {
+ var buf: [*c]const u8 = c"kjdhfkjdhfdkjhfkfjhdfkjdhfkdjhfdkjhf";
+ var len: u32 = 10;
+ var slice = buf[0..len];
+ expectEqualSlices(u8, "kjdhfkjdhf", slice);
+}
diff --git a/test/stage1/behavior/type_info.zig b/test/stage1/behavior/type_info.zig
index dc185cc960..510a56f619 100644
--- a/test/stage1/behavior/type_info.zig
+++ b/test/stage1/behavior/type_info.zig
@@ -186,7 +186,7 @@ fn testUnion() void {
expect(TypeId(typeinfo_info) == TypeId.Union);
expect(typeinfo_info.Union.layout == TypeInfo.ContainerLayout.Auto);
expect(typeinfo_info.Union.tag_type.? == TypeId);
- expect(typeinfo_info.Union.fields.len == 25);
+ expect(typeinfo_info.Union.fields.len == 24);
expect(typeinfo_info.Union.fields[4].enum_field != null);
expect(typeinfo_info.Union.fields[4].enum_field.?.value == 4);
expect(typeinfo_info.Union.fields[4].field_type == @typeOf(@typeInfo(u8).Int));
diff --git a/test/stage1/behavior/typename.zig b/test/stage1/behavior/typename.zig
new file mode 100644
index 0000000000..1abefe5b5e
--- /dev/null
+++ b/test/stage1/behavior/typename.zig
@@ -0,0 +1,7 @@
+const std = @import("std");
+const expect = std.testing.expect;
+const expectEqualSlices = std.testing.expectEqualSlices;
+
+test "slice" {
+ expectEqualSlices(u8, "[]u8", @typeName([]u8));
+}
diff --git a/test/standalone/main_pkg_path/a/test.zig b/test/standalone/main_pkg_path/a/test.zig
new file mode 100644
index 0000000000..286489912b
--- /dev/null
+++ b/test/standalone/main_pkg_path/a/test.zig
@@ -0,0 +1,5 @@
+const b = @import("../b.zig");
+
+test "main pkg path" {
+ b.foo();
+}
diff --git a/test/standalone/main_pkg_path/b.zig b/test/standalone/main_pkg_path/b.zig
new file mode 100644
index 0000000000..87d61fa63e
--- /dev/null
+++ b/test/standalone/main_pkg_path/b.zig
@@ -0,0 +1 @@
+pub fn foo() void {}
diff --git a/test/standalone/main_pkg_path/build.zig b/test/standalone/main_pkg_path/build.zig
new file mode 100644
index 0000000000..c4ac18f967
--- /dev/null
+++ b/test/standalone/main_pkg_path/build.zig
@@ -0,0 +1,9 @@
+const Builder = @import("std").build.Builder;
+
+pub fn build(b: *Builder) void {
+ const test_exe = b.addTest("a/test.zig");
+ test_exe.setMainPkgPath(".");
+
+ const test_step = b.step("test", "Test the program");
+ test_step.dependOn(&test_exe.step);
+}
diff --git a/test/standalone/static_c_lib/build.zig b/test/standalone/static_c_lib/build.zig
new file mode 100644
index 0000000000..afbb63c6bf
--- /dev/null
+++ b/test/standalone/static_c_lib/build.zig
@@ -0,0 +1,18 @@
+const Builder = @import("std").build.Builder;
+
+pub fn build(b: *Builder) void {
+ const mode = b.standardReleaseOptions();
+
+ const foo = b.addStaticLibrary("foo", null);
+ foo.addCSourceFile("foo.c", [][]const u8{});
+ foo.setBuildMode(mode);
+ foo.addIncludeDir(".");
+
+ const test_exe = b.addTest("foo.zig");
+ test_exe.setBuildMode(mode);
+ test_exe.linkLibrary(foo);
+ test_exe.addIncludeDir(".");
+
+ const test_step = b.step("test", "Test it");
+ test_step.dependOn(&test_exe.step);
+}
diff --git a/test/standalone/static_c_lib/foo.c b/test/standalone/static_c_lib/foo.c
new file mode 100644
index 0000000000..2366282d47
--- /dev/null
+++ b/test/standalone/static_c_lib/foo.c
@@ -0,0 +1,4 @@
+#include "foo.h"
+uint32_t add(uint32_t a, uint32_t b) {
+ return a + b;
+}
diff --git a/test/standalone/static_c_lib/foo.h b/test/standalone/static_c_lib/foo.h
new file mode 100644
index 0000000000..e8ebb9842e
--- /dev/null
+++ b/test/standalone/static_c_lib/foo.h
@@ -0,0 +1,2 @@
+#include
+uint32_t add(uint32_t a, uint32_t b);
diff --git a/test/standalone/static_c_lib/foo.zig b/test/standalone/static_c_lib/foo.zig
new file mode 100644
index 0000000000..edf94539c8
--- /dev/null
+++ b/test/standalone/static_c_lib/foo.zig
@@ -0,0 +1,8 @@
+const std = @import("std");
+const expect = std.testing.expect;
+const c = @cImport(@cInclude("foo.h"));
+
+test "C add" {
+ const result = c.add(1, 2);
+ expect(result == 3);
+}
diff --git a/test/tests.zig b/test/tests.zig
index 582736e8d5..d3a27f3e94 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -569,7 +569,7 @@ pub const CompileErrorContext = struct {
const ErrLineIter = struct {
lines: mem.SplitIterator,
- const source_file = ".tmp_source.zig";
+ const source_file = "tmp.zig";
fn init(input: []const u8) ErrLineIter {
return ErrLineIter{ .lines = mem.separate(input, "\n") };
@@ -759,7 +759,7 @@ pub const CompileErrorContext = struct {
.is_test = false,
};
- tc.addSourceFile(".tmp_source.zig", source);
+ tc.addSourceFile("tmp.zig", source);
comptime var arg_i = 0;
inline while (arg_i < expected_lines.len) : (arg_i += 1) {
tc.addExpectedError(expected_lines[arg_i]);
@@ -980,15 +980,18 @@ pub const TranslateCContext = struct {
Term.Exited => |code| {
if (code != 0) {
warn("Compilation failed with exit code {}\n", code);
+ printInvocation(zig_args.toSliceConst());
return error.TestFailed;
}
},
Term.Signal => |code| {
warn("Compilation failed with signal {}\n", code);
+ printInvocation(zig_args.toSliceConst());
return error.TestFailed;
},
else => {
warn("Compilation terminated unexpectedly\n");
+ printInvocation(zig_args.toSliceConst());
return error.TestFailed;
},
}