| ... | ... | @@ -2,6 +2,7 @@ const std = @import("std"); |
| 2 | 2 | const fs = std.fs; |
| 3 | 3 | const io = std.io; |
| 4 | 4 | const mem = std.mem; |
| 5 | const meta = std.meta; |
| 5 | 6 | const Allocator = mem.Allocator; |
| 6 | 7 | const Target = std.Target; |
| 7 | 8 | const target = @import("target.zig"); |
| ... | ... | @@ -35,27 +36,25 @@ pub fn cmdTargets( |
| 35 | 36 | |
| 36 | 37 | try jws.objectField("arch"); |
| 37 | 38 | try jws.beginArray(); |
| 38 | | { |
| 39 | | inline for (@typeInfo(Target.Cpu.Arch).Enum.fields) |field| { |
| 40 | | try jws.arrayElem(); |
| 41 | | try jws.emitString(field.name); |
| 42 | | } |
| 39 | for (meta.fieldNames(Target.Cpu.Arch)) |field| { |
| 40 | try jws.arrayElem(); |
| 41 | try jws.emitString(field); |
| 43 | 42 | } |
| 44 | 43 | try jws.endArray(); |
| 45 | 44 | |
| 46 | 45 | try jws.objectField("os"); |
| 47 | 46 | try jws.beginArray(); |
| 48 | | inline for (@typeInfo(Target.Os.Tag).Enum.fields) |field| { |
| 47 | for (meta.fieldNames(Target.Os.Tag)) |field| { |
| 49 | 48 | try jws.arrayElem(); |
| 50 | | try jws.emitString(field.name); |
| 49 | try jws.emitString(field); |
| 51 | 50 | } |
| 52 | 51 | try jws.endArray(); |
| 53 | 52 | |
| 54 | 53 | try jws.objectField("abi"); |
| 55 | 54 | try jws.beginArray(); |
| 56 | | inline for (@typeInfo(Target.Abi).Enum.fields) |field| { |
| 55 | for (meta.fieldNames(Target.Abi)) |field| { |
| 57 | 56 | try jws.arrayElem(); |
| 58 | | try jws.emitString(field.name); |
| 57 | try jws.emitString(field); |
| 59 | 58 | } |
| 60 | 59 | try jws.endArray(); |
| 61 | 60 | |
| ... | ... | @@ -84,10 +83,9 @@ pub fn cmdTargets( |
| 84 | 83 | |
| 85 | 84 | try jws.objectField("cpus"); |
| 86 | 85 | try jws.beginObject(); |
| 87 | | inline for (@typeInfo(Target.Cpu.Arch).Enum.fields) |field| { |
| 88 | | try jws.objectField(field.name); |
| 86 | for (meta.tags(Target.Cpu.Arch)) |arch| { |
| 87 | try jws.objectField(@tagName(arch)); |
| 89 | 88 | try jws.beginObject(); |
| 90 | | const arch = @field(Target.Cpu.Arch, field.name); |
| 91 | 89 | for (arch.allCpuModels()) |model| { |
| 92 | 90 | try jws.objectField(model.name); |
| 93 | 91 | try jws.beginArray(); |
| ... | ... | @@ -105,10 +103,9 @@ pub fn cmdTargets( |
| 105 | 103 | |
| 106 | 104 | try jws.objectField("cpuFeatures"); |
| 107 | 105 | try jws.beginObject(); |
| 108 | | inline for (@typeInfo(Target.Cpu.Arch).Enum.fields) |field| { |
| 109 | | try jws.objectField(field.name); |
| 106 | for (meta.tags(Target.Cpu.Arch)) |arch| { |
| 107 | try jws.objectField(@tagName(arch)); |
| 110 | 108 | try jws.beginArray(); |
| 111 | | const arch = @field(Target.Cpu.Arch, field.name); |
| 112 | 109 | for (arch.allFeaturesList()) |feature| { |
| 113 | 110 | try jws.arrayElem(); |
| 114 | 111 | try jws.emitString(feature.name); |