Replace std::string_view of c++17 with c++11 compatible string-view-lite

Signed-off-by: HyukWoo Park <[email protected]>
Samsung · Sep 13, 2023 · 106bd4c · 106bd4c
1 parent 2a2586e
commit 106bd4c
Show file tree

Hide file tree

Showing 29 changed files with 2,051 additions and 364 deletions.
diff --git a/build/target.cmake b/build/target.cmake
@@ -25,7 +25,7 @@ ENDIF()
 
 # Default options per compiler
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR ${COMPILER_CLANG_CL})
-    SET (WALRUS_CXXFLAGS /std:c++17 /fp:strict /Zc:__cplusplus /EHs /source-charset:utf-8 /D_CRT_SECURE_NO_WARNINGS /D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING /wd4244 /wd4267 /wd4805 /wd4018 /wd4172)
+    SET (WALRUS_CXXFLAGS /std:c++11 /fp:strict /Zc:__cplusplus /EHs /source-charset:utf-8 /D_CRT_SECURE_NO_WARNINGS /D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING /wd4244 /wd4267 /wd4805 /wd4018 /wd4172)
     SET (WALRUS_CXXFLAGS_RELEASE /O2 /Oy-)
     SET (WALRUS_THIRDPARTY_CFLAGS /D_CRT_SECURE_NO_WARNINGS /Oy- /wd4146 /EHs)
     IF (${COMPILER_CLANG_CL})
@@ -41,7 +41,7 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR ${COMPILER_CLANG_CL})
     SET (WALRUS_CXXFLAGS_SHAREDLIB)
     SET (WALRUS_LDFLAGS_SHAREDLIB)
     SET (WALRUS_CXXFLAGS_STATICLIB /DWASM_API_EXTERN)
-    SET (WALRUS_CXXFLAGS_SHELL /DWASM_API_EXTERN /std:c++17)
+    SET (WALRUS_CXXFLAGS_SHELL /DWASM_API_EXTERN /std:c++11)
 ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     SET (WALRUS_CXXFLAGS
         ${WALRUS_CXXFLAGS}
@@ -73,7 +73,7 @@ ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     SET (WALRUS_CXXFLAGS_SHAREDLIB -fPIC)
     SET (WALRUS_LDFLAGS_SHAREDLIB -ldl)
     SET (WALRUS_CXXFLAGS_STATICLIB -fPIC -DWASM_API_EXTERN=)
-    SET (WALRUS_CXXFLAGS_SHELL -DWASM_API_EXTERN= -frtti -std=c++17)
+    SET (WALRUS_CXXFLAGS_SHELL -DWASM_API_EXTERN= -frtti -std=c++11)
 
 ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Clang and AppleClang
     SET (WALRUS_CXXFLAGS
@@ -103,7 +103,7 @@ ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Clang and AppleClang
     SET (WALRUS_CXXFLAGS_SHAREDLIB -fPIC)
     SET (WALRUS_LDFLAGS_SHAREDLIB -ldl)
     SET (WALRUS_CXXFLAGS_STATICLIB -fPIC -DWASM_API_EXTERN=)
-    SET (WALRUS_CXXFLAGS_SHELL -DWASM_API_EXTERN= -frtti -std=c++17)
+    SET (WALRUS_CXXFLAGS_SHELL -DWASM_API_EXTERN= -frtti -std=c++11)
 ELSE()
     MESSAGE (FATAL_ERROR ${CMAKE_CXX_COMPILER_ID} " is Unsupported Compiler")
 ENDIF()

diff --git a/src/shell/Shell.cpp b/src/shell/Shell.cpp
@@ -832,7 +832,7 @@ static void runExports(Store* store, const std::string& filename, const std::vec
 
 static void parseArguments(int argc, char* argv[], ArgParser& argParser)
 {
-    const std::vector<std::string_view> args(argv + 1, argv + argc);
+    const std::vector<nonstd::string_view> args(argv + 1, argv + argc);
 
     for (auto it = args.begin(); it != args.end(); ++it) {
         if (*it == "--run-export") {
@@ -842,12 +842,15 @@ static void parseArguments(int argc, char* argv[], ArgParser& argParser)
             }
 
             std::advance(it, 1);
-            argParser.exportToRun = *it;
-        } else if (auto arg = std::string(*it); endsWith(arg, "wat") || endsWith(arg, "wast") || endsWith(arg, "wasm")) {
-            argParser.fileNames.emplace_back(*it);
+            argParser.exportToRun = nonstd::to_string(*it);
         } else {
-            fprintf(stderr, "error: unknown argument: %s\n", it->data());
-            exit(1);
+            auto arg = nonstd::to_string(*it);
+            if (endsWith(arg, "wat") || endsWith(arg, "wast") || endsWith(arg, "wasm")) {
+                argParser.fileNames.emplace_back(*it);
+            } else {
+                fprintf(stderr, "error: unknown argument: %s\n", it->data());
+                exit(1);
+            }
         }
     }
 

diff --git a/third_party/wabt/CMakeLists.txt b/third_party/wabt/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.1.0)
 project(WABT LANGUAGES C CXX VERSION 1.0.30)
 include(GNUInstallDirs)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)