Skip to content

Commit 1ccdf78

Browse files
committed
Case insensitivity for platform names
1 parent 26db009 commit 1ccdf78

2 files changed

Lines changed: 36 additions & 31 deletions

File tree

IDE/src/Workspace.bf

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,19 @@ namespace IDE
123123
if (!targetTriple.IsWhiteSpace)
124124
return TargetTriple.GetPlatformType(targetTriple);
125125

126-
switch (name)
127-
{
128-
case "Win32", "Win64": return .Windows;
129-
case "Linux32", "Linux64": return .Linux;
130-
case "macOS": return .macOS;
131-
case "iOS": return .iOS;
132-
case "wasm32", "wasm64": return .Wasm;
133-
case "none": return .None;
134-
default:
135-
return TargetTriple.GetPlatformType(name);
136-
}
126+
if ((name.Equals("Win32", true)) || (name.Equals("Win64", true)))
127+
return .Windows;
128+
if ((name.Equals("Linux32", true)) || (name.Equals("Linux64", true)))
129+
return .Linux;
130+
if (name.Equals("macOS", true))
131+
return .macOS;
132+
if (name.Equals("iOS", true))
133+
return .iOS;
134+
if ((name.Equals("wasm32", true)) || (name.Equals("wasm64", true)))
135+
return .Wasm;
136+
if (name.Equals("none", true))
137+
return .None;
138+
return TargetTriple.GetPlatformType(name);
137139
}
138140

139141
public static PlatformType GetHostPlatform()
@@ -158,42 +160,43 @@ namespace IDE
158160
{
159161
if ((name.EndsWith("32")) && (!TargetTriple.IsTargetTriple(name)))
160162
return 4;
161-
if (name.StartsWith("armv"))
163+
if (name.StartsWith("armv", .OrdinalIgnoreCase))
162164
return 4;
163-
if (name.StartsWith("i686-"))
165+
if (name.StartsWith("i686-", .OrdinalIgnoreCase))
164166
return 4;
165167
return 8;
166168
}
167169

168170
public static bool GetTargetTripleByName(String name, ToolsetType toolsetType, String outTriple)
169171
{
170-
switch (name)
171-
{
172-
case "Win32":
172+
if (name.Equals("Win32", .OrdinalIgnoreCase))
173173
outTriple.Append((toolsetType == .GNU) ? "i686-pc-windows-gnu" : "i686-pc-windows-msvc");
174-
case "Win64":
174+
else if (name.Equals("Win64", .OrdinalIgnoreCase))
175175
outTriple.Append((toolsetType == .GNU) ? "x86_64-pc-windows-gnu" : "x86_64-pc-windows-msvc");
176-
case "Linux32":
176+
else if (name.Equals("Linux32", .OrdinalIgnoreCase))
177177
outTriple.Append("i686-unknown-linux-gnu");
178-
case "Linux64":
178+
else if (name.Equals("Linux64", .OrdinalIgnoreCase))
179+
{
179180
if (IDEApp.sArch64Name == "aarch64")
180181
outTriple.Append("aarch64-unknown-linux-gnu");
181182
else
182183
outTriple.Append("x86_64-unknown-linux-gnu");
183-
case "macOS":
184+
}
185+
else if (name.Equals("macOS", .OrdinalIgnoreCase))
186+
{
184187
if (IDEApp.sArch64Name == "aarch64")
185188
outTriple.Append("aarch64-apple-macosx11.0.0");
186189
else
187190
outTriple.Append("x86_64-apple-macosx10.8.0");
188-
case "iOS":
191+
}
192+
else if (name.Equals("iOS", .OrdinalIgnoreCase))
189193
outTriple.Append("arm64-apple-ios");
190-
case "wasm32":
194+
else if (name.Equals("wasm32", .OrdinalIgnoreCase))
191195
outTriple.Append("wasm32-unknown-emscripten");
192-
case "wasm64":
196+
else if (name.Equals("wasm64", .OrdinalIgnoreCase))
193197
outTriple.Append("wasm64-unknown-emscripten");
194-
default:
198+
else
195199
return false;
196-
}
197200
return true;
198201
}
199202
}

IDEHelper/Compiler/BfCompiler.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11164,18 +11164,20 @@ BF_EXPORT void BF_CALLTYPE BfCompiler_SetOptions(BfCompiler* bfCompiler, BfProje
1116411164
options->mTargetTriple = targetTriple;
1116511165
options->mTargetCPU = targetCPU;
1116611166

11167-
if (options->mTargetTriple.StartsWith("x86_64-"))
11167+
if (options->mTargetTriple.StartsWith("x86_64-", StringImpl::CompareKind_OrdinalIgnoreCase))
1116811168
options->mMachineType = BfMachineType_x64;
11169-
else if ((options->mTargetTriple.StartsWith("i686-")) || (options->mTargetTriple.StartsWith("i386-")))
11169+
else if ((options->mTargetTriple.StartsWith("i686-", StringImpl::CompareKind_OrdinalIgnoreCase)) || (options->mTargetTriple.StartsWith("i386-", StringImpl::CompareKind_OrdinalIgnoreCase)))
1117011170
options->mMachineType = BfMachineType_x86;
11171-
else if ((options->mTargetTriple.StartsWith("arm64")) || (options->mTargetTriple.StartsWith("aarch64")))
11171+
else if ((options->mTargetTriple.StartsWith("arm64", StringImpl::CompareKind_OrdinalIgnoreCase)) || (options->mTargetTriple.StartsWith("aarch64", StringImpl::CompareKind_OrdinalIgnoreCase)))
1117211172
options->mMachineType = BfMachineType_AArch64;
11173-
else if (options->mTargetTriple.StartsWith("armv"))
11173+
else if (options->mTargetTriple.StartsWith("armv", StringImpl::CompareKind_OrdinalIgnoreCase))
1117411174
options->mMachineType = BfMachineType_ARM;
11175-
else if (options->mTargetTriple.StartsWith("wasm32"))
11175+
else if (options->mTargetTriple.StartsWith("wasm32", StringImpl::CompareKind_OrdinalIgnoreCase))
1117611176
options->mMachineType = BfMachineType_Wasm32;
11177-
else if (options->mTargetTriple.StartsWith("wasm64"))
11177+
else if (options->mTargetTriple.StartsWith("wasm64", StringImpl::CompareKind_OrdinalIgnoreCase))
1117811178
options->mMachineType = BfMachineType_Wasm64;
11179+
else if (options->mTargetTriple.EndsWith("32"))
11180+
options->mMachineType = BfMachineType_Wasm32;
1117911181
else
1118011182
options->mMachineType = BfMachineType_x64; // Default
1118111183

0 commit comments

Comments
 (0)