From 78f15bc7147da4407f1b896ad76f4c19851bd7b9 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 5 Feb 2024 18:13:07 -0700 Subject: [PATCH] compiler: rename value.zig to Value.zig This commit only does the file rename to be friendlier to version control conflicts. --- CMakeLists.txt | 2 +- src/Air.zig | 2 +- src/Compilation.zig | 2 +- src/InternPool.zig | 2 +- src/Module.zig | 2 +- src/RangeSet.zig | 2 +- src/Sema.zig | 2 +- src/TypedValue.zig | 2 +- src/{value.zig => Value.zig} | 0 src/arch/aarch64/CodeGen.zig | 2 +- src/arch/arm/CodeGen.zig | 2 +- src/arch/riscv64/CodeGen.zig | 2 +- src/arch/wasm/CodeGen.zig | 2 +- src/arch/x86_64/CodeGen.zig | 2 +- src/arch/x86_64/abi.zig | 2 +- src/codegen.zig | 2 +- src/codegen/c.zig | 2 +- src/codegen/llvm.zig | 2 +- src/codegen/spirv.zig | 2 +- src/link/C.zig | 2 +- src/link/Coff.zig | 2 +- src/link/Dwarf.zig | 2 +- src/link/Elf/ZigObject.zig | 2 +- src/link/MachO/ZigObject.zig | 2 +- src/link/Plan9.zig | 2 +- src/link/SpirV.zig | 2 +- src/link/Wasm.zig | 2 +- src/print_air.zig | 2 +- src/type.zig | 2 +- 29 files changed, 28 insertions(+), 28 deletions(-) rename src/{value.zig => Value.zig} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0942f9530add43680ad4dcea9f7c76788cb7d0be..9f486ed64f22ab1301b0b89e3f09b302880ca14d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,6 +529,7 @@ set(ZIG_STAGE2_SOURCES "${CMAKE_SOURCE_DIR}/src/RangeSet.zig" "${CMAKE_SOURCE_DIR}/src/Sema.zig" "${CMAKE_SOURCE_DIR}/src/TypedValue.zig" + "${CMAKE_SOURCE_DIR}/src/Value.zig" "${CMAKE_SOURCE_DIR}/src/Zir.zig" "${CMAKE_SOURCE_DIR}/src/arch/aarch64/CodeGen.zig" "${CMAKE_SOURCE_DIR}/src/arch/aarch64/Emit.zig" @@ -644,7 +645,6 @@ set(ZIG_STAGE2_SOURCES "${CMAKE_SOURCE_DIR}/src/translate_c.zig" "${CMAKE_SOURCE_DIR}/src/translate_c/ast.zig" "${CMAKE_SOURCE_DIR}/src/type.zig" - "${CMAKE_SOURCE_DIR}/src/value.zig" "${CMAKE_SOURCE_DIR}/src/wasi_libc.zig" "${CMAKE_SOURCE_DIR}/src/windows_sdk.zig" "${CMAKE_SOURCE_DIR}/src/stubs/aro_builtins.zig" diff --git a/src/Air.zig b/src/Air.zig index d030cd3c229f4448dd83b61b306f839b4088f832..ee6bacc06d9c9bc2c1b0cd4af220c09c9c37bd45 100644 --- a/src/Air.zig +++ b/src/Air.zig @@ -8,7 +8,7 @@ const builtin = @import("builtin"); const assert = std.debug.assert; const Air = @This(); -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const InternPool = @import("InternPool.zig"); const Module = @import("Module.zig"); diff --git a/src/Compilation.zig b/src/Compilation.zig index e837004779f3b96a9db1dbc4b53da508d944c67d..b735b15f79c2133d50c731538079d1a34bf8ebb3 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -11,7 +11,7 @@ const ThreadPool = std.Thread.Pool; const WaitGroup = std.Thread.WaitGroup; const ErrorBundle = std.zig.ErrorBundle; -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const target_util = @import("target.zig"); const Package = @import("Package.zig"); diff --git a/src/InternPool.zig b/src/InternPool.zig index 01cd41942d3ea1e2a7fc295de9f9431269d5891a..c27f99e3dbdecae52a09198b25359fcd22c0a36c 100644 --- a/src/InternPool.zig +++ b/src/InternPool.zig @@ -6147,7 +6147,7 @@ fn finishFuncInstance( .has_tv = true, .owns_tv = true, .ty = @import("type.zig").Type.fromInterned(func_ty), - .val = @import("value.zig").Value.fromInterned(func_index), + .val = @import("Value.zig").fromInterned(func_index), .alignment = .none, .@"linksection" = section, .@"addrspace" = fn_owner_decl.@"addrspace", diff --git a/src/Module.zig b/src/Module.zig index 1b3342f77543ee6d4e7c8019979d1a8477299449..716ea7c9e5f244fef7e5aae2264f42b978e7f8ab 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -19,7 +19,7 @@ const Module = Zcu; const Zcu = @This(); const Compilation = @import("Compilation.zig"); const Cache = std.Build.Cache; -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const TypedValue = @import("TypedValue.zig"); const Package = @import("Package.zig"); diff --git a/src/RangeSet.zig b/src/RangeSet.zig index 158f81612964c5762c9223297bd873dcd06c0294..00dc257d1a7c725850118a3f12be40ebb7b98631 100644 --- a/src/RangeSet.zig +++ b/src/RangeSet.zig @@ -4,7 +4,7 @@ const Order = std.math.Order; const InternPool = @import("InternPool.zig"); const Type = @import("type.zig").Type; -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Module = @import("Module.zig"); const RangeSet = @This(); const SwitchProngSrc = @import("Module.zig").SwitchProngSrc; diff --git a/src/Sema.zig b/src/Sema.zig index 1777553469fc1d7e5f31d7a6cd57c37304e5530d..971c3d4a20c1acb3fe617d85e3bfb448cf5e78f3 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -149,7 +149,7 @@ const assert = std.debug.assert; const log = std.log.scoped(.sema); const Sema = @This(); -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const TypedValue = @import("TypedValue.zig"); const Air = @import("Air.zig"); diff --git a/src/TypedValue.zig b/src/TypedValue.zig index 54c9bb791f870da24851d1c5c294ccdc326eb732..c6f60736137cfc740050fda4a928598a8ebd397e 100644 --- a/src/TypedValue.zig +++ b/src/TypedValue.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Type = @import("type.zig").Type; -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Module = @import("Module.zig"); const Allocator = std.mem.Allocator; const TypedValue = @This(); diff --git a/src/value.zig b/src/Value.zig similarity index 100% rename from src/value.zig rename to src/Value.zig diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index fa44ede1178d7c7cfd771e7354d3efdb79dea051..750edb45a89d33a84450f1457a730a1367fe5106 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -9,7 +9,7 @@ const Mir = @import("Mir.zig"); const Emit = @import("Emit.zig"); const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const TypedValue = @import("../../TypedValue.zig"); const link = @import("../../link.zig"); const Module = @import("../../Module.zig"); diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index fc690bdec173de2edde79dc72773884a6fbe16dc..ed3434106f6b2f2a8977e79bed411d7412433d39 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -9,7 +9,7 @@ const Mir = @import("Mir.zig"); const Emit = @import("Emit.zig"); const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const TypedValue = @import("../../TypedValue.zig"); const link = @import("../../link.zig"); const Module = @import("../../Module.zig"); diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index e00bed5ada6a3e9e712ed14ff91427d8056896ab..fe46d0ddb630ad09f6978c17de50dec93c534051 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -8,7 +8,7 @@ const Mir = @import("Mir.zig"); const Emit = @import("Emit.zig"); const Liveness = @import("../../Liveness.zig"); const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const TypedValue = @import("../../TypedValue.zig"); const link = @import("../../link.zig"); const Module = @import("../../Module.zig"); diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 6237a8af23d1b9492623029b6452eeda791356e0..7745523978f580c451caf707d34462d6940b3b91 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -14,7 +14,7 @@ const Module = @import("../../Module.zig"); const InternPool = @import("../../InternPool.zig"); const Decl = Module.Decl; const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const Compilation = @import("../../Compilation.zig"); const LazySrcLoc = Module.LazySrcLoc; const link = @import("../../link.zig"); diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 212a30bbf40e654a8c28ab176994134cd9ac93dc..8ebb8613986ba687b98bf0d5be942147aa78fc92 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -33,7 +33,7 @@ const Alignment = InternPool.Alignment; const Target = std.Target; const Type = @import("../../type.zig").Type; const TypedValue = @import("../../TypedValue.zig"); -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const Instruction = @import("encoder.zig").Instruction; const abi = @import("abi.zig"); diff --git a/src/arch/x86_64/abi.zig b/src/arch/x86_64/abi.zig index 91ac0ce63af060a03a6154b3f0f2436f59dcac6f..1046e73fb6e310fa5954ea222b381ab78ff4dd98 100644 --- a/src/arch/x86_64/abi.zig +++ b/src/arch/x86_64/abi.zig @@ -570,4 +570,4 @@ const Module = @import("../../Module.zig"); const Register = @import("bits.zig").Register; const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager; const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); diff --git a/src/codegen.zig b/src/codegen.zig index dd851eeb032f5102e42780e45fa8de5e1f25560d..f16bf301a8e429fc8373060d8c40b3b0c8bdcd66 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -20,7 +20,7 @@ const Module = @import("Module.zig"); const Target = std.Target; const Type = @import("type.zig").Type; const TypedValue = @import("TypedValue.zig"); -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Zir = @import("Zir.zig"); const Alignment = InternPool.Alignment; diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 9907a95fefe83ce62185f85aeb287bc311a15b89..68e69e9caff99153c292e437f375d33a50d27fce 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -7,7 +7,7 @@ const log = std.log.scoped(.c); const link = @import("../link.zig"); const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const Type = @import("../type.zig").Type; const TypedValue = @import("../TypedValue.zig"); const C = link.File.C; diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index a703b900131c9ec63cf9ac820e1311f8dd263356..504c9ae1d196780cb95c1a42b948155b7d2c0108 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -21,7 +21,7 @@ const Package = @import("../Package.zig"); const TypedValue = @import("../TypedValue.zig"); const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const Type = @import("../type.zig").Type; const LazySrcLoc = Module.LazySrcLoc; const x86_64_abi = @import("../arch/x86_64/abi.zig"); diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig index 8bcc907436cd7494669f38d1b2dfe5c64efa1f3c..e1558e7f79d529656706882472653a5a3b569db8 100644 --- a/src/codegen/spirv.zig +++ b/src/codegen/spirv.zig @@ -7,7 +7,7 @@ const assert = std.debug.assert; const Module = @import("../Module.zig"); const Decl = Module.Decl; const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const LazySrcLoc = Module.LazySrcLoc; const Air = @import("../Air.zig"); const Zir = @import("../Zir.zig"); diff --git a/src/link/C.zig b/src/link/C.zig index 68facb374b2730a4475d75a35ed4143309171c5e..636436eebb74c4240254e76de545a88fafab1044 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -14,7 +14,7 @@ const codegen = @import("../codegen/c.zig"); const link = @import("../link.zig"); const trace = @import("../tracy.zig").trace; const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 7d825ef4d14d7150bdcbaaabcae867bcdef4267a..eb39ac9044fd80b79ad82310195fcb9a708a35a2 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -2753,7 +2753,7 @@ const Relocation = @import("Coff/Relocation.zig"); const TableSection = @import("table_section.zig").TableSection; const StringTable = @import("StringTable.zig"); const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const TypedValue = @import("../TypedValue.zig"); pub const base_tag: link.File.Tag = .coff; diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 17afe328fe452db96c106a0bb56c605b405c4b78..6607cdb119254eb748023aa5985162f4d6d2fc80 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -2847,4 +2847,4 @@ const Module = @import("../Module.zig"); const InternPool = @import("../InternPool.zig"); const StringTable = @import("StringTable.zig"); const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index ef8509e91589f232b961757ffcb96388c74fde2a..1437f4926afbbfc173eb6f4740f4732bf22d19ad 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -1667,6 +1667,6 @@ const Object = @import("Object.zig"); const Symbol = @import("Symbol.zig"); const StringTable = @import("../StringTable.zig"); const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const TypedValue = @import("../../TypedValue.zig"); const ZigObject = @This(); diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig index df2cac41db1fee95081bd26bee81164574d0daeb..bfa76627e45a2ce1476c7844aa2b353718750230 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -1462,6 +1462,6 @@ const Relocation = @import("Relocation.zig"); const Symbol = @import("Symbol.zig"); const StringTable = @import("../StringTable.zig"); const Type = @import("../../type.zig").Type; -const Value = @import("../../value.zig").Value; +const Value = @import("../../Value.zig"); const TypedValue = @import("../../TypedValue.zig"); const ZigObject = @This(); diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index a635b0bf5b23a5313aa80daf48bb497bd9f0a8cc..8b4287dcfd701ff288bfedc340ace6f6d47a1544 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -14,7 +14,7 @@ const build_options = @import("build_options"); const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const TypedValue = @import("../TypedValue.zig"); const std = @import("std"); diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig index e59af26ab7d214659de86a178ff2807fcc0a4fc8..6482778841afa83c5725b25100bc5f3a84f7dc89 100644 --- a/src/link/SpirV.zig +++ b/src/link/SpirV.zig @@ -36,7 +36,7 @@ const trace = @import("../tracy.zig").trace; const build_options = @import("build_options"); const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const SpvModule = @import("../codegen/spirv/Module.zig"); const spec = @import("../codegen/spirv/spec.zig"); diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 9fe8ce417e0fc1a3e1af31d379e727d5a3b641c6..42179ac5e8c3d1c21639f45278367d48f065de78 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -23,7 +23,7 @@ const build_options = @import("build_options"); const wasi_libc = @import("../wasi_libc.zig"); const Cache = std.Build.Cache; const Type = @import("../type.zig").Type; -const Value = @import("../value.zig").Value; +const Value = @import("../Value.zig"); const TypedValue = @import("../TypedValue.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; const Air = @import("../Air.zig"); diff --git a/src/print_air.zig b/src/print_air.zig index c79238e07c951027de7dede296beec3b972543d2..6f9ac1f7711555082cb8b0f2d45e1157a354a106 100644 --- a/src/print_air.zig +++ b/src/print_air.zig @@ -3,7 +3,7 @@ const Allocator = std.mem.Allocator; const fmtIntSizeBin = std.fmt.fmtIntSizeBin; const Module = @import("Module.zig"); -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const Type = @import("type.zig").Type; const Air = @import("Air.zig"); const Liveness = @import("Liveness.zig"); diff --git a/src/type.zig b/src/type.zig index 9ca2822204f2cd2d4151455d4a5f5271c84df9e5..4c7452ed0830be4edc555c4b576cf2576c4155ff 100644 --- a/src/type.zig +++ b/src/type.zig @@ -1,6 +1,6 @@ const std = @import("std"); const builtin = @import("builtin"); -const Value = @import("value.zig").Value; +const Value = @import("Value.zig"); const assert = std.debug.assert; const Target = std.Target; const Module = @import("Module.zig"); -- 2.54.0