Merge pull request #1108 from fragcolor-xyz/guus/remove-mal

Guus/remove mal

.github/workflows/build-linux-valgrind.yml

@@ -48,7 +48,7 @@ jobs:
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/wasm.shs
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/subwires.shs
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/const-vars.shs
-          valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards ../shards/tests/wires-embed-issue.edn
+          valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards ../shards/tests/wires-embed-issue.shs
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/network.shs
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/network-ws.shs
           valgrind --exit-on-first-error=yes --error-exitcode=1 --fair-sched=yes ./shards new ../shards/tests/capture-logs.shs

.github/workflows/build-linux.yml

@@ -210,7 +210,7 @@ jobs:
             --output-file coverage/coverage.info
           # remove external dependencies
           lcov \
-            --remove coverage/coverage.info "*/c++/*" "*/boost/*" "*/usr/*" "*/deps/*" "*/shards/mal/*" \
+            --remove coverage/coverage.info "*/c++/*" "*/boost/*" "*/usr/*" "*/deps/*" \
             --output-file coverage/coverage.linux.info
           # convert absolute path to relative path
           sed -i s/${PWD////\\/}/./g coverage/coverage.linux.info

.github/workflows/build-wasm.yml

@@ -123,7 +123,6 @@ jobs:
         if: ${{ steps.setup.outputs.run-tests == 'true' && steps.setup.outputs.threading == 'st' }}
         run: |
           cd build
-          node ../shards/tests/test-shards.js shards-st.js || [[ $? == 143 ]] || exit
           node ../shards/tests/test-runtime.js || [[ $? == 143 ]] || exit
           mkdir shards
           cp shards-st.wasm shards/
@@ -132,7 +131,6 @@ jobs:
         if: ${{ steps.setup.outputs.threading == 'mt' }}
         run: |
           cd build
-          node --experimental-wasm-threads ../shards/tests/test-shards.js shards-mt.js || [[ $? == 143 ]] || exit
           node --experimental-wasm-threads ../shards/tests/test-runtime.js || [[ $? == 143 ]] || exit
           mkdir shards
           cp shards-mt.wasm shards/

.github/workflows/build-windows.yml

@@ -257,8 +257,6 @@ jobs:
           ./shards new ../shards/tests/snappy.shs
           echo "Running expect-like"
           ./shards new ../shards/tests/expect.shs
-          # echo "Running ws"
-          # ./shards ../shards/tests/ws.edn
           echo "Running bigint"
           ./shards new ../shards/tests/bigint.shs
           echo "Running wasm"

.github/workflows/test-macos-gpu.yml

@@ -88,14 +88,6 @@ jobs:
             build/shards new "$i"
           done
 
-          echo "\n"
-          echo "Running graphics test scripts"
-          for i in $(find shards/tests -maxdepth 1 -name 'gfx*.edn');
-          do
-            echo "Running $i"
-            build/shards "$i"
-          done
-
           echo "Running input test"
           build/shards new shards/tests/input.shs
 
@@ -165,7 +157,7 @@ jobs:
             --ignore-errors inconsistent,gcov,range
           # remove external dependencies
           lcov \
-            --remove coverage/coverage.info "*/c++/*" "*/boost/*" "*/usr/*" "*/deps/*" "*/shards/mal/*" \
+            --remove coverage/coverage.info "*/c++/*" "*/boost/*" "*/usr/*" "*/deps/*" \
             --output-file coverage/coverage-macos-gpu.info \
             --ignore-errors inconsistent,gcov,range
           # convert absolute path to relative path

.gitmodules

@@ -13,9 +13,6 @@
 [submodule "cpp-taskflow"]
 	path = deps/cpp-taskflow
 	url = https://github.com/shards-lang/cpp-taskflow.git
-[submodule "deps/replxx"]
-	path = deps/replxx
-	url = https://github.com/shards-lang/replxx.git
 [submodule "deps/nameof"]
 	path = deps/nameof
 	url = https://github.com/shards-lang/nameof.git

cmake/Root.cmake

@@ -32,8 +32,6 @@ set_property(GLOBAL PROPERTY CTEST_TARGETS_ADDED 1)
 
 add_subdirectory(${SHARDS_DIR}/deps deps)
 
-# add_subdirectory(${SHARDS_DIR}/src/mal src/mal)
-
 # Standalone libraries
 add_subdirectory(${SHARDS_DIR}/shards/fast_string src/fast_string)
 add_subdirectory(${SHARDS_DIR}/shards/log src/log)
@@ -73,7 +71,7 @@ endforeach()
 add_subdirectory(${SHARDS_DIR}/shards/union src/union)
 
 # Shards library and executable bundle
-add_subdirectory(${SHARDS_DIR}/shards/mal src/mal)
+add_subdirectory(${SHARDS_DIR}/shards/cli src/cli)
 
 add_subdirectory(${SHARDS_DIR}/shards/tests src/tests)
 

cmake/Tidy.cmake

@@ -72,7 +72,6 @@ set(
   -I${SHARDS_DIR}/include
   -I${SHARDS_DIR}/src/core
   -I${SHARDS_DIR}/src/gfx
-  -I${SHARDS_DIR}/deps/replxx/include
   -I${SHARDS_DIR}/deps/spdlog/include
   -I${SHARDS_DIR}/deps/SPSCQueue/include
   -I${SHARDS_DIR}/deps/stb

cmake/rust/union_Cargo.toml.in

@@ -27,8 +27,8 @@ metal = { git = "https://github.com/shards-lang/metal-rs.git", version = "=0.29.
 tiny-skia = { opt-level = 3 } 
 resvg = { opt-level = 3 }
 usvg = { opt-level = 3 }
-shards-lang = { opt-level = 3 }
-shards-langffi = { opt-level = 3 }
+# shards-lang = { opt-level = 3 }
+# shards-langffi = { opt-level = 3 }
 pest = { opt-level = 3, debug-assertions = false }  # This will apply to all profiles
 pest_derive = { opt-level = 3, debug-assertions = false }  # This will apply to all profiles
 syntect = { opt-level = 3 }

deps/CMakeLists.txt

@@ -17,7 +17,6 @@ target_include_directories(kcp-wrapper INTERFACE kcp)
 
 add_subdirectory(magic_enum)
 add_subdirectory(nameof)
-add_subdirectory(replxx)
 add_subdirectory(spdlog)
 add_subdirectory(sqlite)
 

shards/mal/CMakeLists.txt → shards/cli/CMakeLists.txt

@@ -1,14 +1,5 @@
-set(shards_SOURCES
-  stepA_mal.cpp
-  Core.cpp
-  SHCore.cpp
-  Environment.cpp
-  Reader.cpp
-  ReadLine.cpp
-  String.cpp
-  Types.cpp
-  Validation.cpp
-  SHCore.cpp
+set(cli_SOURCES
+  main.cpp
 )
 
 function(setup_shards_target TARGET)
@@ -17,9 +8,9 @@ function(setup_shards_target TARGET)
   endif()
 
   if(APPLE)
-    target_link_libraries(${TARGET} replxx shards-core shards_core_swift)
+    target_link_libraries(${TARGET} shards-core shards_core_swift)
   else()
-    target_link_libraries(${TARGET} replxx shards-core)
+    target_link_libraries(${TARGET} shards-core)
   endif()
 
   set_target_properties(${TARGET} PROPERTIES LINKER_LANGUAGE CXX)
@@ -29,16 +20,15 @@ function(setup_shards_target TARGET)
 endfunction()
 
 function(setup_shards_library_target TARGET)
-  target_sources(${TARGET} PRIVATE ${shards_SOURCES})
+  target_sources(${TARGET} PRIVATE ${cli_SOURCES})
   target_compile_definitions(${TARGET} PUBLIC NO_MAL_MAIN=1)
 
   setup_shards_target(${TARGET})
 endfunction()
 
 # Executable
-add_executable(shards ${shards_SOURCES})
+add_executable(shards ${cli_SOURCES})
 setup_shards_target(shards)
-
 target_link_libraries(shards shards-cpp-union)
 
 # library
@@ -47,24 +37,9 @@ setup_shards_library_target(shards-lib)
 set_target_properties(shards-lib PROPERTIES OUTPUT_NAME "${LIB_PREFIX}shards-static")
 target_compile_definitions(shards-lib PRIVATE "shards_EXPORTS=1")
 
-if(EMSCRIPTEN)
-  if(EMSCRIPTEN_PTHREADS)
-    set_target_properties(shards PROPERTIES SUFFIX "-mt.js")
-  else()
-    set_target_properties(shards PROPERTIES SUFFIX "-st.js")
-  endif()
-
-  target_link_options(shards PUBLIC
-    "-sMODULARIZE=1"
-    "-sEXPORT_NAME=shards"
-    "-sNO_EXIT_RUNTIME=1"
-    "-sALLOW_MEMORY_GROWTH=1"
-  )
-endif()
-
 # Apple Framework target
 if(APPLE)
-  add_library(shards-framework SHARED ${shards_SOURCES})
+  add_library(shards-framework SHARED ${cli_SOURCES})
   setup_shards_target(shards-framework)
 
   # Framework specific settings
@@ -114,3 +89,17 @@ if(APPLE)
 
   target_link_libraries(shards-framework shards-cpp-union)
 endif()
+
+if(EMSCRIPTEN)
+  if(EMSCRIPTEN_PTHREADS)
+    set_target_properties(shards PROPERTIES SUFFIX "-mt.js")
+  else()
+    set_target_properties(shards PROPERTIES SUFFIX "-st.js")
+  endif()
+
+  target_link_options(shards PUBLIC
+    "SHELL:-s MODULARIZE=1"
+    "SHELL:-s EXPORT_NAME=shards"
+    "SHELL:-s NO_EXIT_RUNTIME=1"
+  )
+endif()

shards/cli/main.cpp

@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: MPL-2.0 */
+/* Copyright © 2019 Fragcolor Pte. Ltd. */
+
+#include <shards/lang/bindings.h>
+#include <shards/core/utils.hpp>
+// #include <shards/core/foundation.hpp>
+#include <boost/filesystem.hpp>
+
+int main(int argc, const char *argv[]) {
+  using namespace shards::literals;
+  shards::pushThreadName("Main Thread"_ns);
+  shards::parseArguments(argc, argv);
+
+  // Functionality is defined in shards-lang rust crate
+  auto result = shards_process_args(argc, const_cast<char **>(argv), false);
+  return result;
+}