From 337cb2ec2c2a78b8cd17dbe494c83a13a777b6f4 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Mon, 4 Nov 2024 15:20:56 +0200 Subject: [PATCH] organize imports --- src/aro.zig | 2 +- src/aro/Builtins.zig | 9 +++++---- src/aro/CodeGen.zig | 4 +++- src/aro/Compilation.zig | 12 +++++++----- src/aro/Diagnostics.zig | 10 ++++++---- src/aro/Driver.zig | 9 +++++---- src/aro/Driver/GCCDetector.zig | 6 ++++-- src/aro/Hideset.zig | 3 ++- src/aro/InitList.zig | 6 +++--- src/aro/LangOpts.zig | 3 ++- src/aro/Parser.zig | 33 +++++++++++++++++---------------- src/aro/Pragma.zig | 3 ++- src/aro/Preprocessor.zig | 11 ++++++----- src/aro/SymbolStack.zig | 5 +++-- src/aro/Tokenizer.zig | 3 ++- src/aro/Toolchain.zig | 10 ++++++---- src/aro/Tree.zig | 4 +++- src/aro/Type.zig | 13 +++++++------ src/aro/Value.zig | 8 +++++--- src/aro/pragmas/gcc.zig | 5 +++-- src/aro/pragmas/message.zig | 7 ++++--- src/aro/pragmas/once.zig | 7 ++++--- src/aro/pragmas/pack.zig | 5 +++-- src/aro/record_layout.zig | 5 +++-- src/aro/target.zig | 6 ++++-- src/aro/text_literal.zig | 5 +++-- src/aro/toolchains/Linux.zig | 8 +++++--- src/backend.zig | 2 +- 28 files changed, 119 insertions(+), 85 deletions(-) diff --git a/src/aro.zig b/src/aro.zig index a9b76e0e5..a8f4e5365 100644 --- a/src/aro.zig +++ b/src/aro.zig @@ -5,12 +5,12 @@ pub const Driver = @import("aro/Driver.zig"); pub const Parser = @import("aro/Parser.zig"); pub const Preprocessor = @import("aro/Preprocessor.zig"); pub const Source = @import("aro/Source.zig"); +pub const target_util = @import("aro/target.zig"); pub const Tokenizer = @import("aro/Tokenizer.zig"); pub const Toolchain = @import("aro/Toolchain.zig"); pub const Tree = @import("aro/Tree.zig"); pub const Type = @import("aro/Type.zig"); pub const TypeMapper = @import("aro/StringInterner.zig").TypeMapper; -pub const target_util = @import("aro/target.zig"); pub const Value = @import("aro/Value.zig"); const backend = @import("backend"); diff --git a/src/aro/Builtins.zig b/src/aro/Builtins.zig index 3da06d9aa..a792a5a92 100644 --- a/src/aro/Builtins.zig +++ b/src/aro/Builtins.zig @@ -1,11 +1,12 @@ const std = @import("std"); + const Compilation = @import("Compilation.zig"); -const Type = @import("Type.zig"); -const TypeDescription = @import("Builtins/TypeDescription.zig"); -const target_util = @import("target.zig"); -const StringId = @import("StringInterner.zig").StringId; const LangOpts = @import("LangOpts.zig"); const Parser = @import("Parser.zig"); +const StringId = @import("StringInterner.zig").StringId; +const target_util = @import("target.zig"); +const Type = @import("Type.zig"); +const TypeDescription = @import("Builtins/TypeDescription.zig"); const Properties = @import("Builtins/Properties.zig"); pub const Builtin = @import("Builtins/Builtin.def").with(Properties); diff --git a/src/aro/CodeGen.zig b/src/aro/CodeGen.zig index 52112196a..7d407ae32 100644 --- a/src/aro/CodeGen.zig +++ b/src/aro/CodeGen.zig @@ -1,13 +1,15 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const assert = std.debug.assert; + const backend = @import("backend"); const Interner = backend.Interner; const Ir = backend.Ir; +const Builder = Ir.Builder; + const Builtins = @import("Builtins.zig"); const Builtin = Builtins.Builtin; const Compilation = @import("Compilation.zig"); -const Builder = Ir.Builder; const StrInt = @import("StringInterner.zig"); const StringId = StrInt.StringId; const Tree = @import("Tree.zig"); diff --git a/src/aro/Compilation.zig b/src/aro/Compilation.zig index ba5e6baaa..15ce109f3 100644 --- a/src/aro/Compilation.zig +++ b/src/aro/Compilation.zig @@ -1,23 +1,25 @@ const std = @import("std"); -const Allocator = mem.Allocator; const assert = std.debug.assert; const EpochSeconds = std.time.epoch.EpochSeconds; const mem = std.mem; +const Allocator = mem.Allocator; + const backend = @import("backend"); const Interner = backend.Interner; const CodeGenOptions = backend.CodeGenOptions; + const Builtins = @import("Builtins.zig"); const Builtin = Builtins.Builtin; const Diagnostics = @import("Diagnostics.zig"); const LangOpts = @import("LangOpts.zig"); +const Pragma = @import("Pragma.zig"); +const record_layout = @import("record_layout.zig"); const Source = @import("Source.zig"); +const StrInt = @import("StringInterner.zig"); +const target_util = @import("target.zig"); const Tokenizer = @import("Tokenizer.zig"); const Token = Tokenizer.Token; const Type = @import("Type.zig"); -const Pragma = @import("Pragma.zig"); -const StrInt = @import("StringInterner.zig"); -const record_layout = @import("record_layout.zig"); -const target_util = @import("target.zig"); pub const Error = error{ /// A fatal error has ocurred and compilation has stopped. diff --git a/src/aro/Diagnostics.zig b/src/aro/Diagnostics.zig index 79287397e..fb290a981 100644 --- a/src/aro/Diagnostics.zig +++ b/src/aro/Diagnostics.zig @@ -1,15 +1,17 @@ const std = @import("std"); -const Allocator = mem.Allocator; const mem = std.mem; -const Source = @import("Source.zig"); -const Compilation = @import("Compilation.zig"); +const Allocator = mem.Allocator; + const Attribute = @import("Attribute.zig"); const Builtins = @import("Builtins.zig"); const Builtin = Builtins.Builtin; const Header = @import("Builtins/Properties.zig").Header; +const Compilation = @import("Compilation.zig"); +const LangOpts = @import("LangOpts.zig"); +const Source = @import("Source.zig"); const Tree = @import("Tree.zig"); + const is_windows = @import("builtin").os.tag == .windows; -const LangOpts = @import("LangOpts.zig"); pub const Message = struct { tag: Tag, diff --git a/src/aro/Driver.zig b/src/aro/Driver.zig index 87200d415..927ed16dc 100644 --- a/src/aro/Driver.zig +++ b/src/aro/Driver.zig @@ -2,18 +2,19 @@ const std = @import("std"); const mem = std.mem; const Allocator = mem.Allocator; const process = std.process; -const StaticStringSet = std.StaticStringMap(void); + const backend = @import("backend"); const Ir = backend.Ir; const Object = backend.Object; + const Compilation = @import("Compilation.zig"); const Diagnostics = @import("Diagnostics.zig"); +const GCCVersion = @import("Driver/GCCVersion.zig"); const LangOpts = @import("LangOpts.zig"); const Preprocessor = @import("Preprocessor.zig"); const Source = @import("Source.zig"); -const Toolchain = @import("Toolchain.zig"); const target_util = @import("target.zig"); -const GCCVersion = @import("Driver/GCCVersion.zig"); +const Toolchain = @import("Toolchain.zig"); pub const Linker = enum { ld, @@ -23,7 +24,7 @@ pub const Linker = enum { mold, }; -const pic_related_options = StaticStringSet.initComptime(.{ +const pic_related_options = std.StaticStringMap(void).initComptime(.{ .{"-fpic"}, .{"-fno-pic"}, .{"-fPIC"}, diff --git a/src/aro/Driver/GCCDetector.zig b/src/aro/Driver/GCCDetector.zig index 720254316..1c93a5912 100644 --- a/src/aro/Driver/GCCDetector.zig +++ b/src/aro/Driver/GCCDetector.zig @@ -1,9 +1,11 @@ const std = @import("std"); -const Toolchain = @import("../Toolchain.zig"); -const target_util = @import("../target.zig"); + const system_defaults = @import("system_defaults"); + const GCCVersion = @import("GCCVersion.zig"); const Multilib = @import("Multilib.zig"); +const target_util = @import("../target.zig"); +const Toolchain = @import("../Toolchain.zig"); const GCCDetector = @This(); diff --git a/src/aro/Hideset.zig b/src/aro/Hideset.zig index ad8a089ae..5c6e9534b 100644 --- a/src/aro/Hideset.zig +++ b/src/aro/Hideset.zig @@ -10,8 +10,9 @@ const std = @import("std"); const mem = std.mem; const Allocator = mem.Allocator; -const Source = @import("Source.zig"); + const Compilation = @import("Compilation.zig"); +const Source = @import("Source.zig"); const Tokenizer = @import("Tokenizer.zig"); pub const Hideset = @This(); diff --git a/src/aro/InitList.zig b/src/aro/InitList.zig index 7e9f73e8a..1fc0031e5 100644 --- a/src/aro/InitList.zig +++ b/src/aro/InitList.zig @@ -3,14 +3,14 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const testing = std.testing; + +const Diagnostics = @import("Diagnostics.zig"); +const Parser = @import("Parser.zig"); const Tree = @import("Tree.zig"); const Token = Tree.Token; const TokenIndex = Tree.TokenIndex; const NodeIndex = Tree.NodeIndex; const Type = @import("Type.zig"); -const Diagnostics = @import("Diagnostics.zig"); -const NodeList = std.ArrayList(NodeIndex); -const Parser = @import("Parser.zig"); const Item = struct { list: InitList = .{}, diff --git a/src/aro/LangOpts.zig b/src/aro/LangOpts.zig index e7b2ebf6c..2fb84be4d 100644 --- a/src/aro/LangOpts.zig +++ b/src/aro/LangOpts.zig @@ -1,6 +1,7 @@ const std = @import("std"); -const DiagnosticTag = @import("Diagnostics.zig").Tag; + const char_info = @import("char_info.zig"); +const DiagnosticTag = @import("Diagnostics.zig").Tag; pub const Compiler = enum { clang, diff --git a/src/aro/Parser.zig b/src/aro/Parser.zig index 63e9b2850..929d54e26 100644 --- a/src/aro/Parser.zig +++ b/src/aro/Parser.zig @@ -3,10 +3,25 @@ const mem = std.mem; const Allocator = mem.Allocator; const assert = std.debug.assert; const big = std.math.big; + +const Attribute = @import("Attribute.zig"); +const Builtins = @import("Builtins.zig"); +const Builtin = Builtins.Builtin; +const evalBuiltin = @import("Builtins/eval.zig").eval; +const char_info = @import("char_info.zig"); const Compilation = @import("Compilation.zig"); +const Diagnostics = @import("Diagnostics.zig"); +const InitList = @import("InitList.zig"); +const Preprocessor = @import("Preprocessor.zig"); +const record_layout = @import("record_layout.zig"); const Source = @import("Source.zig"); +const StrInt = @import("StringInterner.zig"); +const StringId = StrInt.StringId; +const SymbolStack = @import("SymbolStack.zig"); +const Symbol = SymbolStack.Symbol; +const target_util = @import("target.zig"); +const text_literal = @import("text_literal.zig"); const Tokenizer = @import("Tokenizer.zig"); -const Preprocessor = @import("Preprocessor.zig"); const Tree = @import("Tree.zig"); const Token = Tree.Token; const NumberPrefix = Token.NumberPrefix; @@ -14,23 +29,9 @@ const NumberSuffix = Token.NumberSuffix; const TokenIndex = Tree.TokenIndex; const NodeIndex = Tree.NodeIndex; const Type = @import("Type.zig"); -const Diagnostics = @import("Diagnostics.zig"); -const NodeList = std.ArrayList(NodeIndex); -const InitList = @import("InitList.zig"); -const Attribute = @import("Attribute.zig"); -const char_info = @import("char_info.zig"); -const text_literal = @import("text_literal.zig"); const Value = @import("Value.zig"); -const SymbolStack = @import("SymbolStack.zig"); -const Symbol = SymbolStack.Symbol; -const record_layout = @import("record_layout.zig"); -const StrInt = @import("StringInterner.zig"); -const StringId = StrInt.StringId; -const Builtins = @import("Builtins.zig"); -const Builtin = Builtins.Builtin; -const evalBuiltin = @import("Builtins/eval.zig").eval; -const target_util = @import("target.zig"); +const NodeList = std.ArrayList(NodeIndex); const Switch = struct { default: ?TokenIndex = null, ranges: std.ArrayList(Range), diff --git a/src/aro/Pragma.zig b/src/aro/Pragma.zig index 279ac5f00..d9bd933f7 100644 --- a/src/aro/Pragma.zig +++ b/src/aro/Pragma.zig @@ -1,7 +1,8 @@ const std = @import("std"); + const Compilation = @import("Compilation.zig"); -const Preprocessor = @import("Preprocessor.zig"); const Parser = @import("Parser.zig"); +const Preprocessor = @import("Preprocessor.zig"); const TokenIndex = @import("Tree.zig").TokenIndex; pub const Error = Compilation.Error || error{ UnknownPragma, StopPreprocessing }; diff --git a/src/aro/Preprocessor.zig b/src/aro/Preprocessor.zig index aafebb13b..51d498be7 100644 --- a/src/aro/Preprocessor.zig +++ b/src/aro/Preprocessor.zig @@ -2,19 +2,20 @@ const std = @import("std"); const mem = std.mem; const Allocator = mem.Allocator; const assert = std.debug.assert; + +const Attribute = @import("Attribute.zig"); const Compilation = @import("Compilation.zig"); const Error = Compilation.Error; +const Diagnostics = @import("Diagnostics.zig"); +const features = @import("features.zig"); +const Hideset = @import("Hideset.zig"); +const Parser = @import("Parser.zig"); const Source = @import("Source.zig"); const Tokenizer = @import("Tokenizer.zig"); const RawToken = Tokenizer.Token; -const Parser = @import("Parser.zig"); -const Diagnostics = @import("Diagnostics.zig"); const Tree = @import("Tree.zig"); const Token = Tree.Token; const TokenWithExpansionLocs = Tree.TokenWithExpansionLocs; -const Attribute = @import("Attribute.zig"); -const features = @import("features.zig"); -const Hideset = @import("Hideset.zig"); const DefineMap = std.StringHashMapUnmanaged(Macro); const RawTokenList = std.ArrayList(RawToken); diff --git a/src/aro/SymbolStack.zig b/src/aro/SymbolStack.zig index be2ee20cb..333396aa5 100644 --- a/src/aro/SymbolStack.zig +++ b/src/aro/SymbolStack.zig @@ -2,14 +2,15 @@ const std = @import("std"); const mem = std.mem; const Allocator = mem.Allocator; const assert = std.debug.assert; + +const Parser = @import("Parser.zig"); +const StringId = @import("StringInterner.zig").StringId; const Tree = @import("Tree.zig"); const Token = Tree.Token; const TokenIndex = Tree.TokenIndex; const NodeIndex = Tree.NodeIndex; const Type = @import("Type.zig"); -const Parser = @import("Parser.zig"); const Value = @import("Value.zig"); -const StringId = @import("StringInterner.zig").StringId; const SymbolStack = @This(); diff --git a/src/aro/Tokenizer.zig b/src/aro/Tokenizer.zig index 7ab331038..fb0ecfe2b 100644 --- a/src/aro/Tokenizer.zig +++ b/src/aro/Tokenizer.zig @@ -1,8 +1,9 @@ const std = @import("std"); const assert = std.debug.assert; + const Compilation = @import("Compilation.zig"); -const Source = @import("Source.zig"); const LangOpts = @import("LangOpts.zig"); +const Source = @import("Source.zig"); pub const Token = struct { id: Id, diff --git a/src/aro/Toolchain.zig b/src/aro/Toolchain.zig index d10a1803e..0fc3f112b 100644 --- a/src/aro/Toolchain.zig +++ b/src/aro/Toolchain.zig @@ -1,12 +1,14 @@ const std = @import("std"); -const Driver = @import("Driver.zig"); -const Compilation = @import("Compilation.zig"); const mem = std.mem; + const system_defaults = @import("system_defaults"); + +const Compilation = @import("Compilation.zig"); +const Driver = @import("Driver.zig"); +const Filesystem = @import("Driver/Filesystem.zig").Filesystem; +const Multilib = @import("Driver/Multilib.zig"); const target_util = @import("target.zig"); const Linux = @import("toolchains/Linux.zig"); -const Multilib = @import("Driver/Multilib.zig"); -const Filesystem = @import("Driver/Filesystem.zig").Filesystem; pub const PathList = std.ArrayListUnmanaged([]const u8); diff --git a/src/aro/Tree.zig b/src/aro/Tree.zig index 5b37e642a..4ec252531 100644 --- a/src/aro/Tree.zig +++ b/src/aro/Tree.zig @@ -1,14 +1,16 @@ const std = @import("std"); + const Interner = @import("backend").Interner; + const Attribute = @import("Attribute.zig"); const CodeGen = @import("CodeGen.zig"); const Compilation = @import("Compilation.zig"); const number_affixes = @import("Tree/number_affixes.zig"); const Source = @import("Source.zig"); +const StringInterner = @import("StringInterner.zig"); const Tokenizer = @import("Tokenizer.zig"); const Type = @import("Type.zig"); const Value = @import("Value.zig"); -const StringInterner = @import("StringInterner.zig"); pub const Token = struct { id: Id, diff --git a/src/aro/Type.zig b/src/aro/Type.zig index 8ab2d3164..53d910a10 100644 --- a/src/aro/Type.zig +++ b/src/aro/Type.zig @@ -1,14 +1,15 @@ const std = @import("std"); -const Tree = @import("Tree.zig"); -const TokenIndex = Tree.TokenIndex; -const NodeIndex = Tree.NodeIndex; -const Parser = @import("Parser.zig"); -const Compilation = @import("Compilation.zig"); + const Attribute = @import("Attribute.zig"); +const Compilation = @import("Compilation.zig"); +const LangOpts = @import("LangOpts.zig"); +const Parser = @import("Parser.zig"); const StringInterner = @import("StringInterner.zig"); const StringId = StringInterner.StringId; const target_util = @import("target.zig"); -const LangOpts = @import("LangOpts.zig"); +const Tree = @import("Tree.zig"); +const TokenIndex = Tree.TokenIndex; +const NodeIndex = Tree.NodeIndex; pub const Qualifiers = packed struct { @"const": bool = false, diff --git a/src/aro/Value.zig b/src/aro/Value.zig index 5c5a3e060..0221ecac5 100644 --- a/src/aro/Value.zig +++ b/src/aro/Value.zig @@ -2,14 +2,16 @@ const std = @import("std"); const assert = std.debug.assert; const BigIntConst = std.math.big.int.Const; const BigIntMutable = std.math.big.int.Mutable; + const Interner = @import("backend").Interner; const BigIntSpace = Interner.Tag.Int.BigIntSpace; + +const annex_g = @import("annex_g.zig"); +const Compilation = @import("Compilation.zig"); const StringInterner = @import("StringInterner.zig"); const StringId = StringInterner.StringId; -const Compilation = @import("Compilation.zig"); -const Type = @import("Type.zig"); const target_util = @import("target.zig"); -const annex_g = @import("annex_g.zig"); +const Type = @import("Type.zig"); const Value = @This(); diff --git a/src/aro/pragmas/gcc.zig b/src/aro/pragmas/gcc.zig index 91ab750b4..abdadc81a 100644 --- a/src/aro/pragmas/gcc.zig +++ b/src/aro/pragmas/gcc.zig @@ -1,10 +1,11 @@ const std = @import("std"); const mem = std.mem; + const Compilation = @import("../Compilation.zig"); -const Pragma = @import("../Pragma.zig"); const Diagnostics = @import("../Diagnostics.zig"); -const Preprocessor = @import("../Preprocessor.zig"); const Parser = @import("../Parser.zig"); +const Pragma = @import("../Pragma.zig"); +const Preprocessor = @import("../Preprocessor.zig"); const TokenIndex = @import("../Tree.zig").TokenIndex; const GCC = @This(); diff --git a/src/aro/pragmas/message.zig b/src/aro/pragmas/message.zig index a364c6d8c..f981a63b9 100644 --- a/src/aro/pragmas/message.zig +++ b/src/aro/pragmas/message.zig @@ -1,12 +1,13 @@ const std = @import("std"); const mem = std.mem; + const Compilation = @import("../Compilation.zig"); -const Pragma = @import("../Pragma.zig"); const Diagnostics = @import("../Diagnostics.zig"); -const Preprocessor = @import("../Preprocessor.zig"); const Parser = @import("../Parser.zig"); -const TokenIndex = @import("../Tree.zig").TokenIndex; +const Pragma = @import("../Pragma.zig"); +const Preprocessor = @import("../Preprocessor.zig"); const Source = @import("../Source.zig"); +const TokenIndex = @import("../Tree.zig").TokenIndex; const Message = @This(); diff --git a/src/aro/pragmas/once.zig b/src/aro/pragmas/once.zig index 21d6c9854..6ae2521d3 100644 --- a/src/aro/pragmas/once.zig +++ b/src/aro/pragmas/once.zig @@ -1,12 +1,13 @@ const std = @import("std"); const mem = std.mem; + const Compilation = @import("../Compilation.zig"); -const Pragma = @import("../Pragma.zig"); const Diagnostics = @import("../Diagnostics.zig"); -const Preprocessor = @import("../Preprocessor.zig"); const Parser = @import("../Parser.zig"); -const TokenIndex = @import("../Tree.zig").TokenIndex; +const Pragma = @import("../Pragma.zig"); +const Preprocessor = @import("../Preprocessor.zig"); const Source = @import("../Source.zig"); +const TokenIndex = @import("../Tree.zig").TokenIndex; const Once = @This(); diff --git a/src/aro/pragmas/pack.zig b/src/aro/pragmas/pack.zig index 81d1dbc59..f9de0d992 100644 --- a/src/aro/pragmas/pack.zig +++ b/src/aro/pragmas/pack.zig @@ -1,10 +1,11 @@ const std = @import("std"); const mem = std.mem; + const Compilation = @import("../Compilation.zig"); -const Pragma = @import("../Pragma.zig"); const Diagnostics = @import("../Diagnostics.zig"); -const Preprocessor = @import("../Preprocessor.zig"); const Parser = @import("../Parser.zig"); +const Pragma = @import("../Pragma.zig"); +const Preprocessor = @import("../Preprocessor.zig"); const Tree = @import("../Tree.zig"); const TokenIndex = Tree.TokenIndex; diff --git a/src/aro/record_layout.zig b/src/aro/record_layout.zig index da0517d9f..6b282bfbb 100644 --- a/src/aro/record_layout.zig +++ b/src/aro/record_layout.zig @@ -2,15 +2,16 @@ //! Licensed under MIT license: https://github.com/mahkoh/repr-c/tree/master/repc/facade const std = @import("std"); -const Type = @import("Type.zig"); + const Attribute = @import("Attribute.zig"); const Compilation = @import("Compilation.zig"); const Parser = @import("Parser.zig"); +const target_util = @import("target.zig"); +const Type = @import("Type.zig"); const Record = Type.Record; const Field = Record.Field; const TypeLayout = Type.TypeLayout; const FieldLayout = Type.FieldLayout; -const target_util = @import("target.zig"); const BITS_PER_BYTE = 8; diff --git a/src/aro/target.zig b/src/aro/target.zig index f40ab3c67..226f5ccdb 100644 --- a/src/aro/target.zig +++ b/src/aro/target.zig @@ -1,8 +1,10 @@ const std = @import("std"); + +const backend = @import("backend"); + const LangOpts = @import("LangOpts.zig"); -const Type = @import("Type.zig"); const TargetSet = @import("Builtins/Properties.zig").TargetSet; -const backend = @import("backend"); +const Type = @import("Type.zig"); /// intmax_t for this target pub fn intMaxType(target: std.Target) Type { diff --git a/src/aro/text_literal.zig b/src/aro/text_literal.zig index 7bc8fd95c..122173db8 100644 --- a/src/aro/text_literal.zig +++ b/src/aro/text_literal.zig @@ -1,11 +1,12 @@ //! Parsing and classification of string and character literals const std = @import("std"); +const mem = std.mem; + const Compilation = @import("Compilation.zig"); -const Type = @import("Type.zig"); const Diagnostics = @import("Diagnostics.zig"); const Tokenizer = @import("Tokenizer.zig"); -const mem = std.mem; +const Type = @import("Type.zig"); pub const Item = union(enum) { /// decoded hex or character escape diff --git a/src/aro/toolchains/Linux.zig b/src/aro/toolchains/Linux.zig index afda89fbc..dd35f0faf 100644 --- a/src/aro/toolchains/Linux.zig +++ b/src/aro/toolchains/Linux.zig @@ -1,12 +1,14 @@ const std = @import("std"); const mem = std.mem; + +const system_defaults = @import("system_defaults"); + const Compilation = @import("../Compilation.zig"); -const GCCDetector = @import("../Driver/GCCDetector.zig"); -const Toolchain = @import("../Toolchain.zig"); const Driver = @import("../Driver.zig"); const Distro = @import("../Driver/Distro.zig"); +const GCCDetector = @import("../Driver/GCCDetector.zig"); const target_util = @import("../target.zig"); -const system_defaults = @import("system_defaults"); +const Toolchain = @import("../Toolchain.zig"); const Linux = @This(); diff --git a/src/backend.zig b/src/backend.zig index 24f4e27fa..a6e6f85d0 100644 --- a/src/backend.zig +++ b/src/backend.zig @@ -1,7 +1,7 @@ +pub const CodeGenOptions = @import("backend/CodeGenOptions.zig"); pub const Interner = @import("backend/Interner.zig"); pub const Ir = @import("backend/Ir.zig"); pub const Object = @import("backend/Object.zig"); -pub const CodeGenOptions = @import("backend/CodeGenOptions.zig"); pub const CallingConvention = enum { C,