Update to C++20

VaneBrain · Aug 14, 2022 · 3dbfd11 · 3dbfd11
1 parent 870fcb2
commit 3dbfd11
Show file tree

Hide file tree

Showing 106 changed files with 496 additions and 5,207 deletions.
diff --git a/MultiLang/English.cpp b/MultiLang/English.cpp
diff --git a/MultiLang/MultiLang.vcxproj b/MultiLang/MultiLang.vcxproj
@@ -127,7 +127,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="MultiLang.h" />
-    <ClInclude Include="sformat.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="English.cpp" />

diff --git a/MultiLang/MultiLang.vcxproj.filters b/MultiLang/MultiLang.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClInclude Include="MultiLang.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="sformat.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="English.cpp">

diff --git a/MultiLang/SimplifiedChinese.cpp b/MultiLang/SimplifiedChinese.cpp
diff --git a/MultiLang/sformat.h b/MultiLang/sformat.h
diff --git a/_release/help/commands/2d_commands/GetUserLanguage.htm b/_release/help/commands/2d_commands/GetUserLanguage.htm
@@ -5,7 +5,7 @@
 </head>
 
 <body>
-    <h1>GetUserLanguage</h1>
+    <h1>GetUserLanguageStrict</h1>
     <h1>Parameters</h1>
     <table>
         <tr>
@@ -18,7 +18,7 @@ <h1>Description</h1>
     <table>
         <tr>
             <td>
-                Get display language of current user.
+                Get display language of current user (for example, en-US).
             </td>
         </tr>
     </table>

diff --git a/bblaunch/bblaunch.vcxproj b/bblaunch/bblaunch.vcxproj
@@ -130,7 +130,7 @@
       <AssemblerOutput>NoListing</AssemblerOutput>
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Midl>

diff --git a/bbruntime/basic.cpp b/bbruntime/basic.cpp
@@ -1,7 +1,6 @@
 #include "std.h"
 #include "bbsys.h"
 #include "../MultiLang/MultiLang.h"
-#include "../MultiLang/sformat.h"
 #include "bbruntime.h"
 
 //how many strings allocated
@@ -477,9 +476,9 @@ float _bbFPow(float x, float y) {
 }
 
 void bbRuntimeStats() {
-	gx_runtime->debugLog(SFormat(MultiLang::stats_strings, stringCnt).c_str());
-	gx_runtime->debugLog(SFormat(MultiLang::stats_objects, objCnt).c_str());
-	gx_runtime->debugLog(SFormat(MultiLang::stats_unreleased, unrelObjCnt).c_str());
+	gx_runtime->debugLog(std::format(MultiLang::stats_strings, stringCnt).c_str());
+	gx_runtime->debugLog(std::format(MultiLang::stats_objects, objCnt).c_str());
+	gx_runtime->debugLog(std::format(MultiLang::stats_unreleased, unrelObjCnt).c_str());
 }
 
 void bbMav() {

diff --git a/bbruntime/bbblitz3d.cpp b/bbruntime/bbblitz3d.cpp
@@ -1011,7 +1011,7 @@ int  bbCameraProject(Camera* c, float x, float y, float z) {
 		float nr = c->getFrustumNear();
 		float nr_w = c->getFrustumWidth();
 		float nr_h = c->getFrustumHeight();
-		projected = Vector((v.x / nr_w + .5f) * vp_w, (.5f - v.y / nr_h) * vp_h, nr);
+		::projected = Vector((v.x / nr_w + .5f) * vp_w, (.5f - v.y / nr_h) * vp_h, nr);
 		return 1;
 	}
 	if(v.z > 0) {
@@ -1022,26 +1022,26 @@ int  bbCameraProject(Camera* c, float x, float y, float z) {
 			float nr = c->getFrustumNear();
 			float nr_w = c->getFrustumWidth();
 			float nr_h = c->getFrustumHeight();
-			projected = Vector(
+			::projected = Vector(
 				(v.x * nr / v.z / nr_w + .5f) * vp_w,
 				(.5f - v.y * nr / v.z / nr_h) * vp_h, nr);
 			return 1;
 		}
 	}
-	projected = Vector();
+	::projected = Vector();
 	return 0;
 }
 
 float  bbProjectedX() {
-	return projected.x;
+	return ::projected.x;
 }
 
 float  bbProjectedY() {
-	return projected.y;
+	return ::projected.y;
 }
 
 float  bbProjectedZ() {
-	return projected.z;
+	return ::projected.z;
 }
 
 static Object* doPick(const Line& l, float radius) {
@@ -2059,7 +2059,7 @@ void blitz3d_open() {
 	gx_scene = gx_graphics->createScene(0);
 	if(!gx_scene) RTEX(MultiLang::unable_create_gxscene_instance);
 	world = new World();
-	projected = Vector();
+	::projected = Vector();
 	picked.collision = Collision();
 	picked.with = 0; picked.coords = Vector();
 	Texture::clearFilters();

diff --git a/bbruntime/bbruntime.cpp b/bbruntime/bbruntime.cpp
@@ -3,7 +3,6 @@
 #include "bbruntime.h"
 #include "../gxruntime/gxutf8.h"
 #include "../MultiLang/MultiLang.h"
-#include "../MultiLang/sformat.h"
 #include <codecvt>
 
 std::string* ErrorMessagePool::memoryAccessViolation = 0;
@@ -55,6 +54,12 @@ BBStr* bbGetUserLanguage() {
 	return new BBStr(std::wstring_convert<std::codecvt_utf8<wchar_t>>().to_bytes(buf));
 }
 
+BBStr* bbGetLocaleInfo() {
+	char szLangName[10];
+	GetLocaleInfoA(GetSystemDefaultLCID(), LOCALE_SABBREVLANGNAME, szLangName, sizeof(szLangName) / sizeof(szLangName[0]));
+	return new BBStr(szLangName);
+}
+
 int bbExecFile(BBStr* f) {
 	std::string t = *f; 
 	delete f;
@@ -219,6 +224,7 @@ void bbruntime_link(void (*rtSym)(const char* sym, void* pc)) {
 	rtSym("SetEnv$env_var$value", bbSetEnv);
 	rtSym("DisableClose", bbDisableClose);
 	rtSym("$GetUserLanguage", bbGetUserLanguage);
+	rtSym("$GetLocaleInfo", bbGetLocaleInfo);
 
 	rtSym("%CreateTimer%hertz", bbCreateTimer);
 	rtSym("%WaitTimer%timer", bbWaitTimer);
@@ -247,7 +253,7 @@ void bbruntime_link(void (*rtSym)(const char* sym, void* pc)) {
 
 //start up error
 static void sue(const char* t) {
-	std::string p = SFormat(MultiLang::startup_error, t);
+	std::string p = std::format(MultiLang::startup_error, t);
 	gx_runtime->debugError(p.c_str());
 }
 

diff --git a/bbruntime/bbruntime.vcxproj b/bbruntime/bbruntime.vcxproj
@@ -123,7 +123,7 @@
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
       <ExceptionHandling>Async</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\freetype\include;</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>

diff --git a/bbruntime/bbsockets.cpp b/bbruntime/bbsockets.cpp
@@ -1,7 +1,6 @@
 #include "std.h"
 #include "bbsockets.h"
 #include <wininet.h>
-#include "../MultiLang/sformat.h"
 #include "../MultiLang/MultiLang.h"
 
 #pragma comment (lib, "wininet.lib")
@@ -509,7 +508,7 @@ BBStr* bbParseDomainTXT(BBStr* txt, BBStr* name) {
 }
 
 BBStr* bbGetDomainTXT(BBStr* domain) {
-	std::string result = exec(SFormat("nslookup -qt=TXT {0}", domain->c_str()).data());
+	std::string result = exec(std::format("nslookup -qt=TXT {0}", domain->c_str()).data());
 	result = clearTabLeft(result);
 	if (result[0] == '\"') result = result.substr(1);
 	if (result[result.length() - 2] == '\"') result = result.substr(0, result.length() - 2);

diff --git a/bbruntime/bbstring.cpp b/bbruntime/bbstring.cpp
@@ -1,12 +1,12 @@
 #include "std.h"
 #include "bbsys.h"
 #include "../gxruntime/gxutf8.h"
+#include "../bbruntime/bbgraphics.h"
 #include <time.h>
 #include "../MultiLang/MultiLang.h"
-#include "../MultiLang/sformat.h"
 
-#define CHKPOS(x) if( (x)<0 ) RTEX( SFormat(MultiLang::string_parameter_positive, __func__).c_str() );
-#define CHKOFF(x) if( (x)<=0 ) RTEX( SFormat(MultiLang::string_parameter_greater, __func__ ).c_str() );
+#define CHKPOS(x) if( (x)<0 ) RTEX( std::format(MultiLang::string_parameter_positive, __func__).c_str() );
+#define CHKOFF(x) if( (x)<=0 ) RTEX( std::format(MultiLang::string_parameter_greater, __func__ ).c_str() );
 
 BBStr* bbString(BBStr* s, int n) {
 	BBStr* t = new BBStr();

diff --git a/bbruntime_dll/bbruntime_dll.cpp b/bbruntime_dll/bbruntime_dll.cpp
@@ -12,7 +12,6 @@
 #include "../gxruntime/gxutf8.h"
 
 #include "../MultiLang/MultiLang.h"
-#include "../MultiLang/sformat.h"
 #include "../bbruntime/bbsys.h"
 
 class DummyDebugger : public Debugger {
@@ -235,7 +234,7 @@ static int findSym(const std::string& t) {
 	it = runtime_syms.find(t);
 	if(it != runtime_syms.end()) return it->second;
 
-	std::string err = SFormat(MultiLang::cant_find_symbol, t);
+	std::string err = std::format(MultiLang::cant_find_symbol, t);
 	MessageBox(0, err.c_str(), 0, 0);
 	ExitProcess(0);
 	return 0;

diff --git a/bbruntime_dll/bbruntime_dll.vcxproj b/bbruntime_dll/bbruntime_dll.vcxproj
@@ -133,7 +133,7 @@
       <OpenMPSupport>false</OpenMPSupport>
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\freetype\include;</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/blitz/blitz.vcxproj b/blitz/blitz.vcxproj
@@ -127,7 +127,7 @@
       <AssemblerOutput>NoListing</AssemblerOutput>
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\freetype\include;</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/blitz3d/blitz3d.vcxproj b/blitz3d/blitz3d.vcxproj
@@ -87,7 +87,7 @@
       <AssemblerOutput>NoListing</AssemblerOutput>
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\freetype\include;</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/blitzide/blitzide.vcxproj b/blitzide/blitzide.vcxproj
@@ -137,7 +137,7 @@
       <AssemblerOutput>NoListing</AssemblerOutput>
       <MinimalRebuild>false</MinimalRebuild>
       <CallingConvention>StdCall</CallingConvention>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\freetype\include;</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/blitzide/libs.cpp b/blitzide/libs.cpp
@@ -104,7 +104,7 @@ bool isMediaFile(const std::string& f) {
 	return false;
 #endif
 
-	static char* exts[] = {
+	static const char* exts[] = {
 		"bmp","jpg","png","tga","iff","pcx",
 		"wav","mid","mp3","mod","s3m","xm","it","rmi","sgt",
 		"x","3ds",0
@@ -113,7 +113,7 @@ bool isMediaFile(const std::string& f) {
 	int i = f.rfind('.');
 	if(i == std::string::npos || i + 1 == f.size()) return false;
 	std::string ext = f.substr(i + 1);
-	char** p = exts;
+	const char** p = exts;
 	while(const char* e = *p++) {
 		std::string t(e);
 		if(i + t.size() + 1 != f.size()) continue;