Commit before replacing GC* with std::shared_ptr<GC>

.gitea/workflows/tag.yaml

@@ -39,6 +39,7 @@ jobs:
           bash build-tars.sh
         working-directory: ./Packaging/Linux
       - uses: akkuman/gitea-release-action@v1
+        prerelease: true
         env:
           NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
         with:
@@ -62,33 +63,8 @@ jobs:
         run: bash build.sh
           
         working-directory: ./Packaging/Windows
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log in to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITEA_DOMAIN }}
-          username: tesses50
-          password: ${{ secrets.MY_GITEA_AUTH }}
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/386,linux/amd64,linux/arm,linux/arm64,linux/riscv32,linux/riscv64
-          build-contexts: |
-            i686=./builds/containers/i686
-            x86_64=./builds/containers/x86_64
-            powerpc=./builds/containers/powerpc
-            powerpc64=./builds/containers/powerpc64
-            armv7a=./builds/containers/armv7a
-            aarch64=./builds/containers/aarch64
-            riscv32=./builds/containers/riscv32
-            riscv64=./builds/containers/riscv64
-          
-          context: .
-          file: ./Dockerfile.superslim
-          push: true
-          tags: ${{ env.GITEA_DOMAIN }}/${{ env.RESULT_IMAGE_NAME }}:${{ gitea.ref_name }},${{ env.GITEA_DOMAIN }}/${{ env.RESULT_IMAGE_NAME }}:latest
       - uses: akkuman/gitea-release-action@v1
+        prerelease: true
         env:
           NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
         with:

.onedev-buildspec.yml

@@ -1,57 +1,42 @@
 version: 43
 jobs:
-- name: Build for x86_64
+  - name: Build for x86_64
-  steps:
+    steps:
-  - type: CheckoutStep
+      - type: CheckoutStep
-    name: Checkout
+        name: Checkout
-    cloneCredential:
+        cloneCredential:
-      type: DefaultCredential
+          type: DefaultCredential
-    withLfs: true
+        withLfs: true
-    withSubmodules: false
+        withSubmodules: false
-    condition: SUCCESSFUL
+        condition: SUCCESSFUL
-    optional: false
+        optional: false
-  - type: CommandStep
+      - type: BuildImageStep
-    name: Execute build
+        name: Build Docker Image
-    runInContainer: true
+        dockerfile: Dockerfile
-    image: onedev.site.tesses.net/tesses-framework/tesses-framework:latest
+        output:
-    interpreter:
+          type: RegistryOutput
-      type: DefaultInterpreter
+          tags: onedev.site.tesses.net/crosslang/crosslang:latest onedev.site.tesses.net/crosslang/crosslang:@commit_hash@
-      commands: |
+        registryLogins:
-        mkdir build
+          - registryUrl: "@server_url@"
-        cd build
+            userName: "@job_token@"
-        cmake -S .. -B . -DCROSSLANG_FETCHCONTENT=OFF
+            passwordSecret: dockersecret
-        make -j12
+        platforms: linux/amd64
-        make install DESTDIR=../out
+        condition: SUCCESSFUL
-    useTTY: true
+        optional: false
-    condition: SUCCESSFUL
+    triggers:
-    optional: false
+      - type: DependencyFinishedTrigger
-  - type: BuildImageStep
+        projects: tesses-framework
-    name: Build Docker Image
+      - type: BranchUpdateTrigger
-    dockerfile: Dockerfile.run
+        branches: master
-    output:
+        userMatch: anyone
-      type: RegistryOutput
+        projects: crosslang
-      tags: onedev.site.tesses.net/crosslang/crosslang:latest onedev.site.tesses.net/crosslang/crosslang:@commit_hash@
+    projectDependencies:
-    registryLogins:
+      - projectPath: tesses-framework
-    - registryUrl: '@server_url@'
+        buildProvider:
-      userName: '@job_token@'
+          type: LastFinishedBuild
-      passwordSecret: dockersecret
+          jobName: Build for x86_64
-    platforms: linux/amd64
+        artifacts: "*"
-    condition: SUCCESSFUL
+    retryCondition: never
-    optional: false
+    maxRetries: 3
-  triggers:
+    retryDelay: 30
-  - type: DependencyFinishedTrigger
+    timeout: 14400
-    projects: tesses-framework
-  - type: BranchUpdateTrigger
-    branches: master
-    userMatch: anyone
-    projects: crosslang
-  projectDependencies:
-  - projectPath: tesses-framework
-    buildProvider:
-      type: LastFinishedBuild
-      jobName: Build for x86_64
-    artifacts: '*'
-  retryCondition: never
-  maxRetries: 3
-  retryDelay: 30
-  timeout: 14400

CMakeLists.txt

@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(CROSSLANG_MAJOR_VERSION 0)
+include(cmake/version.cmake)
-set(CROSSLANG_MINOR_VERSION 0)
+include(cmake/options.cmake)
-set(CROSSLANG_PATCH_VERSION 2)
 
 project(TessesCrossLang VERSION ${CROSSLANG_MAJOR_VERSION}.${CROSSLANG_MINOR_VERSION}.${CROSSLANG_PATCH_VERSION})
 
@@ -12,39 +11,12 @@ set(CMAKE_CXX_STANDARD 17)
 include(CMakePackageConfigHelpers)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-#option(CROSSLANG_ENABLE_DOXYGEN "Enable doxygen" ON)
-
-option(CROSSLANG_ENABLE_STATIC "Enable Tesses CrossLang static libraries" ON)
-option(CROSSLANG_ENABLE_SHARED "Enable Tesses CrossLang shared libraries" ON)
-option(CROSSLANG_ENABLE_BINARIES "Enable Tesses CrossLang binaries" ON)
-option(CROSSLANG_INSTALL_DEVELOPMENT "Enable Tesses CrossLang development files" ON)
-option(CROSSLANG_ENABLE_THREADING "Enable Tesses CrossLang threading" ON)
-option(CROSSLANG_ENABLE_TERMIOS "Enable termios (For changing terminal options)" ON)
-option(CROSSLANG_SHARED_EXECUTABLES "Link with libcrosslang_shared" ON)
-option(CROSSLANG_FETCHCONTENT "Use fetchcontent" ON)
-option(CROSSLANG_ENABLE_CONFIG_ENVVAR "Allow setting config directory via the environment variable CROSSLANG_CONFIG" ON)
-option(CROSSLANG_ENABLE_FFI "Enable libffi" OFF)
-option(CROSSLANG_ENABLE_RPATH "Enable RPATH" ON)
-option(CROSSLANG_ENABLE_SUPERSLIM "Enable crosslang superslim, one binary" OFF)
-
-option(CROSSLANG_CUSTOM_CONSOLE "Enable custom Console" OFF)
-
-#if(CROSSLANG_ENABLE_DOXYGEN)
-#find_package(Doxygen REQUIRED)
-#doxygen_add_docs(doxygen-crosslang "${CMAKE_CURRENT_SOURCE_DIR}/include/CrossLang.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-#add_custom_target(crosslang_doxygen ALL
-#    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.doxygen-crosslang
-#    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-#)
-
-#endif()
 
 if(CROSSLANG_CUSTOM_CONSOLE)
 set(CROSSLANG_ENABLE_BINARIES OFF)
 set(CROSSLANG_ENABLE_SHARED OFF)
 endif()
 
-set(CROSSLANG_OFFLINE_SHELL_PACKAGE "" CACHE FILEPATH "Path to the shell package generated from https://onedev.site.tesses.net/CrossLang/CrossLangExtras")
 
 if(CROSSLANG_FETCHCONTENT)
 
@@ -78,140 +50,13 @@ endif()
 if(CROSSLANG_ENABLE_FFI)
 find_package(PkgConfig)
 endif()
-
+include(cmake/linkdeps.cmake)
 if(CROSSLANG_ENABLE_FFI AND CROSSLANG_ENABLE_SHARED)
 pkg_check_modules(LIBFFI REQUIRED IMPORTED_TARGET libffi)
 endif()
-function(CROSSLANG_LINK_DEPS CROSSLANG_TARGET_NAME)
-target_include_directories(${CROSSLANG_TARGET_NAME}
-    PUBLIC
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-if(CROSSLANG_ENABLE_FFI AND CROSSLANG_ENABLE_SHARED)
-
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_FFI)
-target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC PkgConfig::LIBFFI)
-
-endif()
-if(CROSSLANG_ENABLE_SUPERSLIM)
-
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SUPERSLIM)
-endif()
-if(CROSSLANG_ENABLE_TIME)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_TIME)
-endif()
-if(CROSSLANG_ENABLE_CONFIG_ENVVAR)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_CONFIG_ENVVAR)
-endif()
-if(CROSSLANG_ENABLE_PROCESS)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_PROCESS)
-endif()
-if(CROSSLANG_ENABLE_THREADING)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_THREADING)
-endif()
-if(CROSSLANG_ENABLE_TERMIOS)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_TERMIOS)
-endif()
-
-if(CROSSLANG_ENABLE_SQLITE)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SQLITE)
-endif()
-
-if(CROSSLANG_CUSTOM_CONSOLE)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_CUSTOM_CONSOLE)
-endif()
-if(CROSSLANG_ENABLE_PLATFORM_FOLDERS)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_PLATFORM_FOLDERS)
-endif()
-if(CROSSLANG_ENABLE_SHARED)
-target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SHARED)
-
-endif()
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoGameCube")
-target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC fat)
-endif()
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii")
-target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC wiisocket)
-endif()
-if(CROSSLANG_ENABLE_SHARED AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
-target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC dl)
-endif()
-target_include_directories(${CROSSLANG_TARGET_NAME}
-    PUBLIC
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-
-endfunction()
 configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/CrossLangVersion.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/CrossLangVersion.h"
 INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CrossLangVersion.h)
-list(APPEND CROSSLANG_SOURCE
+include(cmake/sources.cmake)
-src/vm/bc/add.cpp
-src/vm/bc/sub.cpp
-src/vm/bc/getfield.cpp
-src/vm/bc/setfield.cpp
-src/vm/bc/tostring.cpp
-src/vm/bc/equals.cpp
-src/vm/bc/invokemethod.cpp
-src/vm/bc/executemethod2.cpp
-src/vm/bc/invoketwo.cpp
-src/vm/bc/tobool.cpp
-src/assembler/asm.cpp
-src/assembler/disasm.cpp
-src/assembler/merge.cpp
-src/compiler/codegen.cpp
-src/compiler/lexer.cpp
-src/compiler/parser.cpp
-src/compiler/ast.cpp
-src/runtime_methods/uuid.cpp
-src/runtime_methods/class.cpp
-src/runtime_methods/console.cpp
-src/runtime_methods/io.cpp
-src/runtime_methods/std.cpp
-src/runtime_methods/net.cpp
-src/runtime_methods/vm.cpp
-src/runtime_methods/json.cpp
-src/runtime_methods/sqlite.cpp
-src/runtime_methods/dictionary.cpp
-src/runtime_methods/crypto.cpp
-src/runtime_methods/ogc.cpp
-src/runtime_methods/path.cpp
-src/runtime_methods/env.cpp
-src/runtime_methods/process.cpp
-src/runtime_methods/helpers.cpp
-src/types/embed.cpp
-src/types/async.cpp
-src/types/associativearray.cpp
-src/types/any.cpp
-src/types/ittr.cpp
-src/types/closure.cpp
-src/types/dictionary.cpp
-src/types/externalmethod.cpp
-src/types/list.cpp
-src/types/native.cpp
-src/types/rootenvironment.cpp
-src/types/subenvironment.cpp
-src/types/vfsheapobject.cpp
-src/types/streamheapobject.cpp
-src/types/class.cpp
-src/types/classenvironment.cpp
-src/types/random.cpp
-src/vm/filereader.cpp
-src/vm/gc.cpp
-src/vm/gclist.cpp
-src/vm/vm.cpp
-src/vm/exception.cpp
-src/archive.cpp
-src/markedtobject.cpp
-src/program_lib/crossarchivecreate.cpp
-src/program_lib/crossarchiveextract.cpp
-src/program_lib/crossdump.cpp
-src/program_lib/crosslang.cpp
-src/program_lib/crosslangcompiler.cpp
-src/program_lib/crosslanginterperter.cpp
-src/program_lib/crosslangvm.cpp
-)
 
 if(CROSSLANG_OFFLINE_SHELL_PACKAGE STREQUAL "")
 
@@ -258,193 +103,21 @@ endif()
 
 
 if(CROSSLANG_ENABLE_SUPERSLIM)
-add_executable(crosslang WIN32 src/programs/slim.cpp ${CROSSLANG_WIN32_EXE_SRC})
+include(cmake/slim.cmake)
-
-if(CROSSLANG_ENABLE_STATIC)
-
-target_link_libraries(crosslang PUBLIC crosslang_static)
-elseif(CROSSLANG_ENABLE_SHARED)
-target_link_libraries(crosslang PUBLIC crosslang_shared)
-endif()
-
-if(CROSSLANG_ENABLE_SHARED)
-
-install(TARGETS crosslang_shared
-    EXPORT TessesCrossLangTargets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-endif()
-
-install(TARGETS crosslang DESTINATION "${CMAKE_INSTALL_BINDIR}")
 else()
-
+include(cmake/shared.cmake)
-if(CROSSLANG_INSTALL_DEVELOPMENT)
-install(TARGETS ${TessesCrossLangLibs} 
-    EXPORT TessesCrossLangTargets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-install(FILES include/CrossLang.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/CrossLangVersion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(EXPORT TessesCrossLangTargets
-    FILE TessesCrossLangTargets.cmake
-    NAMESPACE TessesCrossLang::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang
-)
-
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TessesCrossLangConfig.cmake"
-INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang)
-
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TessesCrossLangConfig.cmake"
-DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang)
-else()
-
-if(CROSSLANG_ENABLE_SHARED)
-install(TARGETS crosslang_shared
-    EXPORT TessesCrossLangTargets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-endif()
-endif()
 
 
 
 if(CROSSLANG_ENABLE_BINARIES)
 if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES)
-if(CROSSLANG_ENABLE_RPATH)
+include(cmake/shared_exec.cmake)
-set(CMAKE_MACOSX_RPATH 1)
-set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
-if (APPLE)
-    set(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
-else()
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-endif()
-endif()
-add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-
-add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
-if(NOT WIN32)
-add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_WIN32_EXE_SRC})
-endif()
-target_link_libraries(crossc PUBLIC crosslang_shared)
-target_link_libraries(crossvm PUBLIC crosslang_shared)
-target_link_libraries(crossint PUBLIC crosslang_shared)
-target_link_libraries(crossdump PUBLIC crosslang_shared)
-target_link_libraries(crosslang PUBLIC crosslang_shared)
-target_link_libraries(crossarchiveextract PUBLIC crosslang_shared)
-target_link_libraries(crossarchivecreate PUBLIC crosslang_shared)
-target_link_libraries(crossasm PUBLIC crosslang_shared)
-target_link_libraries(crossdisasm PUBLIC crosslang_shared)
-target_link_libraries(crossmerge PUBLIC crosslang_shared)
-
-if(NOT WIN32)
-target_link_libraries(crossthumbnailer PUBLIC crosslang_shared)
-endif()
 elseif(CROSSLANG_ENABLE_STATIC)
-
+include(cmake/static_exec.cmake)
-add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_WIN32_EXE_SRC})
-
-if(NOT WIN32)
-add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_WIN32_EXE_SRC})
-endif()
-target_link_libraries(crossc PUBLIC crosslang_static)
-target_link_libraries(crossvm PUBLIC crosslang_static)
-target_link_libraries(crossint PUBLIC crosslang_static)
-target_link_libraries(crossdump PUBLIC crosslang_static)
-target_link_libraries(crosslang PUBLIC crosslang_static)
-target_link_libraries(crossarchiveextract PUBLIC crosslang_static)
-target_link_libraries(crossarchivecreate PUBLIC crosslang_static)
-target_link_libraries(crossmerge PUBLIC crosslang_static)
-target_link_libraries(crossasm PUBLIC crosslang_static)
-target_link_libraries(crossdisasm PUBLIC crosslang_static)
-
-if(NOT WIN32)
-target_link_libraries(crossthumbnailer PUBLIC crosslang_static)
-endif()
 else()
-add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+include(cmake/exec.cmake)
-add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+endif()
-add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 
-if(NOT WIN32)
-add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-endif()
-CROSSLANG_LINK_DEPS(crossc)
-CROSSLANG_LINK_DEPS(crossvm)
-CROSSLANG_LINK_DEPS(crossint)
-CROSSLANG_LINK_DEPS(crosslang)
-CROSSLANG_LINK_DEPS(crossdump)
-CROSSLANG_LINK_DEPS(crossarchiveextract)
-CROSSLANG_LINK_DEPS(crossarchivecreate)
-CROSSLANG_LINK_DEPS(crossmerge)
-CROSSLANG_LINK_DEPS(crossdisasm)
-CROSSLANG_LINK_DEPS(crossasm)
-
-if(NOT WIN32)
-CROSSLANG_LINK_DEPS(crossthumbnailer)
-endif()
-if(CROSSLANG_FETCHCONTENT)
-target_link_libraries(crossc PUBLIC tessesframework)
-target_link_libraries(crossvm PUBLIC tessesframework)
-target_link_libraries(crossint PUBLIC tessesframework)
-target_link_libraries(crosslang PUBLIC tessesframework)
-target_link_libraries(crossdump PUBLIC tessesframework)
-target_link_libraries(crossarchiveextract PUBLIC tessesframework)
-target_link_libraries(crossarchivecreate PUBLIC tessesframework)
-target_link_libraries(crossasm PUBLIC tessesframework)
-target_link_libraries(crossdisasm PUBLIC tessesframework)
-target_link_libraries(crossmerge PUBLIC tessesframework)
-if(NOT WIN32)
-target_link_libraries(crossthumbnailer PUBLIC tessesframework)
-endif()
-else()
-target_link_libraries(crossc PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossvm PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossint PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crosslang PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossdump PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossarchiveextract PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossarchivecreate PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossasm PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossdisasm PUBLIC TessesFramework::tessesframework)
-target_link_libraries(crossmerge PUBLIC TessesFramework::tessesframework)
-if(NOT WIN32)
-target_link_libraries(crossthumbnailer PUBLIC TessesFramework::tessesframework)
-endif()
-endif()
-endif()
 install(TARGETS crossc DESTINATION "${CMAKE_INSTALL_BINDIR}")
 install(TARGETS crossvm DESTINATION "${CMAKE_INSTALL_BINDIR}")
 install(TARGETS crossint DESTINATION "${CMAKE_INSTALL_BINDIR}")
@@ -512,4 +185,4 @@ set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOL
 include(CPack)
 if(CROSSLANG_INSTALL_DEVELOPMENT)
 add_subdirectory(pkgconfig)
-endif()
+endif()

Dockerfile

@@ -1,8 +1,17 @@
-FROM onedev.site.tesses.net/tesses-framework/tesses-framework:latest
+FROM alpine:latest AS build
-RUN apt update -y && \
+
-    apt install -y --no-install-recommends \
+RUN apk update
-    libjansson-dev wget && \
+RUN apk add --no-cache cmake g++ make git
-    apt clean -y && \
+
-    rm -rf /var/lib/apt/lists/*
+COPY ./ /src
-RUN mkdir /src && cd /src && git clone https://onedev.site.tesses.net/crosslang . && cd /src && mkdir build && cd build && cmake -S .. -B . && make -j4 && make install && cd / && rm -r /src
+
-WORKDIR /
+
+RUN cd /src && mkdir build && cd build && cmake -S .. -B . -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_APPS=ON -DCMAKE_BUILD_TYPE=Release ; make -j`nproc` && make install DESTDIR=/out
+
+FROM alpine:latest
+RUN apk update
+RUN apk add --no-cache libstdc++
+COPY --from=build /out/usr /usr
+
+ENV CROSSLANG_CONTAINER=1
+ENTRYPOINT ["/usr/local/bin/crossint"]

Dockerfile.run

@@ -1,2 +0,0 @@
-FROM onedev.site.tesses.net/tesses-framework/tesses-framework:latest
-COPY out /

Packaging/Linux/PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Mike Nolan <tesses@tesses.net>
 pkgname=crosslang # '-bzr', '-git', '-hg' or '-svn'
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 pkgdesc=""
 arch=('x86_64' 'powerpc')
 url="https://onedev.site.tesses.net/crosslang"
 license=('GPLv3')
 groups=()
-depends=('mbedtls' 'tesses-framework')
+depends=('mbedtls' 'tesses-framework=0.0.2')
 makedepends=('git' 'cmake' 'make' 'base-devel' 'wget') # 'bzr', 'git', 'mercurial' or 'subversion'
 install=
 source=('crosslang::git+https://onedev.site.tesses.net/crosslang')
@@ -30,16 +30,16 @@ prepare() {
 build() {
 	cd "$srcdir/${pkgname}"
 	mkdir build
-	
+
 	if [[ -z "$CMAKE_TOOLCHAIN" ]]; then
  	cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=Release
   	else
 	cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TOOLCHAIN"
 	fi
- 
+
 	cd build
 	make -j`nproc`
-	
+
 }
 
 
@@ -49,4 +49,3 @@ package() {
 	cd "$srcdir/${pkgname}/build"
 	make install DESTDIR="$pkgdir/"
 }
-

Packaging/Linux/version.sh

@@ -1,2 +1,2 @@
 
-export DEB_VERSION=0.0.2
+export DEB_VERSION=0.0.3

changelog.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 0.0.3
+Fixed cmake, unnecessary itteration on dictionary, and a crosslang binary bug when shell is not installed
+
 ## 0.0.2
 Add uuids, bytestreams and single file runtime binaries
 
 ## 0.0.1
-Start versioning
+Start versioning

cmake/exec.cmake

@@ -0,0 +1,57 @@
+add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+
+if(NOT WIN32)
+add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+endif()
+CROSSLANG_LINK_DEPS(crossc)
+CROSSLANG_LINK_DEPS(crossvm)
+CROSSLANG_LINK_DEPS(crossint)
+CROSSLANG_LINK_DEPS(crosslang)
+CROSSLANG_LINK_DEPS(crossdump)
+CROSSLANG_LINK_DEPS(crossarchiveextract)
+CROSSLANG_LINK_DEPS(crossarchivecreate)
+CROSSLANG_LINK_DEPS(crossmerge)
+CROSSLANG_LINK_DEPS(crossdisasm)
+CROSSLANG_LINK_DEPS(crossasm)
+
+if(NOT WIN32)
+CROSSLANG_LINK_DEPS(crossthumbnailer)
+endif()
+if(CROSSLANG_FETCHCONTENT)
+target_link_libraries(crossc PUBLIC tessesframework)
+target_link_libraries(crossvm PUBLIC tessesframework)
+target_link_libraries(crossint PUBLIC tessesframework)
+target_link_libraries(crosslang PUBLIC tessesframework)
+target_link_libraries(crossdump PUBLIC tessesframework)
+target_link_libraries(crossarchiveextract PUBLIC tessesframework)
+target_link_libraries(crossarchivecreate PUBLIC tessesframework)
+target_link_libraries(crossasm PUBLIC tessesframework)
+target_link_libraries(crossdisasm PUBLIC tessesframework)
+target_link_libraries(crossmerge PUBLIC tessesframework)
+if(NOT WIN32)
+target_link_libraries(crossthumbnailer PUBLIC tessesframework)
+endif()
+else()
+target_link_libraries(crossc PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossvm PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossint PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crosslang PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossdump PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossarchiveextract PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossarchivecreate PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossasm PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossdisasm PUBLIC TessesFramework::tessesframework)
+target_link_libraries(crossmerge PUBLIC TessesFramework::tessesframework)
+if(NOT WIN32)
+target_link_libraries(crossthumbnailer PUBLIC TessesFramework::tessesframework)
+endif()
+endif()

cmake/linkdeps.cmake

@@ -0,0 +1,62 @@
+function(CROSSLANG_LINK_DEPS CROSSLANG_TARGET_NAME)
+target_include_directories(${CROSSLANG_TARGET_NAME}
+    PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+if(CROSSLANG_ENABLE_FFI AND CROSSLANG_ENABLE_SHARED)
+
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_FFI)
+target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC PkgConfig::LIBFFI)
+
+endif()
+if(CROSSLANG_ENABLE_SUPERSLIM)
+
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SUPERSLIM)
+endif()
+if(CROSSLANG_ENABLE_TIME)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_TIME)
+endif()
+if(CROSSLANG_ENABLE_CONFIG_ENVVAR)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_CONFIG_ENVVAR)
+endif()
+if(CROSSLANG_ENABLE_PROCESS)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_PROCESS)
+endif()
+if(CROSSLANG_ENABLE_THREADING)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_THREADING)
+endif()
+if(CROSSLANG_ENABLE_TERMIOS)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_TERMIOS)
+endif()
+
+if(CROSSLANG_ENABLE_SQLITE)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SQLITE)
+endif()
+
+if(CROSSLANG_CUSTOM_CONSOLE)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_CUSTOM_CONSOLE)
+endif()
+if(CROSSLANG_ENABLE_PLATFORM_FOLDERS)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_PLATFORM_FOLDERS)
+endif()
+if(CROSSLANG_ENABLE_SHARED)
+target_compile_definitions(${CROSSLANG_TARGET_NAME} PUBLIC CROSSLANG_ENABLE_SHARED)
+
+endif()
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoGameCube")
+target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC fat)
+endif()
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii")
+target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC wiisocket)
+endif()
+if(CROSSLANG_ENABLE_SHARED AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
+target_link_libraries(${CROSSLANG_TARGET_NAME} PUBLIC dl)
+endif()
+target_include_directories(${CROSSLANG_TARGET_NAME}
+    PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+
+endfunction()

cmake/options.cmake

@@ -0,0 +1,18 @@
+option(CROSSLANG_ENABLE_STATIC "Enable Tesses CrossLang static libraries" ON)
+option(CROSSLANG_ENABLE_SHARED "Enable Tesses CrossLang shared libraries" ON)
+option(CROSSLANG_ENABLE_BINARIES "Enable Tesses CrossLang binaries" ON)
+option(CROSSLANG_INSTALL_DEVELOPMENT "Enable Tesses CrossLang development files" ON)
+option(CROSSLANG_ENABLE_THREADING "Enable Tesses CrossLang threading" ON)
+option(CROSSLANG_ENABLE_TERMIOS "Enable termios (For changing terminal options)" ON)
+option(CROSSLANG_SHARED_EXECUTABLES "Link with libcrosslang_shared" ON)
+option(CROSSLANG_FETCHCONTENT "Use fetchcontent" ON)
+option(CROSSLANG_ENABLE_CONFIG_ENVVAR "Allow setting config directory via the environment variable CROSSLANG_CONFIG" ON)
+option(CROSSLANG_ENABLE_FFI "Enable libffi" OFF)
+option(CROSSLANG_ENABLE_RPATH "Enable RPATH" ON)
+option(CROSSLANG_ENABLE_SUPERSLIM "Enable crosslang superslim, one binary" OFF)
+
+option(CROSSLANG_CUSTOM_CONSOLE "Enable custom Console" OFF)
+
+
+
+set(CROSSLANG_OFFLINE_SHELL_PACKAGE "" CACHE FILEPATH "Path to the shell package generated from https://onedev.site.tesses.net/CrossLang/CrossLangExtras")

cmake/shared.cmake

@@ -0,0 +1,34 @@
+if(CROSSLANG_INSTALL_DEVELOPMENT)
+install(TARGETS ${TessesCrossLangLibs}
+    EXPORT TessesCrossLangTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+install(FILES include/CrossLang.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/CrossLangVersion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(EXPORT TessesCrossLangTargets
+    FILE TessesCrossLangTargets.cmake
+    NAMESPACE TessesCrossLang::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang
+)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TessesCrossLangConfig.cmake"
+INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang)
+
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TessesCrossLangConfig.cmake"
+DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang)
+else()
+
+if(CROSSLANG_ENABLE_SHARED)
+install(TARGETS crosslang_shared
+    EXPORT TessesCrossLangTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+endif()
+endif()

cmake/shared_exec.cmake

@@ -0,0 +1,37 @@
+if(CROSSLANG_ENABLE_RPATH)
+set(CMAKE_MACOSX_RPATH 1)
+set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
+if (APPLE)
+    set(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
+else()
+    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+endif()
+endif()
+add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+
+add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
+if(NOT WIN32)
+add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_WIN32_EXE_SRC})
+endif()
+target_link_libraries(crossc PUBLIC crosslang_shared)
+target_link_libraries(crossvm PUBLIC crosslang_shared)
+target_link_libraries(crossint PUBLIC crosslang_shared)
+target_link_libraries(crossdump PUBLIC crosslang_shared)
+target_link_libraries(crosslang PUBLIC crosslang_shared)
+target_link_libraries(crossarchiveextract PUBLIC crosslang_shared)
+target_link_libraries(crossarchivecreate PUBLIC crosslang_shared)
+target_link_libraries(crossasm PUBLIC crosslang_shared)
+target_link_libraries(crossdisasm PUBLIC crosslang_shared)
+target_link_libraries(crossmerge PUBLIC crosslang_shared)
+
+if(NOT WIN32)
+target_link_libraries(crossthumbnailer PUBLIC crosslang_shared)
+endif()

cmake/slim.cmake

@@ -0,0 +1,21 @@
+
+add_executable(crosslang WIN32 src/programs/slim.cpp ${CROSSLANG_WIN32_EXE_SRC})
+
+if(CROSSLANG_ENABLE_STATIC)
+
+target_link_libraries(crosslang PUBLIC crosslang_static)
+elseif(CROSSLANG_ENABLE_SHARED)
+target_link_libraries(crosslang PUBLIC crosslang_shared)
+endif()
+
+if(CROSSLANG_ENABLE_SHARED)
+
+install(TARGETS crosslang_shared
+    EXPORT TessesCrossLangTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+endif()
+
+install(TARGETS crosslang DESTINATION "${CMAKE_INSTALL_BINDIR}")

cmake/sources.cmake

@@ -0,0 +1,66 @@
+list(APPEND CROSSLANG_SOURCE
+src/vm/bc/add.cpp
+src/vm/bc/sub.cpp
+src/vm/bc/getfield.cpp
+src/vm/bc/setfield.cpp
+src/vm/bc/tostring.cpp
+src/vm/bc/equals.cpp
+src/vm/bc/invokemethod.cpp
+src/vm/bc/executemethod2.cpp
+src/vm/bc/invoketwo.cpp
+src/vm/bc/tobool.cpp
+src/assembler/asm.cpp
+src/assembler/disasm.cpp
+src/assembler/merge.cpp
+src/compiler/codegen.cpp
+src/compiler/lexer.cpp
+src/compiler/parser.cpp
+src/compiler/ast.cpp
+src/runtime_methods/uuid.cpp
+src/runtime_methods/class.cpp
+src/runtime_methods/console.cpp
+src/runtime_methods/io.cpp
+src/runtime_methods/std.cpp
+src/runtime_methods/net.cpp
+src/runtime_methods/vm.cpp
+src/runtime_methods/json.cpp
+src/runtime_methods/sqlite.cpp
+src/runtime_methods/dictionary.cpp
+src/runtime_methods/crypto.cpp
+src/runtime_methods/ogc.cpp
+src/runtime_methods/path.cpp
+src/runtime_methods/env.cpp
+src/runtime_methods/process.cpp
+src/runtime_methods/helpers.cpp
+src/types/embed.cpp
+src/types/async.cpp
+src/types/associativearray.cpp
+src/types/any.cpp
+src/types/ittr.cpp
+src/types/closure.cpp
+src/types/dictionary.cpp
+src/types/externalmethod.cpp
+src/types/list.cpp
+src/types/native.cpp
+src/types/rootenvironment.cpp
+src/types/subenvironment.cpp
+src/types/vfsheapobject.cpp
+src/types/streamheapobject.cpp
+src/types/class.cpp
+src/types/classenvironment.cpp
+src/types/random.cpp
+src/vm/filereader.cpp
+src/vm/gc.cpp
+src/vm/gclist.cpp
+src/vm/vm.cpp
+src/vm/exception.cpp
+src/archive.cpp
+src/markedtobject.cpp
+src/program_lib/crossarchivecreate.cpp
+src/program_lib/crossarchiveextract.cpp
+src/program_lib/crossdump.cpp
+src/program_lib/crosslang.cpp
+src/program_lib/crosslangcompiler.cpp
+src/program_lib/crosslanginterperter.cpp
+src/program_lib/crosslangvm.cpp
+)

cmake/static_exec.cmake

@@ -0,0 +1,28 @@
+add_executable(crossc src/programs/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossvm src/programs/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossint src/programs/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdump src/programs/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/programs/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchiveextract src/programs/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossarchivecreate src/programs/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_WIN32_EXE_SRC})
+
+if(NOT WIN32)
+add_executable(crossthumbnailer src/crossthumbnailer.cpp ${CROSSLANG_WIN32_EXE_SRC})
+endif()
+target_link_libraries(crossc PUBLIC crosslang_static)
+target_link_libraries(crossvm PUBLIC crosslang_static)
+target_link_libraries(crossint PUBLIC crosslang_static)
+target_link_libraries(crossdump PUBLIC crosslang_static)
+target_link_libraries(crosslang PUBLIC crosslang_static)
+target_link_libraries(crossarchiveextract PUBLIC crosslang_static)
+target_link_libraries(crossarchivecreate PUBLIC crosslang_static)
+target_link_libraries(crossmerge PUBLIC crosslang_static)
+target_link_libraries(crossasm PUBLIC crosslang_static)
+target_link_libraries(crossdisasm PUBLIC crosslang_static)
+
+if(NOT WIN32)
+target_link_libraries(crossthumbnailer PUBLIC crosslang_static)
+endif()

cmake/version.cmake

@@ -0,0 +1,3 @@
+set(CROSSLANG_MAJOR_VERSION 0)
+set(CROSSLANG_MINOR_VERSION 0)
+set(CROSSLANG_PATCH_VERSION 3)

src/program_lib/crosslang.cpp

@@ -12,7 +12,7 @@ namespace Tesses::CrossLang::Programs
 static bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs)
 {
     auto inContainer=Platform::Environment::GetVariable("CROSSLANG_CONTAINER");
-    if(inContainer && *inContainer=="1" || *inContainer=="y" || *inContainer=="Y")
+    if(inContainer && (*inContainer=="1" || *inContainer=="y" || *inContainer=="Y"))
     {
         HttpRequest req;
         req.url = "https://downloads.tesses.net/ShellPackage.crvm";
@@ -22,7 +22,7 @@ static bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared
         {
             auto strm = resp.ReadAsStream();
             CrossLang::CrossArchiveExtract(strm, vfs);
-               
+
             return true;
         }
         else
@@ -47,7 +47,7 @@ static bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared
             {
                 auto strm = resp.ReadAsStream();
                 CrossLang::CrossArchiveExtract(strm, vfs);
-               
+
                 return true;
             }
             else
@@ -61,10 +61,10 @@ static bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared
             std::cout << "Looks like you will need to install manually" << std::endl;
             return false;
         }
-        else 
+        else
         {
             std::cout << "Please use Y or N (case insensitive)" << std::endl;
-            
+
         }
     }
     return false;
@@ -72,11 +72,11 @@ static bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared
 
 TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv)
 {
-   
+
     Tesses::Framework::Filesystem::VFSPath dir = GetCrossLangConfigDir();
 
     Tesses::Framework::Filesystem::VFSPath filename = dir / "Shell" / "Shell.crvm";
-    
+
 
     auto p = Tesses::Framework::Platform::Environment::GetRealExecutablePath(Tesses::Framework::Filesystem::LocalFS->SystemToVFSPath(argv[0])).GetParent().GetParent() / "share" / "Tesses" / "CrossLang" / "Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm";
     if(argv.size() == 2 && argv[1] == "configdir")
@@ -96,7 +96,7 @@ TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv)
             {
                 auto strm = resp.ReadAsStream();
                 CrossLang::CrossArchiveExtract(strm, subdir);
-                
+
                 return 0;
             }
             else
@@ -117,7 +117,7 @@ TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv)
             if(strm != nullptr)
             {
                 CrossLang::CrossArchiveExtract(strm, subdir);
-                
+
             }
             else
             {
@@ -130,26 +130,26 @@ TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv)
             return 0;
         }
     }
-    
+
 
     TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
-    
+
 
     TStd::RegisterStd(ls.GetGC(),env);
-    
+
-    
+
     env->LoadFileWithDependencies(ls.GetGC(), Tesses::Framework::Filesystem::LocalFS, filename);
-    
+
 
     TList* args = TList::Create(ls);
 
     args->Add(filename.ToString());
-    
+
     for(size_t arg=1;arg<argv.size();arg++)
         args->Add(std::string(argv[arg]));
-   
+
     return env->CallFunctionWithFatalError(ls,"main",{args});
-    
+
 }
 
-}
+}

src/programs/crosslanginterperter.cpp

@@ -6,12 +6,12 @@
 using namespace Tesses::Framework;
 using namespace Tesses::CrossLang;
 using namespace Tesses::Framework::Filesystem;
+static GC gc;
 int main(int argc, char** argv)
 {
     TF_InitWithConsole();
     if(argc > 0)
         TF_AllowPortable(argv[0]);
-    GC gc;
     gc.Start();
     GCList ls(gc);
     TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
@@ -26,4 +26,4 @@ int main(int argc, char** argv)
     if(GetObject(res,myi64))
         return (int)myi64;
     return 0;
-}
+}

src/programs/crosslangvm.cpp

@@ -6,12 +6,13 @@
 using namespace Tesses::Framework;
 using namespace Tesses::CrossLang;
 using namespace Tesses::Framework::Filesystem;
+static GC gc;
 int main(int argc, char** argv)
 {
     TF_InitWithConsole();
     if(argc > 0)
         TF_AllowPortable(argv[0]);
-    GC gc;
+
     gc.Start();
     GCList ls(gc);
     TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
@@ -26,4 +27,4 @@ int main(int argc, char** argv)
     if(GetObject(res,myi64))
         return (int)myi64;
     return 0;
-}
+}

src/programs/slim.cpp

@@ -7,7 +7,7 @@ using namespace Tesses::Framework::Filesystem;
 int main(int argc, char** argv)
 {
     //crosslang crossint
-    //crosslang 
+    //crosslang
     //crosslang ...
 
     std::string programName = "crosslang";
@@ -20,7 +20,7 @@ int main(int argc, char** argv)
         path.RemoveExtension();
         programName = path.GetFileName();
     }
-   
+
     std::vector<std::string> args(argc);
     for(int i = 0; i < argc; i++)
         args[i] = argv[i];
@@ -28,14 +28,17 @@ int main(int argc, char** argv)
         {
             GC gc;
             gc.Start();
+            int64_t myi64=0;
+            {
             GCList ls(gc);
             TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
             TStd::RegisterStd(&gc,env);
             auto res= Programs::CrossLangInterperter(ls, env, args);
-            int64_t myi64;
+
-            if(GetObject(res,myi64))
+                GetObject(res,myi64);
-                return (int)myi64;
+
-            return 0;
+            }
+            return (int)myi64;
         }
         else if(programName == "crossc")
         {
@@ -73,31 +76,37 @@ int main(int argc, char** argv)
         {
             GC gc;
             gc.Start();
+            int64_t myi64=0;
+
+            {
             GCList ls(gc);
             TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
             TStd::RegisterStd(&gc,env);
             auto res= Programs::CrossLangVM(ls, env, args);
-            int64_t myi64;
+            GetObject(res,myi64);
-            if(GetObject(res,myi64))
+            }
                 return (int)myi64;
-            return 0;
+
     }
     else if(args.size() > 1)
-    {    
+    {
-        
+
         if(args[1] == "crossint")
         {
+            int64_t myi64=0;
             args.erase(args.begin());
             GC gc;
             gc.Start();
+            {
             GCList ls(gc);
             TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
             TStd::RegisterStd(&gc,env);
             auto res= Programs::CrossLangInterperter(ls, env, args);
-            int64_t myi64;
+
-            if(GetObject(res,myi64))
+                GetObject(res,myi64);
-                return (int)myi64;
+            }
-            return 0;
+            return (int)myi64;
+
         }
         else if(args[1] == "crossc")
         {
@@ -136,29 +145,36 @@ int main(int argc, char** argv)
         }
         else if(args[1] == "crossvm")
         {
+            int64_t myi64=0;
+
             args.erase(args.begin());
             GC gc;
+
             gc.Start();
+            {
             GCList ls(gc);
             TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
             TStd::RegisterStd(&gc,env);
             auto res= Programs::CrossLangVM(ls, env, args);
-            int64_t myi64;
+                GetObject(res,myi64);
-            if(GetObject(res,myi64))
+            }
-                return (int)myi64;
+
-            return 0;
+            return (int)myi64;
         }
     }
-    
+    {
-    
+         int64_t myi64=0;
         GC gc;
+
         gc.Start();
-        GCList ls(gc);
+        {
-        auto res= Programs::CrossLangShell(ls, args);
+            GCList ls(gc);
-        int64_t myi64;
+            auto res= Programs::CrossLangShell(ls, args);
-        if(GetObject(res,myi64))
+
-            return (int)myi64;
+            GetObject(res,myi64);
-        return 0;
+
-        return 0;
+
-    
+        }
-}
+        return (int)myi64;
+    }
+}

src/runtime_methods/std.cpp

@@ -641,10 +641,7 @@ namespace Tesses::CrossLang
         }
         return nullptr;
     }
-    static TObject New_MemoryFilesystem(GCList& ls, std::vector<TObject> args)
+    
-    {
-        return std::make_shared<Tesses::Framework::Filesystem::MemoryFilesystem>();
-    }
 
     static TObject New_Filesystem(GCList& ls, std::vector<TObject> args)
     {
@@ -1329,9 +1326,7 @@ namespace Tesses::CrossLang
         newTypes->DeclareFunction(gc, "Filesystem","Create filesystem", {"fs"},New_Filesystem);
         newTypes->DeclareFunction(gc, "TempFS","Create a temp directory",{"",""}, New_TempFS);
         newTypes->DeclareFunction(gc, "Stream","Create stream", {"strm"},New_Stream);
-
+        
-        newTypes->DeclareFunction(gc, "MemoryFilesystem","Create in memory filesystem", {},New_MemoryFilesystem);
-
     
         newTypes->DeclareFunction(gc,"Version","Create a version object",{"$major","$minor","$patch","$build","$stage"},[](GCList& ls, std::vector<TObject> args)->TObject{
             int64_t major=1;

src/types/dictionary.cpp

@@ -110,18 +110,18 @@ namespace Tesses::CrossLang  {
             if(GetObjectHeap(res,callable))
             {
                  auto closure = dynamic_cast<TClosure*>(callable);
-                if(closure != nullptr && !closure->closure->args.empty() && closure->closure->args.front() == "this") 
+                if(closure != nullptr && !closure->closure->args.empty() && closure->closure->args.front() == "this")
                 {
                    std::vector<TObject> args2;
                         args2.push_back(this);
                         args2.insert(args2.end(), args.begin(),args.end());
                     return closure->Call(ls,args2);
-                    
+
                 }
                 else
                 {
                     return callable->Call(ls,args);
-                    
+
                 }
             }
         return Undefined();
@@ -136,23 +136,23 @@ namespace Tesses::CrossLang  {
             if(GetObjectHeap(res,callable))
             {
                  auto closure = dynamic_cast<TClosure*>(callable);
-                if(closure != nullptr && !closure->closure->args.empty() && closure->closure->args.front() == "this") 
+                if(closure != nullptr && !closure->closure->args.empty() && closure->closure->args.front() == "this")
                 {
                    std::vector<TObject> args2;
                         args2.push_back(this);
                         args2.insert(args2.end(), args.begin(),args.end());
                     return closure->CallWithFatalError(ls,args2);
-                    
+
                 }
                 else
                 {
                     return callable->CallWithFatalError(ls,args);
-                    
+
                 }
             }
         return Undefined();
     }
-    
+
     void TDictionary::DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb)
     {
         gc->BarrierBegin();
@@ -184,10 +184,8 @@ namespace Tesses::CrossLang  {
     TObject TDictionary::GetValue(std::string key)
     {
         if(this->items.empty()) return Undefined();
-        for(auto item : this->items)
+        if(this->items.count(key) > 0)
-        {
+                return this->items[key];
-            if(item.first == key) return item.second;
-        }
         return Undefined();
     }
     void TDictionary::SetValue(std::string key, TObject value)
@@ -231,5 +229,5 @@ namespace Tesses::CrossLang  {
         _gc->Watch(dict);
         return dict;
     }
-    
+
-};
+};

src/types/vfsheapobject.cpp

@@ -7,130 +7,23 @@ namespace Tesses::CrossLang {
         this->ls = new GCList(gc);
         this->ls->Add(obj);
         this->obj = obj;
-        TDictionary* dict;
+        
-        if(GetObjectHeap(obj,dict))
-        {
-            gc->BarrierBegin();
-            if(!dict->HasValue("OpenFile"))
-            {
-                dict->DeclareFunction(gc,"OpenFile","Open a file",{"path","mode"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    return nullptr;
-                });
-            }
-            if(!dict->HasValue("EnumeratePaths"))
-            {
-                dict->DeclareFunction(gc,"EnumeratePaths","Enumerate paths",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    return TVFSPathEnumerator::Create(ls,Tesses::Framework::Filesystem::VFSPathEnumerator());
-                });
-            }
-            if(!dict->HasValue("ReadLink"))
-            {
-                dict->DeclareFunction(gc,"ReadLink","Read a symlink",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    return Tesses::Framework::Filesystem::VFSPath();
-                });
-            }
-
-            if(!dict->HasValue("VFSPathToSystem"))
-            {
-                dict->DeclareFunction(gc,"VFSPathToSystem","Convert path to system",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    Tesses::Framework::Filesystem::VFSPath path;
-                    if(GetArgumentAsPath(args,0,path))
-                    {
-                        return path.ToString();
-                    }
-                    return "/";
-                });
-            }
-            if(!dict->HasValue("SystemToVFSPath"))
-            {
-                dict->DeclareFunction(gc,"SystemToVFSPath","Convert system to path",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    std::string p;
-                    if(GetArgument(args,0,p))
-                    {
-                        return Tesses::Framework::Filesystem::VFSPath(p);
-                    }
-                    return Tesses::Framework::Filesystem::VFSPath();
-                });
-            }
-            if(!dict->HasValue("GetDate"))
-            {
-                dict->DeclareFunction(gc,"GetDate","Get date from file",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    auto dict = TDictionary::Create(ls);
-                    ls.GetGC()->BarrierBegin();
-                    dict->SetValue("LastWrite", (int64_t)time(NULL));
-                    dict->SetValue("LastAccess", (int64_t)time(NULL));
-                    ls.GetGC()->BarrierEnd();
-                    return dict;    
-                });
-            }
-            if(!dict->HasValue("RegularFileExists"))
-            {
-                dict->DeclareFunction(gc,"RegularFileExists","Regular file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("SymlinkExists"))
-            {
-                dict->DeclareFunction(gc,"SymlinkExists","Symlink exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("CharacterDeviceExists"))
-            {
-                dict->DeclareFunction(gc,"CharacterDeviceExists","Character file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("BlockDeviceExists"))
-            {
-                dict->DeclareFunction(gc,"BlockDeviceExists","Block file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("SocketFileExists"))
-            {
-                dict->DeclareFunction(gc,"SocketFileExists","Socket file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-
-            if(!dict->HasValue("FIFOFileExists"))
-            {
-                dict->DeclareFunction(gc,"FIFOFileExists","FIFO file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("FileExists"))
-            {
-                dict->DeclareFunction(gc,"FileExists","File exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("SpecialFileExists"))
-            {
-                dict->DeclareFunction(gc,"SpecialFileExists","Special file exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            if(!dict->HasValue("DirectoryExists"))
-            {
-                dict->DeclareFunction(gc,"DirectoryExists","Directory exists",{"path"}, [](GCList& ls, std::vector<TObject> args)->TObject {
-                    
-                    return false;
-                });
-            }
-            gc->BarrierEnd();
-        }
         
     }
+    Tesses::Framework::Filesystem::FIFOCreationResult TObjectVFS::CreateFIFO(Tesses::Framework::Filesystem::VFSPath path)
+    {
+        TDictionary* dict;
+        
+        if(GetObjectHeap(this->obj, dict))
+        {
+            GCList ls(this->ls->GetGC());
+            auto res = dict->CallMethod(ls, "CreateFIFO",{path});
+            int64_t n=0;
+            if(GetObject(res, n)) return (Tesses::Framework::Filesystem::FIFOCreationResult)n;
+        }
+        return Tesses::Framework::Filesystem::FIFOCreationResult::UnknownError;
+    }
+            
     std::shared_ptr<Tesses::Framework::Streams::Stream> TObjectVFS::OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode)
     {
         TDictionary* dict;
@@ -189,136 +82,7 @@ namespace Tesses::CrossLang {
             
         }
     }
-    bool TObjectVFS::RegularFileExists(Tesses::Framework::Filesystem::VFSPath path)
+  void TObjectVFS::CreateSymlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath symlinkFile)
-    {
-
-        TDictionary* dict;
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "RegularFileExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-
-    bool TObjectVFS::SymlinkExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "SymlinkExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::CharacterDeviceExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "CharacterDeviceExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::BlockDeviceExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "BlockDeviceExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::SocketFileExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "SocketFileExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::FIFOFileExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "FIFOFileExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::FileExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "FileExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    bool TObjectVFS::SpecialFileExists(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "SpecialFileExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    void TObjectVFS::CreateSymlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath symlinkFile)
     {
         TDictionary* dict;
         
@@ -340,22 +104,7 @@ namespace Tesses::CrossLang {
             
         }
     }
-    bool TObjectVFS::DirectoryExists(Tesses::Framework::Filesystem::VFSPath path)
+   void TObjectVFS::DeleteFile(Tesses::Framework::Filesystem::VFSPath path)
-    {
-        TDictionary* dict;
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "DirectoryExists",{path});
-            bool out;
-            if(GetObject(res,out))
-            {
-                return out;
-            }
-        }
-        return false;
-    }
-    void TObjectVFS::DeleteFile(Tesses::Framework::Filesystem::VFSPath path)
     {
         TDictionary* dict;
         
@@ -484,31 +233,6 @@ namespace Tesses::CrossLang {
         }
         return Tesses::Framework::Filesystem::VFSPath();
     }
-    void TObjectVFS::GetDate(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Date::DateTime& lastWrite, Tesses::Framework::Date::DateTime& lastAccess)
-    {
-
-        TDictionary* dict;
-        if(GetObjectHeap(this->obj, dict))
-        {
-            GCList ls(this->ls->GetGC());
-            auto res = dict->CallMethod(ls, "GetDate",{path});
-            if(GetObjectHeap(res,dict))
-            {
-                this->ls->GetGC()->BarrierBegin();
-                res = dict->GetValue("LastWrite");
-                std::shared_ptr<Tesses::Framework::Date::DateTime> d;
-                if(GetObject(res,d))
-                    lastWrite =*d;
-
-                res = dict->GetValue("LastAccess");
-                
-                if(GetObject(res,d))
-                lastWrite = *d;
-
-                this->ls->GetGC()->BarrierEnd();
-            }
-        }
-    }
     void TObjectVFS::SetDate(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Date::DateTime lastWrite, Tesses::Framework::Date::DateTime lastAccess)
     {
 
@@ -532,6 +256,80 @@ namespace Tesses::CrossLang {
             
         }
     }
+    void TObjectVFS::Chown(Tesses::Framework::Filesystem::VFSPath path, uint32_t uid, uint32_t gid)
+    {
+        TDictionary* dict;
+        
+        if(GetObjectHeap(this->obj, dict))
+        {
+            GCList ls(this->ls->GetGC());
+            dict->CallMethod(ls, "Chown",{path,(int64_t)uid, (int64_t)gid});
+            
+        }
+    }
+    bool TObjectVFS::Stat(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatData& data)
+    {
+        TDictionary* dict;
+        
+        if(GetObjectHeap(this->obj, dict))
+        {
+            GCList ls(this->ls->GetGC());
+            auto res = dict->CallMethod(ls, "Stat",{path});
+            int64_t _num;
+            TDictionary* _dict;
+            TObject _o;
+            if(GetObjectHeap(res,_dict))
+            {
+                this->ls->GetGC()->BarrierBegin();
+                _o = dict->GetValue("BlockSize");
+                if(GetObject(_o,_num)) data.BlockSize = (uint64_t)_num;
+
+                _o = dict->GetValue("BlockCount");
+                if(GetObject(_o,_num)) data.BlockCount = (uint64_t)_num;
+                
+                _o = dict->GetValue("Device");
+                if(GetObject(_o,_num)) data.Device = (uint64_t)_num;
+                
+                _o = dict->GetValue("DeviceId");
+                if(GetObject(_o,_num)) data.DeviceId = (uint64_t)_num;
+                
+                _o = dict->GetValue("GroupId");
+                if(GetObject(_o,_num)) data.GroupId = (uint32_t)_num;
+                
+                _o = dict->GetValue("HardLinks");
+                if(GetObject(_o,_num)) data.HardLinks = (uint64_t)_num;
+                std::shared_ptr<Tesses::Framework::Date::DateTime> dt;
+                _o = dict->GetValue("LastAccess");
+                if(GetObject(_o,dt)) data.LastAccess = dt ? *dt : Tesses::Framework::Date::DateTime(0);
+                
+
+                _o = dict->GetValue("LastModified");
+                if(GetObject(_o,dt)) data.LastModified = dt ? *dt : Tesses::Framework::Date::DateTime(0);
+                
+                
+
+                _o = dict->GetValue("LastStatus");
+                if(GetObject(_o,dt)) data.LastStatus = dt ? *dt : Tesses::Framework::Date::DateTime(0);
+                
+
+
+                _o = dict->GetValue("Mode");
+                if(GetObject(_o,_num)) data.Mode = (uint32_t)_num;
+                
+                _o = dict->GetValue("Size");
+                if(GetObject(_o,_num)) data.Size = (uint64_t)_num;
+                
+                _o = dict->GetValue("UserId");
+                if(GetObject(_o,_num)) data.UserId = (uint32_t)_num;
+
+
+                this->ls->GetGC()->BarrierEnd();
+                return true;
+            }
+        }
+
+        return false;
+    }
     bool TObjectVFS::StatVFS(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatVFSData& data)
     {
         TDictionary* dict;

src/vm/bc/executemethod2.cpp

@@ -1997,6 +1997,38 @@ namespace Tesses::CrossLang {
                         cse.back()->Push(gc, nullptr);
                         return false;
                     }
+                    if(key == "Stat")
+                    {
+                        Tesses::Framework::Filesystem::VFSPath path;
+                        
+                        if(GetArgumentAsPath(args,0,path))
+                        {
+                            Tesses::Framework::Filesystem::StatData data;
+                            if(vfs->Stat(path,data))
+                            {
+                                cse.back()->Push(gc, TDictionary::Create(ls,{
+                                    TDItem("BlockCount", (int64_t)data.BlockCount),
+                                    TDItem("BlockSize", (int64_t)data.BlockSize),
+                                    TDItem("Device", (int64_t)data.Device),
+                                    TDItem("DeviceId", (int64_t)data.DeviceId),
+                                    TDItem("GroupId", (int64_t)data.GroupId),
+                                    TDItem("HardLinks", (int64_t)data.HardLinks),
+                                    TDItem("Inode", (int64_t)data.Inode),
+                                    TDItem("LastAccess", std::make_shared<Tesses::Framework::Date::DateTime>(data.LastAccess)),
+                                    TDItem("LastModified", std::make_shared<Tesses::Framework::Date::DateTime>(data.LastModified)),
+                                    TDItem("LastStatus", std::make_shared<Tesses::Framework::Date::DateTime>(data.LastStatus)),
+                                    TDItem("Mode", (int64_t)data.Mode),
+                                    TDItem("Size", (int64_t)data.Size),
+                                    TDItem("UserId", (int64_t)data.UserId)
+                                }));
+                                return false;
+                            }
+                        }
+
+                        cse.back()->Push(gc, nullptr);
+                        return false;
+                    }
+                    
                     if(key == "StatVFS")
                     {
                         Tesses::Framework::Filesystem::VFSPath path;

src/vm/gc.cpp

@@ -13,28 +13,23 @@ using namespace Tesses::Framework::Threading;
 using namespace std::chrono;
 namespace Tesses::CrossLang
 {
-   
+
     bool GC::IsRunning()
     {
-        
+
         bool run = this->running;
-       
+
         return run;
     }
     GC::GC()
     {
 
-        this->tpool=new Tesses::Framework::Lazy<Tesses::Framework::Threading::ThreadPool*>([]()->Tesses::Framework::Threading::ThreadPool*{
-            auto threads = Tesses::Framework::Threading::ThreadPool::GetNumberOfCores();
-            if(threads < 4) threads=4;
-            return new Tesses::Framework::Threading::ThreadPool(threads);
-        },[](Tesses::Framework::Threading::ThreadPool* p)->void{delete p;});
     }
     TDictionary* CreateThread(GCList& ls, TCallable* callable,bool detached)
     {
 
         TDictionary* dict = TDictionary::Create(ls);
-                        
+
         ThreadHandle* th = new ThreadHandle();
         th->gc = ls.GetGC();
         th->callable = callable;
@@ -43,16 +38,16 @@ namespace Tesses::CrossLang
         th->detached=detached;
         ls.Add(th);
         ls.GetGC()->Watch(th);
-                        
+
         ls.GetGC()->BarrierBegin();
         dict->SetValue("_internal", th);
-                        
+
         dict->DeclareFunction(ls.GetGC(),"Join","Join thread",{},[th](GCList& _ls, std::vector<TObject> _args)-> TObject{
-                            
+
-            
+
             th->thrd->Join();
             delete th->thrd;
-                                            
+
             if(th->hasReturned)
             {
                 _ls.GetGC()->BarrierBegin();
@@ -69,12 +64,12 @@ namespace Tesses::CrossLang
             _ls.GetGC()->BarrierEnd();
             return Undefined();
         });
-                        
+
         dict->DeclareFunction(ls.GetGC(),"getFinished","Get whether thread has finished",{},[th](GCList& _ls, std::vector<TObject> _args)-> TObject{
             return (bool)(th->hasReturned==true);
         });
-                        
+
-        ls.GetGC()->BarrierEnd();  
+        ls.GetGC()->BarrierEnd();
         th->thrd =new Thread([th]()->void {
             GC* gc=th->gc;
             GCList ls(gc);
@@ -83,7 +78,7 @@ namespace Tesses::CrossLang
             TObject cb = th->callable->Call(ls,{});
             gc->BarrierBegin();
             th->returnValue=cb;
-            gc->BarrierEnd();   
+            gc->BarrierEnd();
             th->hasReturned=true;
         });
         while(!th->hasInit);
@@ -91,14 +86,20 @@ namespace Tesses::CrossLang
     }
     void GC::Start()
     {
+
+        this->tpool=new Tesses::Framework::Lazy<Tesses::Framework::Threading::ThreadPool*>([]()->Tesses::Framework::Threading::ThreadPool*{
+            auto threads = Tesses::Framework::Threading::ThreadPool::GetNumberOfCores();
+            if(threads < 4) threads=4;
+            return new Tesses::Framework::Threading::ThreadPool(threads);
+        },[](Tesses::Framework::Threading::ThreadPool* p)->void{delete p;});
         this->mtx=new Mutex();
         this->running = true;
         this->thrd = new Thread([this]()->void {
               std::chrono::time_point<std::chrono::system_clock> last_frame, this_frame;
-        
+
         this_frame = system_clock::now();
         last_frame = this_frame;
-        
+
         while(this->IsRunning())
         {
             this_frame = system_clock::now();
@@ -108,7 +109,7 @@ namespace Tesses::CrossLang
 
                 last_frame = this_frame;
                 this->Collect();
-                
+
 
             }
 
@@ -129,14 +130,14 @@ namespace Tesses::CrossLang
 
     void GC::BarrierBegin()
     {
-        
+
         this->mtx->Lock();
     }
     void GC::BarrierEnd()
-    {  
+    {
-        
+
         this->mtx->Unlock();
-        
+
     }
     void GC::Watch(TObject obj)
     {
@@ -144,7 +145,7 @@ namespace Tesses::CrossLang
         {
             auto _item=std::get<THeapObjectHolder>(obj).obj;
             this->BarrierBegin();
-            
+
             for(auto item : this->objects)
             {
                 if(item == _item) {
@@ -187,7 +188,7 @@ namespace Tesses::CrossLang
         {
             auto _item=std::get<THeapObjectHolder>(obj).obj;
             this->BarrierBegin();
-            
+
             for(auto item : this->roots)
             {
                 if(item == _item) {
@@ -203,6 +204,7 @@ namespace Tesses::CrossLang
     {
         return this->tpool->GetValue();
     }
+
     void GC::UnsetRoot(TObject obj)
     {
         if(std::holds_alternative<THeapObjectHolder>(obj))
@@ -224,14 +226,19 @@ namespace Tesses::CrossLang
     GC::~GC()
     {
         GC::BarrierBegin();
+
         this->roots.clear();
         GC::BarrierEnd();
+
+
+
         this->running=false;
         this->thrd->Join();
         delete this->thrd;
         for(auto item : objects) delete item;
-        delete this->mtx;
+
         delete this->tpool;
+        delete this->mtx;
     }
 
     void GC::RegisterEverythingCallback(std::function<void(GC* gc, TRootEnvironment* env)> cb)
@@ -265,6 +272,6 @@ namespace Tesses::CrossLang
             }
         }
         this->BarrierEnd();
-       
+
     }
 };

src/vm/gclist.cpp

@@ -44,7 +44,7 @@ namespace Tesses::CrossLang
         {
             auto _item=std::get<THeapObjectHolder>(obj).obj;
             this->gc->BarrierBegin();
-            
+
             for(auto item : this->items)
             {
                 if(item == _item) {
@@ -70,4 +70,4 @@ namespace Tesses::CrossLang
         this->gc->UnsetRoot(this);
         gc->BarrierEnd();
     }
-}
+}