Compare commits
15 Commits
5be9d96b54
...
v0.0.4
| Author | SHA1 | Date | |
|---|---|---|---|
| 28eff630c6 | |||
| f23a3880d4 | |||
| 37fd44fd78 | |||
| 06f1aff2b4 | |||
| 991f2a217d | |||
| fca18e63a6 | |||
| 63b00ebbcb | |||
| 7badbeb217 | |||
| 66f5b704ee | |||
| c2d9627405 | |||
| 8e1ea768b0 | |||
| dc1e02cb9f | |||
| e9b4057e32 | |||
| fa5bc42908 | |||
| 572c0ab468 |
@@ -5,66 +5,69 @@ on:
|
|||||||
- 'v*'
|
- 'v*'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GITEA_AUTH: ${{ secrets.MY_GITEA_AUTH }}
|
PACKAGE_AND_BREW: ${{ secrets.PACKAGE_AND_BREW }}
|
||||||
|
VERSION: ${{ gitea.ref_name }}
|
||||||
|
RESULT_IMAGE_NAME: tesses50/crosslang
|
||||||
|
GITEA_DOMAIN: git.tesses.org
|
||||||
|
GITEA_REGISTRY_USER: tesses50
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-arch:
|
build-arch:
|
||||||
runs-on: arch-builder
|
runs-on: arch-builder
|
||||||
steps:
|
steps:
|
||||||
- run: pacman --noconfirm -Sy nodejs npm
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: wget -O /root/repository.key https://git.tesseslanguage.com/api/packages/tesses50/arch/repository.key
|
- run: wget -O /root/repository.key https://git.tesses.org/api/packages/tesses50/arch/repository.key
|
||||||
- run: pacman-key --add /root/repository.key
|
- run: pacman-key --add /root/repository.key
|
||||||
- run: pacman-key --config /opt/cross/ppc/pacman.conf --add /root/repository.key
|
- run: pacman-key --config /opt/cross/ppc/pacman.conf --add /root/repository.key
|
||||||
- run: printf "[tesses50.git.tesseslanguage.com]\nSigLevel = Optional TrustAll\nServer = https://git.tesseslanguage.com/api/packages/tesses50/arch/core/\$arch\n" >> /etc/pacman.conf
|
- run: printf "[tesses50.git.tesses.org]\nSigLevel = Optional TrustAll\nServer = https://git.tesses.org/api/packages/tesses50/arch/core/\$arch\n" >> /etc/pacman.conf
|
||||||
- run: printf "[tesses50.git.tesseslanguage.com]\nSigLevel = Optional TrustAll\nServer = https://git.tesseslanguage.com/api/packages/tesses50/arch/core/\$arch\n" >> /opt/cross/ppc/pacman.conf
|
- run: printf "[tesses50.git.tesses.org]\nSigLevel = Optional TrustAll\nServer = https://git.tesses.org/api/packages/tesses50/arch/core/\$arch\n" >> /opt/cross/ppc/pacman.conf
|
||||||
- run: pacman --noconfirm -Sy mbedtls curl tesses-framework
|
- run: pacman --noconfirm -Sy mbedtls curl tessesframework zip zig ninja
|
||||||
- run: pacman --config /opt/cross/ppc/pacman.conf --noconfirm -Sy mbedtls tesses-framework
|
- run: pacman --config /opt/cross/ppc/pacman.conf --noconfirm -Sy mbedtls tessesframework
|
||||||
- run: cp Packaging/Linux/PKGBUILD /home/build/PKGBUILD
|
- run: cp Packaging/Linux/PKGBUILD /home/build/PKGBUILD
|
||||||
- run: cp Packaging/Linux/build-arch.sh /home/build/build-arch.sh
|
- run: cp Packaging/Linux/build-arch.sh /home/build/build-arch.sh
|
||||||
- run: chmod 755 /home/build/build-arch.sh
|
- run: chmod 755 /home/build/build-arch.sh
|
||||||
- run: chown build:build /home/build/PKGBUILD
|
- run: chown build:build /home/build/PKGBUILD
|
||||||
- run: chown build:build /home/build/build-arch.sh
|
- run: chown build:build /home/build/build-arch.sh
|
||||||
- run: su build -c /home/build/build-arch.sh
|
- run: su build -c /home/build/build-arch.sh
|
||||||
build-jammy:
|
- run: env -C Packaging/Slim bash build.sh
|
||||||
runs-on: deb-builder-jammy
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Build for jammy, noble
|
|
||||||
run: |
|
|
||||||
mkdir ../../artifacts
|
|
||||||
apt update -y
|
|
||||||
apt install -y pkg-config git
|
|
||||||
bash build-ubuntu-jammy.sh
|
|
||||||
bash push-ubuntu-jammy.sh
|
|
||||||
bash build-tars.sh
|
|
||||||
working-directory: ./Packaging/Linux
|
|
||||||
- uses: akkuman/gitea-release-action@v1
|
- uses: akkuman/gitea-release-action@v1
|
||||||
env:
|
env:
|
||||||
NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
|
NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
|
||||||
with:
|
with:
|
||||||
|
prerelease: true
|
||||||
files: |-
|
files: |-
|
||||||
artifacts/**
|
artifacts/**
|
||||||
build-plucky:
|
|
||||||
runs-on: deb-builder-plucky
|
update-tap:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Build for plucky, resolute
|
- name: Set up Docker Buildx
|
||||||
run: |
|
uses: docker/setup-buildx-action@v3
|
||||||
mkdir ../../artifacts
|
- name: Log in to registry
|
||||||
apt update -y
|
uses: docker/login-action@v3
|
||||||
apt install -y pkg-config git gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 nsis
|
|
||||||
bash build-ubuntu-plucky.sh
|
|
||||||
bash push-ubuntu-plucky.sh
|
|
||||||
working-directory: ./Packaging/Linux
|
|
||||||
|
|
||||||
- name: Build for windows
|
|
||||||
run: bash build.sh
|
|
||||||
|
|
||||||
working-directory: ./Packaging/Windows
|
|
||||||
- uses: akkuman/gitea-release-action@v1
|
|
||||||
env:
|
|
||||||
NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
|
|
||||||
with:
|
with:
|
||||||
files: |-
|
registry: ${{ env.GITEA_DOMAIN }}
|
||||||
artifacts/**
|
username: ${{ env.GITEA_REGISTRY_USER }}
|
||||||
|
password: ${{ secrets.PACKAGE_AND_BREW }}
|
||||||
|
- name: Build and push image
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: ${{ env.GITEA_DOMAIN }}/${{ env.RESULT_IMAGE_NAME }}:latest
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: "master"
|
||||||
|
path: "tapdir"
|
||||||
|
repository: "tesses50/tesses-tap.git"
|
||||||
|
token: ${{ env.PACKAGE_AND_BREW }}
|
||||||
|
- run: |
|
||||||
|
cd tapdir
|
||||||
|
bash ../Packaging/edit-formula.sh
|
||||||
|
git config user.name "Tesses Gitea Bot"
|
||||||
|
git config user.email "noreply@tesses.net"
|
||||||
|
git add .
|
||||||
|
git commit -m "Push crosslang=${{ env.VERSION }}"
|
||||||
|
git push
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -11,3 +11,6 @@ bin
|
|||||||
*.exe
|
*.exe
|
||||||
build-x86
|
build-x86
|
||||||
build-x64
|
build-x64
|
||||||
|
build-x86-slim
|
||||||
|
build-x64-slim
|
||||||
|
crosslang-*-temp
|
||||||
@@ -1,57 +1,42 @@
|
|||||||
version: 43
|
version: 43
|
||||||
jobs:
|
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
|
|
||||||
|
|||||||
325
CMakeLists.txt
325
CMakeLists.txt
@@ -1,8 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
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})
|
project(TessesCrossLang VERSION ${CROSSLANG_MAJOR_VERSION}.${CROSSLANG_MINOR_VERSION}.${CROSSLANG_PATCH_VERSION})
|
||||||
|
|
||||||
@@ -12,38 +11,12 @@ set(CMAKE_CXX_STANDARD 17)
|
|||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
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_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)
|
if(CROSSLANG_CUSTOM_CONSOLE)
|
||||||
set(CROSSLANG_ENABLE_BINARIES OFF)
|
set(CROSSLANG_ENABLE_BINARIES OFF)
|
||||||
set(CROSSLANG_ENABLE_SHARED OFF)
|
set(CROSSLANG_ENABLE_SHARED OFF)
|
||||||
endif()
|
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)
|
if(CROSSLANG_FETCHCONTENT)
|
||||||
|
|
||||||
@@ -66,7 +39,7 @@ endif()
|
|||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
TessesFramework
|
TessesFramework
|
||||||
GIT_REPOSITORY https://onedev.site.tesses.net/tesses-framework.git
|
GIT_REPOSITORY https://git.tesses.org/tesses50/tessesframework.git
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(TessesFramework)
|
FetchContent_MakeAvailable(TessesFramework)
|
||||||
list(APPEND TessesCrossLangLibs ${TessesFrameworkTargets})
|
list(APPEND TessesCrossLangLibs ${TessesFrameworkTargets})
|
||||||
@@ -77,128 +50,13 @@ endif()
|
|||||||
if(CROSSLANG_ENABLE_FFI)
|
if(CROSSLANG_ENABLE_FFI)
|
||||||
find_package(PkgConfig)
|
find_package(PkgConfig)
|
||||||
endif()
|
endif()
|
||||||
|
include(cmake/linkdeps.cmake)
|
||||||
if(CROSSLANG_ENABLE_FFI AND CROSSLANG_ENABLE_SHARED)
|
if(CROSSLANG_ENABLE_FFI AND CROSSLANG_ENABLE_SHARED)
|
||||||
pkg_check_modules(LIBFFI REQUIRED IMPORTED_TARGET libffi)
|
pkg_check_modules(LIBFFI REQUIRED IMPORTED_TARGET libffi)
|
||||||
endif()
|
endif()
|
||||||
function(CROSSLANG_LINK_DEPS CROSSLANG_TARGET_NAME)
|
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/CrossLangVersion.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/CrossLangVersion.h"
|
||||||
target_include_directories(${CROSSLANG_TARGET_NAME}
|
INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CrossLangVersion.h)
|
||||||
PUBLIC
|
include(cmake/sources.cmake)
|
||||||
"$<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_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()
|
|
||||||
|
|
||||||
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
|
|
||||||
)
|
|
||||||
|
|
||||||
if(CROSSLANG_OFFLINE_SHELL_PACKAGE STREQUAL "")
|
if(CROSSLANG_OFFLINE_SHELL_PACKAGE STREQUAL "")
|
||||||
|
|
||||||
@@ -244,173 +102,22 @@ list(APPEND TessesCrossLangLibs crosslang_shared)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
if(CROSSLANG_ENABLE_SUPERSLIM)
|
||||||
|
include(cmake/slim.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)
|
|
||||||
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)
|
|
||||||
|
|
||||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TessesCrossLangConfig.cmake"
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TessesCrossLang)
|
|
||||||
else()
|
else()
|
||||||
if(CROSSLANG_ENABLE_SHARED)
|
include(cmake/shared.cmake)
|
||||||
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_BINARIES)
|
||||||
if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES)
|
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/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchivecreate src/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)
|
elseif(CROSSLANG_ENABLE_STATIC)
|
||||||
|
include(cmake/static_exec.cmake)
|
||||||
add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchivecreate src/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()
|
else()
|
||||||
add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
include(cmake/exec.cmake)
|
||||||
add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
endif()
|
||||||
add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crosslang src/crosslang.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
|
|
||||||
add_executable(crossarchivecreate src/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 crossc DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||||
install(TARGETS crossvm DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
install(TARGETS crossvm DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||||
install(TARGETS crossint DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
install(TARGETS crossint DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||||
@@ -436,6 +143,7 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/crosslang.thumbnailer"
|
|||||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/thumbnailers)
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/thumbnailers)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
endif()
|
||||||
include(InstallRequiredSystemLibraries)
|
include(InstallRequiredSystemLibraries)
|
||||||
set(CPACK_PACKAGE_CONTACT "Mike Nolan <tesses@tesses.net>")
|
set(CPACK_PACKAGE_CONTACT "Mike Nolan <tesses@tesses.net>")
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
|
||||||
@@ -475,5 +183,6 @@ set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOL
|
|||||||
|
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
if(CROSSLANG_INSTALL_DEVELOPMENT)
|
||||||
add_subdirectory(pkgconfig)
|
add_subdirectory(pkgconfig)
|
||||||
|
endif()
|
||||||
|
|||||||
25
Dockerfile
25
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"]
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
FROM onedev.site.tesses.net/tesses-framework/tesses-framework:latest
|
|
||||||
COPY out /
|
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
# Maintainer: Mike Nolan <tesses@tesses.net>
|
# Maintainer: Mike Nolan <tesses@tesses.net>
|
||||||
pkgname=crosslang # '-bzr', '-git', '-hg' or '-svn'
|
pkgname=crosslang # '-bzr', '-git', '-hg' or '-svn'
|
||||||
pkgver=0.0.2
|
pkgver=0.0.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc=""
|
pkgdesc=""
|
||||||
arch=('x86_64' 'powerpc')
|
arch=('x86_64' 'powerpc')
|
||||||
url="https://onedev.site.tesses.net/crosslang"
|
url="https://git.tesses.org/tesses50/crosslang"
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
groups=()
|
groups=()
|
||||||
depends=('mbedtls' 'tesses-framework')
|
depends=('mbedtls' 'tessesframework=0.0.3')
|
||||||
makedepends=('git' 'cmake' 'make' 'base-devel' 'wget') # 'bzr', 'git', 'mercurial' or 'subversion'
|
makedepends=('git' 'cmake' 'make' 'base-devel' 'wget') # 'bzr', 'git', 'mercurial' or 'subversion'
|
||||||
install=
|
install=
|
||||||
source=('crosslang::git+https://onedev.site.tesses.net/crosslang')
|
source=('crosslang::git+https://git.tesses.org/tesses50/crosslang')
|
||||||
noextract=()
|
noextract=()
|
||||||
sha256sums=('SKIP')
|
sha256sums=('SKIP')
|
||||||
if [[ -z "$CMAKE_TOOLCHAIN" ]]; then
|
if [[ -z "$CMAKE_TOOLCHAIN" ]]; then
|
||||||
@@ -32,9 +32,9 @@ build() {
|
|||||||
mkdir build
|
mkdir build
|
||||||
|
|
||||||
if [[ -z "$CMAKE_TOOLCHAIN" ]]; then
|
if [[ -z "$CMAKE_TOOLCHAIN" ]]; then
|
||||||
cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=Release
|
||||||
else
|
else
|
||||||
cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TOOLCHAIN"
|
cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TOOLCHAIN"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd build
|
cd build
|
||||||
@@ -49,4 +49,3 @@ package() {
|
|||||||
cd "$srcdir/${pkgname}/build"
|
cd "$srcdir/${pkgname}/build"
|
||||||
make install DESTDIR="$pkgdir/"
|
make install DESTDIR="$pkgdir/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ mkdir x86_64
|
|||||||
cd x86_64
|
cd x86_64
|
||||||
cp ../PKGBUILD .
|
cp ../PKGBUILD .
|
||||||
makepkg
|
makepkg
|
||||||
curl --user tesses50:$GITEA_AUTH \
|
curl --user tesses50:$PACKAGE_AND_BREW \
|
||||||
--upload-file *.pkg.tar.zst \
|
--upload-file *.pkg.tar.zst \
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/arch/core
|
https://git.tesses.org/api/packages/tesses50/arch/core
|
||||||
cd ..
|
cd ..
|
||||||
mkdir powerpc
|
mkdir powerpc
|
||||||
cd powerpc
|
cd powerpc
|
||||||
cp ../PKGBUILD .
|
cp ../PKGBUILD .
|
||||||
CARCH=powerpc CMAKE_TOOLCHAIN=/opt/cross/ppc/toolchain.cmake makepkg
|
CARCH=powerpc CMAKE_TOOLCHAIN=/opt/cross/ppc/toolchain.cmake makepkg
|
||||||
curl --user tesses50:$GITEA_AUTH \
|
curl --user tesses50:$PACKAGE_AND_BREW \
|
||||||
--upload-file *.pkg.tar.zst \
|
--upload-file *.pkg.tar.zst \
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/arch/core
|
https://git.tesses.org/api/packages/tesses50/arch/core
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
mkdir build-x86_64-tar
|
|
||||||
cd build-x86_64-tar
|
|
||||||
cmake -S ../../.. -B . -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_FETCHCONTENT=ON
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=./crosslang-x86_64
|
|
||||||
mkdir -p crosslang-x86_64/share/Tesses/CrossLang
|
|
||||||
cp ../build/jammy/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang-x86_64/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
tar cvzf ../../../artifacts/crosslang-linux-x86_64.tar.gz crosslang-x86_64
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
foreign() {
|
|
||||||
mkdir build-$1\-tar
|
|
||||||
cd build-$1\-tar
|
|
||||||
cmake -S ../../.. -B . -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_FETCHCONTENT=ON -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=./crosslang-$1
|
|
||||||
mkdir -p crosslang-$1\/share/Tesses/CrossLang
|
|
||||||
cp ../build/jammy/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang-$1\/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
tar cvzf ../../../artifacts/crosslang-linux-$1\.tar.gz crosslang-$1
|
|
||||||
cd ..
|
|
||||||
}
|
|
||||||
foreign arm64
|
|
||||||
foreign riscv64
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
source ./version.sh
|
|
||||||
mkdir -p build/jammy
|
|
||||||
cd build/jammy
|
|
||||||
wget -O Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm https://downloads.tesses.net/ShellPackage.crvm
|
|
||||||
mkdir build-amd64
|
|
||||||
apt install -y tessesframework
|
|
||||||
cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF
|
|
||||||
cd build-amd64
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=../crosslang_$DEB_VERSION\_amd64
|
|
||||||
apt remove -y tessesframework
|
|
||||||
mkdir -p ../crosslang_$DEB_VERSION\_amd64/DEBIAN
|
|
||||||
bash ../../../make-control.sh ../crosslang_$DEB_VERSION\_amd64/DEBIAN/control amd64
|
|
||||||
cd ../
|
|
||||||
mkdir -p crosslang_$DEB_VERSION\_amd64/usr/share/Tesses/CrossLang
|
|
||||||
cp Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang_$DEB_VERSION\_amd64/usr/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
dpkg-deb --build crosslang_$DEB_VERSION\_amd64
|
|
||||||
|
|
||||||
foreign() {
|
|
||||||
apt install -y tessesframework:$1
|
|
||||||
mkdir build-$1
|
|
||||||
cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake
|
|
||||||
cd build-$1
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=../crosslang_$DEB_VERSION\_$1
|
|
||||||
mkdir -p ../crosslang_$DEB_VERSION\_$1/DEBIAN
|
|
||||||
bash ../../../make-control.sh ../crosslang_$DEB_VERSION\_$1\/DEBIAN/control $1
|
|
||||||
cd ../
|
|
||||||
mkdir -p crosslang_$DEB_VERSION\_$1\/usr/share/Tesses/CrossLang
|
|
||||||
cp Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang_$DEB_VERSION\_$1\/usr/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
dpkg-deb --build crosslang_$DEB_VERSION\_$1
|
|
||||||
apt remove -y tessesframework:$1
|
|
||||||
}
|
|
||||||
|
|
||||||
foreign arm64
|
|
||||||
foreign riscv64
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
source ./version.sh
|
|
||||||
mkdir -p build/plucky
|
|
||||||
cd build/plucky
|
|
||||||
wget -O Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm https://downloads.tesses.net/ShellPackage.crvm
|
|
||||||
mkdir build-amd64
|
|
||||||
apt install -y tessesframework
|
|
||||||
cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF
|
|
||||||
cd build-amd64
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=../crosslang_$DEB_VERSION\_amd64
|
|
||||||
apt remove -y tessesframework
|
|
||||||
mkdir -p ../crosslang_$DEB_VERSION\_amd64/DEBIAN
|
|
||||||
bash ../../../make-control.sh ../crosslang_$DEB_VERSION\_amd64/DEBIAN/control amd64
|
|
||||||
cd ../
|
|
||||||
mkdir -p crosslang_$DEB_VERSION\_amd64/usr/share/Tesses/CrossLang
|
|
||||||
cp Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang_$DEB_VERSION\_amd64/usr/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
dpkg-deb --build crosslang_$DEB_VERSION\_amd64
|
|
||||||
|
|
||||||
foreign() {
|
|
||||||
apt install -y tessesframework:$1
|
|
||||||
mkdir build-$1
|
|
||||||
cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake
|
|
||||||
cd build-$1
|
|
||||||
make -j`nproc`
|
|
||||||
make install DESTDIR=../crosslang_$DEB_VERSION\_$1
|
|
||||||
mkdir -p ../crosslang_$DEB_VERSION\_$1/DEBIAN
|
|
||||||
bash ../../../make-control.sh ../crosslang_$DEB_VERSION\_$1\/DEBIAN/control $1
|
|
||||||
cd ../
|
|
||||||
mkdir -p crosslang_$DEB_VERSION\_$1\/usr/share/Tesses/CrossLang
|
|
||||||
cp Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang_$DEB_VERSION\_$1\/usr/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
|
|
||||||
dpkg-deb --build crosslang_$DEB_VERSION\_$1
|
|
||||||
apt remove -y tessesframework:$1
|
|
||||||
}
|
|
||||||
|
|
||||||
foreign arm64
|
|
||||||
foreign riscv64
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
echo "Package: crosslang" > "$1"
|
|
||||||
echo "Version: $DEB_VERSION" >> "$1"
|
|
||||||
echo "Architecture: $2" >> "$1"
|
|
||||||
echo "Essential: no" >> "$1"
|
|
||||||
echo "Priority: optional" >> "$1"
|
|
||||||
echo "Depends: tessesframework, libffi-dev" >> "$1"
|
|
||||||
echo "Maintainer: Mike Nolan" >> "$1"
|
|
||||||
echo "Description: A programming language" >> "$1"
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
source ./version.sh
|
|
||||||
upload() {
|
|
||||||
curl --user tesses50:$GITEA_AUTH -X DELETE \
|
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/crosslang/$DEB_VERSION/$1
|
|
||||||
curl --user tesses50:$GITEA_AUTH \
|
|
||||||
--upload-file build/jammy/crosslang_$DEB_VERSION\_$1\.deb \
|
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload
|
|
||||||
}
|
|
||||||
upload amd64
|
|
||||||
upload arm64
|
|
||||||
upload riscv64
|
|
||||||
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
source ./version.sh
|
|
||||||
upload() {
|
|
||||||
curl --user tesses50:$GITEA_AUTH -X DELETE \
|
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/crosslang/$DEB_VERSION/$1
|
|
||||||
curl --user tesses50:$GITEA_AUTH \
|
|
||||||
--upload-file build/plucky/crosslang_$DEB_VERSION\_$1\.deb \
|
|
||||||
https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload
|
|
||||||
}
|
|
||||||
upload amd64
|
|
||||||
upload arm64
|
|
||||||
upload riscv64
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
export DEB_VERSION=0.0.2
|
|
||||||
34
Packaging/Slim/build.sh
Normal file
34
Packaging/Slim/build.sh
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
mkdir -p ../../artifacts
|
||||||
|
mkdir -p builds
|
||||||
|
git clone --depth 1 https://git.tesses.org/tesses50/zig-cross builds/zig-cross
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
for tripple in x86_64-linux-musl x86-linux-musl aarch64-linux-musl arm-linux-musleabi riscv64-linux-musl powerpc-linux-musleabihf; do
|
||||||
|
export BUILDDIR=builds/$tripple
|
||||||
|
mkdir -p $BUILDDIR
|
||||||
|
cmake -S ../.. -B $BUILDDIR --toolchain $PWD/builds/zig-cross/$tripple\.cmake -DCMAKE_BUILD_TYPE=Release -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DCROSSLANG_ENABLE_SUPERSLIM=ON -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++ -static -Wl,--strip-all" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -GNinja
|
||||||
|
cmake --build $BUILDDIR || exit 1
|
||||||
|
cmake --install $BUILDDIR --prefix $BUILDDIR/out
|
||||||
|
mv $BUILDDIR/out/bin/crosslang ../../artifacts/crosslang-slim-$tripple
|
||||||
|
done
|
||||||
|
|
||||||
|
for tripple in x86_64-windows-gnu x86-windows-gnu aarch64-windows-gnu; do
|
||||||
|
export BUILDDIR=builds/$tripple
|
||||||
|
mkdir -p $BUILDDIR
|
||||||
|
cmake -S ../.. -B $BUILDDIR --toolchain $PWD/builds/zig-cross/$tripple\.cmake -DCMAKE_BUILD_TYPE=Release -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++ -static -Wl,--strip-all" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCROSSLANG_ENABLE_SUPERSLIM=ON -GNinja
|
||||||
|
cmake --build $BUILDDIR || exit 1
|
||||||
|
cmake --install $BUILDDIR --prefix $BUILDDIR/out
|
||||||
|
|
||||||
|
mv $BUILDDIR/out/bin/crosslang.exe ../../artifacts/crosslang-slim-$tripple\.exe
|
||||||
|
done
|
||||||
|
|
||||||
|
for tripple in x86_64-macos-none aarch64-macos-none; do
|
||||||
|
export BUILDDIR=builds/$tripple
|
||||||
|
mkdir -p $BUILDDIR
|
||||||
|
cmake -S ../.. -B $BUILDDIR --toolchain $PWD/builds/zig-cross/$tripple\.cmake -DCMAKE_BUILD_TYPE=Release -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCROSSLANG_ENABLE_SUPERSLIM=ON -GNinja -DCMAKE_EXE_LINKER_FLAGS="-Wl,--strip-all"
|
||||||
|
cmake --build $BUILDDIR || exit 1
|
||||||
|
cmake --install $BUILDDIR --prefix $BUILDDIR/out
|
||||||
|
|
||||||
|
mv $BUILDDIR/out/bin/crosslang ../../artifacts/crosslang-slim-$tripple
|
||||||
|
done
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cmake -S ../.. -B build-x86 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x86.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x86
|
cmake -S ../.. -B build-x86 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x86.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x86 -DCMAKE_BUILD_TYPE=Release
|
||||||
cd build-x86
|
cd build-x86
|
||||||
make -j`nproc`
|
make -j`nproc`
|
||||||
cpack -G NSIS
|
cpack -G NSIS
|
||||||
@@ -7,7 +7,7 @@ cpack -G ZIP
|
|||||||
mv TessesCrossLang-*-win32.exe ../../../artifacts/crosslang-win32.exe
|
mv TessesCrossLang-*-win32.exe ../../../artifacts/crosslang-win32.exe
|
||||||
mv TessesCrossLang-*-win32.zip ../../../artifacts/crosslang-win32.zip
|
mv TessesCrossLang-*-win32.zip ../../../artifacts/crosslang-win32.zip
|
||||||
cd ..
|
cd ..
|
||||||
cmake -S ../.. -B build-x64 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x64
|
cmake -S ../.. -B build-x64 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x64 -DCMAKE_BUILD_TYPE=Release
|
||||||
cd build-x64
|
cd build-x64
|
||||||
make -j`nproc`
|
make -j`nproc`
|
||||||
cpack -G NSIS
|
cpack -G NSIS
|
||||||
|
|||||||
19
Packaging/edit-formula.sh
Normal file
19
Packaging/edit-formula.sh
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
export HASH=`curl https://git.tesses.org/tesses50/crosslang/archive/$VERSION.tar.gz 2> /dev/null | shasum -a 256 | awk '{print $1}'`
|
||||||
|
|
||||||
|
echo "class Crosslang < Formula" > "Formula/crosslang.rb"
|
||||||
|
echo " desc \"\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " homepage \"\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " url \"https://git.tesses.org/tesses50/crosslang/archive/$VERSION.tar.gz\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " sha256 \"$HASH\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " license \"GPLv3\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " depends_on \"cmake\" => :build" >> "Formula/crosslang.rb"
|
||||||
|
echo " depends_on \"tesses50/tesses-tap/tessesframework\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " def install" >> "Formula/crosslang.rb"
|
||||||
|
echo " system \"cmake\", \"-S\", \".\", \"-B\", \"build\", \"-DCROSSLANG_FETCHCONTENT=OFF\", *std_cmake_args" >> "Formula/crosslang.rb"
|
||||||
|
echo " system \"cmake\", \"--build\", \"build\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " system \"cmake\", \"--install\", \"build\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " end" >> "Formula/crosslang.rb"
|
||||||
|
echo " test do" >> "Formula/crosslang.rb"
|
||||||
|
echo " system \"true\"" >> "Formula/crosslang.rb"
|
||||||
|
echo " end" >> "Formula/crosslang.rb"
|
||||||
|
echo "end" >> "Formula/crosslang.rb"
|
||||||
40
README.md
40
README.md
@@ -6,38 +6,38 @@ Tesses Cross Language
|
|||||||
[WebSite](https://crosslang.tesseslanguage.com/)
|
[WebSite](https://crosslang.tesseslanguage.com/)
|
||||||
|
|
||||||
## What is required to build this project
|
## What is required to build this project
|
||||||
- [TessesFramework](https://onedev.site.tesses.net/tesses-framework) (if you turn CROSSLANG_FETCHCONTENT off otherwise it will be grabbed automaticly)
|
- [TessesFramework](https://git.tesses.org/tesses50/tessesframework) (if you turn CROSSLANG_FETCHCONTENT off otherwise it will be grabbed automaticly)
|
||||||
- CMake
|
- CMake
|
||||||
|
|
||||||
|
|
||||||
## Use in docker (use my container)
|
## Use in docker (use my container)
|
||||||
```bash
|
```bash
|
||||||
sudo docker pull -t onedev.site.tesses.net/crosslang/crosslang:latest
|
sudo docker pull -t git.tesses.org/tesses50/crosslang:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
## Use in docker (build the container yourself)
|
## Use in docker (build the container yourself)
|
||||||
```bash
|
```bash
|
||||||
git clone https://onedev.site.tesses.net/crosslang
|
git clone https://git.tesses.org/tesses50/crosslang
|
||||||
cd crosslang
|
cd crosslang
|
||||||
sudo docker build -t crosslang:latest .
|
sudo docker build -t crosslang:latest .
|
||||||
```
|
```
|
||||||
|
|
||||||
## To Install
|
## To Install
|
||||||
- Install [mbedtls](https://github.com/Mbed-TLS/mbedtls) (use sudo apt install libmbedtls-dev on debian) for TessesFramework
|
- Install [mbedtls](https://github.com/Mbed-TLS/mbedtls) (use sudo apt install libmbedtls-dev on debian) for TessesFramework (no longer works on debian, needs -DTESSESFRAMEWORK_FETCHCONTENT=ON for debian)
|
||||||
- Follow the commands bellow
|
- Follow the commands bellow
|
||||||
|
|
||||||
## Run these commands to install crosslang (with plugin support)
|
## Run these commands to install crosslang (with plugin support)
|
||||||
```bash
|
```bash
|
||||||
git clone https://onedev.site.tesses.net/tesses-framework
|
git clone https://git.tesses.org/tesses50/tessesframework
|
||||||
cd tesses-framework
|
cd tessesframework
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake -S .. -B .
|
cmake -S .. -B . -DTESSESFRAMEWORK_FETCHCONTENT=OFF
|
||||||
make
|
make
|
||||||
sudo make install
|
sudo make install
|
||||||
cd ../..
|
cd ../..
|
||||||
git clone https://onedev.site.tesses.net/CrossLang
|
git clone https://git.tesses.org/tesses50/crosslang
|
||||||
cd CrossLang
|
cd crosslang
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake -S .. -B . -DCROSSLANG_FETCHCONTENT=OFF
|
cmake -S .. -B . -DCROSSLANG_FETCHCONTENT=OFF
|
||||||
@@ -47,31 +47,11 @@ sudo make install
|
|||||||
|
|
||||||
## Build with shared libs only (self contained dependencies)
|
## Build with shared libs only (self contained dependencies)
|
||||||
```bash
|
```bash
|
||||||
cmake -S ../.. -B . -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_FETCHCONTENT=ON
|
cmake -S ../.. -B . -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_ENABLE_SHARED=ON
|
||||||
make -j`nproc`
|
make -j`nproc`
|
||||||
sudo make install
|
sudo make install
|
||||||
```
|
```
|
||||||
|
|
||||||
```bash
|
|
||||||
git clone https://onedev.site.tesses.net/CrossLang
|
|
||||||
cd CrossLang
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake -S .. -B .
|
|
||||||
make
|
|
||||||
sudo make install
|
|
||||||
```
|
|
||||||
|
|
||||||
## To Create the binaries and ISO (You need linux for this)
|
|
||||||
```bash
|
|
||||||
sudo apt install xorriso wget curl mingw-w64 nsis cmake tar zip
|
|
||||||
mkdir dvdwork
|
|
||||||
cp build-dvd.tcross dvdwork/
|
|
||||||
cd dvdwork
|
|
||||||
crossint build-dvd.tcross
|
|
||||||
bash script.sh # the iso and tarballs will be in Working/Output
|
|
||||||
```
|
|
||||||
|
|
||||||
```
|
```
|
||||||
Ye are of God, little children, and have overcome them: because greater is he that is in you, than he that is in the world. (1 John 4:4)
|
Ye are of God, little children, and have overcome them: because greater is he that is in you, than he that is in the world. (1 John 4:4)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -114,11 +114,11 @@ wget -O {mbedversion}.tar.bz2 https://downloads.tesses.net/cache/libraries/sourc
|
|||||||
tar xf {mbedversion}.tar.bz2
|
tar xf {mbedversion}.tar.bz2
|
||||||
rm {mbedversion}.tar.bz2
|
rm {mbedversion}.tar.bz2
|
||||||
fi
|
fi
|
||||||
git clone --depth=1 https://onedev.site.tesses.net/tesses-framework
|
git clone --depth=1 https://git.tesses.org/tesses50/tessesframework
|
||||||
git clone --depth=1 https://onedev.site.tesses.net/crosslang
|
git clone --depth=1 https://git.tesses.org/tesses50/crosslang
|
||||||
zip -r \"{working / \"DvdFiles\" / \"crosslang-source.zip\"}\" ./*
|
zip -r \"{working / \"DvdFiles\" / \"crosslang-source.zip\"}\" ./*
|
||||||
cp ../DvdFiles/crosslang-source.zip ../Output/crosslang-source.zip
|
cp ../DvdFiles/crosslang-source.zip ../Output/crosslang-source.zip
|
||||||
wget -O \"{working / \"DvdFiles\" / \"Common\" / \"ShellPackage.crvm\"}\" https://downloads.tesses.net/ShellPackage.crvm
|
wget -O \"{working / \"DvdFiles\" / \"Common\" / \"ShellPackage.crvm\"}\" https://redirect.tesses.net/crosslang-shell
|
||||||
";
|
";
|
||||||
var w32_toolchain = $"
|
var w32_toolchain = $"
|
||||||
set(CMAKE_C_COMPILER \"/usr/bin/i686-w64-mingw32-gcc\")
|
set(CMAKE_C_COMPILER \"/usr/bin/i686-w64-mingw32-gcc\")
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.0.4
|
||||||
|
Rework for git.tesses.org, GC* is std::shared_ptr maybe will fix crash during exit
|
||||||
|
|
||||||
|
## 0.0.3
|
||||||
|
Fixed cmake, unnecessary itteration on dictionary, and a crosslang binary bug when shell is not installed
|
||||||
|
|
||||||
## 0.0.2
|
## 0.0.2
|
||||||
Add uuids and bytestreams
|
Add uuids, bytestreams and single file runtime binaries
|
||||||
|
|
||||||
## 0.0.1
|
## 0.0.1
|
||||||
Start versioning
|
Start versioning
|
||||||
57
cmake/exec.cmake
Normal file
57
cmake/exec.cmake
Normal file
@@ -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()
|
||||||
62
cmake/linkdeps.cmake
Normal file
62
cmake/linkdeps.cmake
Normal file
@@ -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()
|
||||||
18
cmake/options.cmake
Normal file
18
cmake/options.cmake
Normal file
@@ -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://git.tesses.org/crosslangextras")
|
||||||
34
cmake/shared.cmake
Normal file
34
cmake/shared.cmake
Normal file
@@ -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()
|
||||||
37
cmake/shared_exec.cmake
Normal file
37
cmake/shared_exec.cmake
Normal file
@@ -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()
|
||||||
21
cmake/slim.cmake
Normal file
21
cmake/slim.cmake
Normal file
@@ -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}")
|
||||||
66
cmake/sources.cmake
Normal file
66
cmake/sources.cmake
Normal file
@@ -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
|
||||||
|
)
|
||||||
28
cmake/static_exec.cmake
Normal file
28
cmake/static_exec.cmake
Normal file
@@ -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()
|
||||||
3
cmake/version.cmake
Normal file
3
cmake/version.cmake
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
set(CROSSLANG_MAJOR_VERSION 0)
|
||||||
|
set(CROSSLANG_MINOR_VERSION 0)
|
||||||
|
set(CROSSLANG_PATCH_VERSION 4)
|
||||||
@@ -40,6 +40,8 @@ namespace Tesses::CrossLang {
|
|||||||
using BitConverter = Tesses::Framework::Serialization::BitConverter;
|
using BitConverter = Tesses::Framework::Serialization::BitConverter;
|
||||||
constexpr std::string_view VMName = "CrossLangVM";
|
constexpr std::string_view VMName = "CrossLangVM";
|
||||||
constexpr std::string_view VMHowToGet = "https://crosslang.tesseslanguage.com/";
|
constexpr std::string_view VMHowToGet = "https://crosslang.tesseslanguage.com/";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Escape a crosslang string (for generating source code)
|
* @brief Escape a crosslang string (for generating source code)
|
||||||
*
|
*
|
||||||
@@ -1328,7 +1330,7 @@ class Parser {
|
|||||||
SyntaxNode ParseUnary();
|
SyntaxNode ParseUnary();
|
||||||
SyntaxNode ParseNullCoalescing();
|
SyntaxNode ParseNullCoalescing();
|
||||||
void ParseHtml(std::vector<SyntaxNode>& nodes,std::string var);
|
void ParseHtml(std::vector<SyntaxNode>& nodes,std::string var);
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
TRootEnvironment* env;
|
TRootEnvironment* env;
|
||||||
int lastLine=-1;
|
int lastLine=-1;
|
||||||
std::string lastFile="";
|
std::string lastFile="";
|
||||||
@@ -1341,7 +1343,7 @@ class Parser {
|
|||||||
* @param tokens the tokens from lexer
|
* @param tokens the tokens from lexer
|
||||||
*/
|
*/
|
||||||
Parser(std::vector<LexToken> tokens);
|
Parser(std::vector<LexToken> tokens);
|
||||||
Parser(std::vector<LexToken> tokens, GC* gc, TRootEnvironment* env);
|
Parser(std::vector<LexToken> tokens, std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
/**
|
/**
|
||||||
* @brief Turn tokens into abstract syntax tree
|
* @brief Turn tokens into abstract syntax tree
|
||||||
*
|
*
|
||||||
@@ -1405,11 +1407,11 @@ class TContinue {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using TObject = std::variant<int64_t,double,char,bool,std::string,std::regex,Tesses::Framework::Filesystem::VFSPath,std::nullptr_t,Undefined,MethodInvoker,THeapObjectHolder,TVMVersion,std::shared_ptr<Tesses::Framework::Date::DateTime>,std::shared_ptr<Tesses::Framework::Date::TimeSpan>,TBreak,TContinue,std::shared_ptr<Tesses::Framework::Streams::Stream>,std::shared_ptr<Tesses::Framework::Filesystem::VFS>,std::shared_ptr<Tesses::Framework::Http::IHttpServer>,std::shared_ptr<Tesses::Framework::Http::HttpRequestBody>,std::shared_ptr<Tesses::Framework::TextStreams::TextReader>,std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>,std::shared_ptr<Tesses::Framework::Streams::ByteReader>,std::shared_ptr<Tesses::Framework::Streams::ByteWriter>, Tesses::Framework::Uuid>;
|
using TObject = std::variant<int64_t,double,char,bool,std::string,std::regex,Tesses::Framework::Filesystem::VFSPath,std::nullptr_t,Undefined,MethodInvoker,THeapObjectHolder,TVMVersion,std::shared_ptr<Tesses::Framework::Date::DateTime>,std::shared_ptr<Tesses::Framework::Date::TimeSpan>,TBreak,TContinue,std::shared_ptr<Tesses::Framework::Streams::Stream>,std::shared_ptr<Tesses::Framework::Filesystem::VFS>,std::shared_ptr<Tesses::Framework::Http::IHttpServer>,std::shared_ptr<Tesses::Framework::Http::HttpRequestBody>,std::shared_ptr<Tesses::Framework::TextStreams::TextReader>,std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>,std::shared_ptr<Tesses::Framework::Streams::ByteReader>,std::shared_ptr<Tesses::Framework::Streams::ByteWriter>,std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>, std::shared_ptr<Tesses::Framework::TF_Timer_Handle>, Tesses::Framework::Uuid>;
|
||||||
|
|
||||||
class TRootEnvironment;
|
class TRootEnvironment;
|
||||||
class GC;
|
|
||||||
class GC {
|
class GC : public std::enable_shared_from_this<GC> {
|
||||||
Tesses::Framework::Threading::Thread* thrd;
|
Tesses::Framework::Threading::Thread* thrd;
|
||||||
Tesses::Framework::Threading::Mutex* mtx;
|
Tesses::Framework::Threading::Mutex* mtx;
|
||||||
volatile std::atomic<bool> running;
|
volatile std::atomic<bool> running;
|
||||||
@@ -1417,7 +1419,7 @@ class GC {
|
|||||||
std::vector<THeapObject*> objects;
|
std::vector<THeapObject*> objects;
|
||||||
|
|
||||||
Tesses::Framework::Lazy<Tesses::Framework::Threading::ThreadPool*>* tpool;
|
Tesses::Framework::Lazy<Tesses::Framework::Threading::ThreadPool*>* tpool;
|
||||||
std::vector<std::function<void(GC* gc, TRootEnvironment* env)>> register_everything;
|
std::vector<std::function<void(std::shared_ptr<GC> gc, TRootEnvironment* env)>> register_everything;
|
||||||
public:
|
public:
|
||||||
Tesses::Framework::Threading::ThreadPool* GetPool();
|
Tesses::Framework::Threading::ThreadPool* GetPool();
|
||||||
bool UsingNullThreads();
|
bool UsingNullThreads();
|
||||||
@@ -1432,23 +1434,22 @@ class GC {
|
|||||||
void SetRoot(TObject obj);
|
void SetRoot(TObject obj);
|
||||||
void UnsetRoot(TObject obj);
|
void UnsetRoot(TObject obj);
|
||||||
static void Mark(TObject obj);
|
static void Mark(TObject obj);
|
||||||
void RegisterEverythingCallback(std::function<void(GC* gc, TRootEnvironment* env)> cb);
|
void RegisterEverythingCallback(std::function<void(std::shared_ptr<GC> gc, TRootEnvironment* env)> cb);
|
||||||
void RegisterEverything(TRootEnvironment* env);
|
void RegisterEverything(TRootEnvironment* env);
|
||||||
~GC();
|
~GC();
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string GetObjectTypeString(TObject obj);
|
std::string GetObjectTypeString(TObject obj);
|
||||||
std::string ToString(GC* gc, TObject obj);
|
std::string ToString(std::shared_ptr<GC> gc, TObject obj);
|
||||||
|
|
||||||
class GCList : public THeapObject
|
class GCList : public THeapObject
|
||||||
{
|
{
|
||||||
std::vector<THeapObject*> items;
|
std::vector<THeapObject*> items;
|
||||||
|
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
public:
|
public:
|
||||||
GCList(GC* gc);
|
GCList(std::shared_ptr<GC> gc);
|
||||||
GCList(GC& gc);
|
std::shared_ptr<GC> GetGC();
|
||||||
GC* GetGC();
|
|
||||||
void Add(TObject v);
|
void Add(TObject v);
|
||||||
void Remove(TObject v);
|
void Remove(TObject v);
|
||||||
void Mark();
|
void Mark();
|
||||||
@@ -1456,7 +1457,7 @@ class GC {
|
|||||||
|
|
||||||
|
|
||||||
~GCList();
|
~GCList();
|
||||||
|
friend class GC;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -1545,7 +1546,7 @@ class GC {
|
|||||||
std::string info;
|
std::string info;
|
||||||
int32_t icon;
|
int32_t icon;
|
||||||
|
|
||||||
void Load(GC* gc, std::shared_ptr<Tesses::Framework::Streams::Stream> strm);
|
void Load(std::shared_ptr<GC> gc, std::shared_ptr<Tesses::Framework::Streams::Stream> strm);
|
||||||
void Skip(std::shared_ptr<Tesses::Framework::Streams::Stream> strm,size_t len);
|
void Skip(std::shared_ptr<Tesses::Framework::Streams::Stream> strm,size_t len);
|
||||||
void Ensure(std::shared_ptr<Tesses::Framework::Streams::Stream> strm,uint8_t* buffer, size_t len);
|
void Ensure(std::shared_ptr<Tesses::Framework::Streams::Stream> strm,uint8_t* buffer, size_t len);
|
||||||
uint32_t EnsureInt(std::shared_ptr<Tesses::Framework::Streams::Stream> strm);
|
uint32_t EnsureInt(std::shared_ptr<Tesses::Framework::Streams::Stream> strm);
|
||||||
@@ -1564,8 +1565,8 @@ class GC {
|
|||||||
std::vector<std::pair<TObject,TObject>> items;
|
std::vector<std::pair<TObject,TObject>> items;
|
||||||
static TAssociativeArray* Create(GCList& ls);
|
static TAssociativeArray* Create(GCList& ls);
|
||||||
static TAssociativeArray* Create(GCList* ls);
|
static TAssociativeArray* Create(GCList* ls);
|
||||||
void Set(GC* gc, TObject key, TObject value);
|
void Set(std::shared_ptr<GC> gc, TObject key, TObject value);
|
||||||
TObject Get(GC* gc, TObject key);
|
TObject Get(std::shared_ptr<GC> gc, TObject key);
|
||||||
TObject GetKey(int64_t index);
|
TObject GetKey(int64_t index);
|
||||||
TObject GetValue(int64_t index);
|
TObject GetValue(int64_t index);
|
||||||
void SetKey(int64_t index, TObject key);
|
void SetKey(int64_t index, TObject key);
|
||||||
@@ -1659,10 +1660,8 @@ class GC {
|
|||||||
virtual TObject GetValue(std::string key);
|
virtual TObject GetValue(std::string key);
|
||||||
virtual void SetValue(std::string key, TObject value);
|
virtual void SetValue(std::string key, TObject value);
|
||||||
virtual void Mark();
|
virtual void Mark();
|
||||||
void DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
void DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
||||||
void DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
void DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
||||||
void DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
|
||||||
void DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
|
||||||
TObject CallMethod(GCList& ls, std::string key, std::vector<TObject> args);
|
TObject CallMethod(GCList& ls, std::string key, std::vector<TObject> args);
|
||||||
TObject CallMethodWithFatalError(GCList& ls, std::string key, std::vector<TObject> args);
|
TObject CallMethodWithFatalError(GCList& ls, std::string key, std::vector<TObject> args);
|
||||||
};
|
};
|
||||||
@@ -1681,7 +1680,7 @@ class GC {
|
|||||||
TObject CallWithFatalError(GCList& ls, std::vector<TObject> args);
|
TObject CallWithFatalError(GCList& ls, std::vector<TObject> args);
|
||||||
virtual void Mark();
|
virtual void Mark();
|
||||||
|
|
||||||
Tesses::Framework::Http::ServerRequestHandler ToRouteServerRequestHandler(GC* gc);
|
Tesses::Framework::Http::ServerRequestHandler ToRouteServerRequestHandler(std::shared_ptr<GC> gc);
|
||||||
};
|
};
|
||||||
|
|
||||||
void ThrowFatalError(std::exception& ex);
|
void ThrowFatalError(std::exception& ex);
|
||||||
@@ -1692,7 +1691,7 @@ class GC {
|
|||||||
std::vector<std::string> consts;
|
std::vector<std::string> consts;
|
||||||
public:
|
public:
|
||||||
std::vector<TCallable*> defers;
|
std::vector<TCallable*> defers;
|
||||||
TObject LoadFile(GC* gc, TFile* f);
|
TObject LoadFile(std::shared_ptr<GC> gc, TFile* f);
|
||||||
TObject Eval(GCList& ls,std::string code);
|
TObject Eval(GCList& ls,std::string code);
|
||||||
virtual bool HasVariable(std::string key)=0;
|
virtual bool HasVariable(std::string key)=0;
|
||||||
virtual bool HasVariableRecurse(std::string key)=0;
|
virtual bool HasVariableRecurse(std::string key)=0;
|
||||||
@@ -1705,22 +1704,20 @@ class GC {
|
|||||||
virtual TObject SetVariable(GCList& ls, std::string key, TObject v)=0;
|
virtual TObject SetVariable(GCList& ls, std::string key, TObject v)=0;
|
||||||
|
|
||||||
virtual void SetVariable(std::string key, TObject value)=0;
|
virtual void SetVariable(std::string key, TObject value)=0;
|
||||||
TDictionary* EnsureDictionary(GC* gc, std::string key);
|
TDictionary* EnsureDictionary(std::shared_ptr<GC> gc, std::string key);
|
||||||
virtual void DeclareVariable(std::string key, TObject value)=0;
|
virtual void DeclareVariable(std::string key, TObject value)=0;
|
||||||
void DeclareConstVariable(std::string key, TObject value);
|
void DeclareConstVariable(std::string key, TObject value);
|
||||||
bool HasConstForDeclare(std::string key);
|
bool HasConstForDeclare(std::string key);
|
||||||
virtual bool HasConstForSet(std::string key);
|
virtual bool HasConstForSet(std::string key);
|
||||||
void DeclareVariable(GC* gc,std::vector<std::string> key, TObject value);
|
void DeclareVariable(std::shared_ptr<GC> gc,std::vector<std::string> key, TObject value);
|
||||||
virtual TRootEnvironment* GetRootEnvironment()=0;
|
virtual TRootEnvironment* GetRootEnvironment()=0;
|
||||||
virtual TEnvironment* GetParentEnvironment()=0;
|
virtual TEnvironment* GetParentEnvironment()=0;
|
||||||
virtual TSubEnvironment* GetSubEnvironment(TDictionary* dict);
|
virtual TSubEnvironment* GetSubEnvironment(TDictionary* dict);
|
||||||
TSubEnvironment* GetSubEnvironment(GCList* gc);
|
TSubEnvironment* GetSubEnvironment(GCList* gc);
|
||||||
TSubEnvironment* GetSubEnvironment(GCList& gc);
|
TSubEnvironment* GetSubEnvironment(GCList& gc);
|
||||||
|
|
||||||
void DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
void DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
||||||
void DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb);
|
void DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
||||||
void DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
|
||||||
void DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy);
|
|
||||||
TObject CallFunction(GCList& ls, std::string key, std::vector<TObject> args);
|
TObject CallFunction(GCList& ls, std::string key, std::vector<TObject> args);
|
||||||
TObject CallFunctionWithFatalError(GCList& ls, std::string key, std::vector<TObject> args);
|
TObject CallFunctionWithFatalError(GCList& ls, std::string key, std::vector<TObject> args);
|
||||||
};
|
};
|
||||||
@@ -1780,10 +1777,10 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
EnvironmentPermissions();
|
EnvironmentPermissions();
|
||||||
Tesses::Framework::Filesystem::VFSPath sqliteOffsetPath;
|
Tesses::Framework::Filesystem::VFSPath sqliteOffsetPath;
|
||||||
|
std::shared_ptr<Tesses::Framework::Filesystem::RelativeFilesystem> localfs;
|
||||||
bool canRegisterEverything;
|
bool canRegisterEverything;
|
||||||
bool canRegisterConsole;
|
bool canRegisterConsole;
|
||||||
bool canRegisterIO;
|
bool canRegisterIO;
|
||||||
bool canRegisterLocalFS;
|
|
||||||
bool canRegisterNet;
|
bool canRegisterNet;
|
||||||
bool canRegisterSqlite;
|
bool canRegisterSqlite;
|
||||||
bool canRegisterVM;
|
bool canRegisterVM;
|
||||||
@@ -1806,7 +1803,7 @@ class GC {
|
|||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
TCallable* error=nullptr;
|
TCallable* error=nullptr;
|
||||||
|
|
||||||
void LoadDependency(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, std::pair<std::string,TVMVersion> dep);
|
void LoadDependency(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, std::pair<std::string,TVMVersion> dep);
|
||||||
public:
|
public:
|
||||||
EnvironmentPermissions permissions;
|
EnvironmentPermissions permissions;
|
||||||
|
|
||||||
@@ -1815,8 +1812,8 @@ class GC {
|
|||||||
|
|
||||||
bool TryFindClass(std::vector<std::string>& name, size_t& index);
|
bool TryFindClass(std::vector<std::string>& name, size_t& index);
|
||||||
|
|
||||||
void LoadFileWithDependencies(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, TFile* f);
|
void LoadFileWithDependencies(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, TFile* f);
|
||||||
void LoadFileWithDependencies(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, Tesses::Framework::Filesystem::VFSPath path);
|
void LoadFileWithDependencies(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, Tesses::Framework::Filesystem::VFSPath path);
|
||||||
|
|
||||||
TDictionary* GetDictionary();
|
TDictionary* GetDictionary();
|
||||||
static TRootEnvironment* Create(GCList* gc,TDictionary* dict);
|
static TRootEnvironment* Create(GCList* gc,TDictionary* dict);
|
||||||
@@ -1835,30 +1832,32 @@ class GC {
|
|||||||
TRootEnvironment* GetRootEnvironment();
|
TRootEnvironment* GetRootEnvironment();
|
||||||
TEnvironment* GetParentEnvironment();
|
TEnvironment* GetParentEnvironment();
|
||||||
void RegisterOnError(TCallable* callable);
|
void RegisterOnError(TCallable* callable);
|
||||||
bool HandleException(GC* gc,TEnvironment* env, TObject err);
|
bool HandleException(std::shared_ptr<GC> gc,TEnvironment* env, TObject err);
|
||||||
bool HandleBreakpoint(GC* gc,TEnvironment* env, TObject err);
|
bool HandleBreakpoint(std::shared_ptr<GC> gc,TEnvironment* env, TObject err);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
class TStd {
|
class TStd {
|
||||||
private:
|
private:
|
||||||
static void RegisterHelpers(GC* gc, TRootEnvironment* env);
|
static void RegisterHelpers(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterUuid(GC* gc, TRootEnvironment* env);
|
static void RegisterUuid(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
public:
|
public:
|
||||||
static void RegisterStd(GC* gc, TRootEnvironment* env);
|
static void RegisterStd(std::shared_ptr<GC> gc, TRootEnvironment* env, std::shared_ptr<Tesses::Framework::Filesystem::RelativeFilesystem> localfs);
|
||||||
static void RegisterConsole(GC* gc,TRootEnvironment* env);
|
static void RegisterStd(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterIO(GC* gc,TRootEnvironment* env, bool enableLocalFilesystem=true);
|
static void RegisterConsole(std::shared_ptr<GC> gc,TRootEnvironment* env);
|
||||||
static void RegisterNet(GC* gc, TRootEnvironment* env);
|
static void RegisterIO(std::shared_ptr<GC> gc,TRootEnvironment* env, std::shared_ptr<Tesses::Framework::Filesystem::RelativeFilesystem> local);
|
||||||
static void RegisterSqlite(GC* gc,TRootEnvironment* env);
|
static void RegisterIO(std::shared_ptr<GC> gc,TRootEnvironment* env, bool enableLocalFS=true);
|
||||||
static void RegisterVM(GC* gc,TRootEnvironment* env);
|
static void RegisterNet(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterDictionary(GC* gc, TRootEnvironment* env);
|
static void RegisterSqlite(std::shared_ptr<GC> gc,TRootEnvironment* env);
|
||||||
static void RegisterJson(GC* gc, TRootEnvironment* env);
|
static void RegisterVM(std::shared_ptr<GC> gc,TRootEnvironment* env);
|
||||||
static void RegisterCrypto(GC* gc,TRootEnvironment* env);
|
static void RegisterDictionary(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterRoot(GC* gc, TRootEnvironment* env);
|
static void RegisterJson(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterPath(GC* gc, TRootEnvironment* env);
|
static void RegisterCrypto(std::shared_ptr<GC> gc,TRootEnvironment* env);
|
||||||
static void RegisterOGC(GC* gc, TRootEnvironment* env);
|
static void RegisterRoot(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterEnv(GC* gc, TRootEnvironment* env);
|
static void RegisterPath(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterProcess(GC* gc, TRootEnvironment* env);
|
static void RegisterOGC(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
static void RegisterClass(GC* gc, TRootEnvironment* env);
|
static void RegisterEnv(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
|
static void RegisterProcess(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
|
static void RegisterClass(std::shared_ptr<GC> gc, TRootEnvironment* env);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1931,7 +1930,7 @@ class GC {
|
|||||||
class TEnumerator : public THeapObject
|
class TEnumerator : public THeapObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual bool MoveNext(GC* ls)=0;
|
virtual bool MoveNext(std::shared_ptr<GC> ls)=0;
|
||||||
virtual TObject GetCurrent(GCList& ls)=0;
|
virtual TObject GetCurrent(GCList& ls)=0;
|
||||||
static TEnumerator* CreateFromObject(GCList& ls, TObject obj);
|
static TEnumerator* CreateFromObject(GCList& ls, TObject obj);
|
||||||
};
|
};
|
||||||
@@ -1942,7 +1941,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TAssociativeArrayEnumerator* Create(GCList& ls, TAssociativeArray* list);
|
static TAssociativeArrayEnumerator* Create(GCList& ls, TAssociativeArray* list);
|
||||||
static TAssociativeArrayEnumerator* Create(GCList* ls, TAssociativeArray* list);
|
static TAssociativeArrayEnumerator* Create(GCList* ls, TAssociativeArray* list);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
@@ -1950,7 +1949,7 @@ class GC {
|
|||||||
class TCustomEnumerator : public TEnumerator {
|
class TCustomEnumerator : public TEnumerator {
|
||||||
public:
|
public:
|
||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
static TCustomEnumerator* Create(GCList& ls,TDictionary* dict);
|
static TCustomEnumerator* Create(GCList& ls,TDictionary* dict);
|
||||||
@@ -1964,7 +1963,7 @@ class GC {
|
|||||||
TObject enumerator;
|
TObject enumerator;
|
||||||
TObject current;
|
TObject current;
|
||||||
public:
|
public:
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
static TYieldEnumerator* Create(GCList& ls,TObject v);
|
static TYieldEnumerator* Create(GCList& ls,TObject v);
|
||||||
@@ -1980,7 +1979,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TStringEnumerator* Create(GCList& ls,std::string str);
|
static TStringEnumerator* Create(GCList& ls,std::string str);
|
||||||
static TStringEnumerator* Create(GCList* ls,std::string str);
|
static TStringEnumerator* Create(GCList* ls,std::string str);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1991,7 +1990,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TListEnumerator* Create(GCList& ls, TList* list);
|
static TListEnumerator* Create(GCList& ls, TList* list);
|
||||||
static TListEnumerator* Create(GCList* ls, TList* list);
|
static TListEnumerator* Create(GCList* ls, TList* list);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
@@ -2004,7 +2003,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TDynamicListEnumerator* Create(GCList& ls, TDynamicList* list);
|
static TDynamicListEnumerator* Create(GCList& ls, TDynamicList* list);
|
||||||
static TDynamicListEnumerator* Create(GCList* ls, TDynamicList* list);
|
static TDynamicListEnumerator* Create(GCList* ls, TDynamicList* list);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
@@ -2014,7 +2013,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TVFSPathEnumerator* Create(GCList& ls, Tesses::Framework::Filesystem::VFSPathEnumerator list);
|
static TVFSPathEnumerator* Create(GCList& ls, Tesses::Framework::Filesystem::VFSPathEnumerator list);
|
||||||
static TVFSPathEnumerator* Create(GCList* ls, Tesses::Framework::Filesystem::VFSPathEnumerator list);
|
static TVFSPathEnumerator* Create(GCList* ls, Tesses::Framework::Filesystem::VFSPathEnumerator list);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
|
|
||||||
};
|
};
|
||||||
@@ -2026,21 +2025,13 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
TObject obj;
|
TObject obj;
|
||||||
GCList* ls;
|
GCList* ls;
|
||||||
TObjectVFS(GC* gc, TObject obj);
|
TObjectVFS(std::shared_ptr<GC> gc, TObject obj);
|
||||||
std::shared_ptr<Tesses::Framework::Streams::Stream> OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode);
|
std::shared_ptr<Tesses::Framework::Streams::Stream> OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode);
|
||||||
|
Tesses::Framework::Filesystem::FIFOCreationResult CreateFIFO(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
void CreateDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
void CreateDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
void DeleteDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
void DeleteDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
bool RegularFileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool SymlinkExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool CharacterDeviceExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool BlockDeviceExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool SocketFileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool FIFOFileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool FileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool SpecialFileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
void CreateSymlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath symlinkFile);
|
void CreateSymlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath symlinkFile);
|
||||||
void CreateHardlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath newName);
|
void CreateHardlink(Tesses::Framework::Filesystem::VFSPath existingFile, Tesses::Framework::Filesystem::VFSPath newName);
|
||||||
bool DirectoryExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
void DeleteFile(Tesses::Framework::Filesystem::VFSPath path);
|
void DeleteFile(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
void Lock(Tesses::Framework::Filesystem::VFSPath path);
|
void Lock(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
void Unlock(Tesses::Framework::Filesystem::VFSPath path);
|
void Unlock(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
@@ -2052,10 +2043,13 @@ class GC {
|
|||||||
Tesses::Framework::Filesystem::VFSPath ReadLink(Tesses::Framework::Filesystem::VFSPath path);
|
Tesses::Framework::Filesystem::VFSPath ReadLink(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
std::string VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path);
|
std::string VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
Tesses::Framework::Filesystem::VFSPath SystemToVFSPath(std::string path);
|
Tesses::Framework::Filesystem::VFSPath SystemToVFSPath(std::string path);
|
||||||
void GetDate(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Date::DateTime& lastWrite, Tesses::Framework::Date::DateTime& lastAccess);
|
|
||||||
void SetDate(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Date::DateTime lastWrite, Tesses::Framework::Date::DateTime lastAccess);
|
void SetDate(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Date::DateTime lastWrite, Tesses::Framework::Date::DateTime lastAccess);
|
||||||
void Chmod(Tesses::Framework::Filesystem::VFSPath path, uint32_t mode);
|
void Chmod(Tesses::Framework::Filesystem::VFSPath path, uint32_t mode);
|
||||||
|
void Chown(Tesses::Framework::Filesystem::VFSPath path, uint32_t uid, uint32_t gid);
|
||||||
|
|
||||||
bool StatVFS(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatVFSData& data);
|
bool StatVFS(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatVFSData& data);
|
||||||
|
|
||||||
|
bool Stat(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatData& data);
|
||||||
void Close();
|
void Close();
|
||||||
~TObjectVFS();
|
~TObjectVFS();
|
||||||
};
|
};
|
||||||
@@ -2066,7 +2060,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
TObject obj;
|
TObject obj;
|
||||||
GCList* ls;
|
GCList* ls;
|
||||||
TObjectStream(GC* gc, TObject obj);
|
TObjectStream(std::shared_ptr<GC> gc, TObject obj);
|
||||||
bool EndOfStream();
|
bool EndOfStream();
|
||||||
size_t Read(uint8_t* buff, size_t sz);
|
size_t Read(uint8_t* buff, size_t sz);
|
||||||
size_t Write(const uint8_t* buff, size_t sz);
|
size_t Write(const uint8_t* buff, size_t sz);
|
||||||
@@ -2088,7 +2082,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
TObject obj;
|
TObject obj;
|
||||||
GCList* ls;
|
GCList* ls;
|
||||||
TObjectHttpServer(GC* gc,TObject obj);
|
TObjectHttpServer(std::shared_ptr<GC> gc,TObject obj);
|
||||||
bool Handle(Tesses::Framework::Http::ServerContext& ctx);
|
bool Handle(Tesses::Framework::Http::ServerContext& ctx);
|
||||||
~TObjectHttpServer();
|
~TObjectHttpServer();
|
||||||
};
|
};
|
||||||
@@ -2102,7 +2096,7 @@ class GC {
|
|||||||
public:
|
public:
|
||||||
static TDictionaryEnumerator* Create(GCList& ls, TDictionary* dict);
|
static TDictionaryEnumerator* Create(GCList& ls, TDictionary* dict);
|
||||||
static TDictionaryEnumerator* Create(GCList* ls, TDictionary* dict);
|
static TDictionaryEnumerator* Create(GCList* ls, TDictionary* dict);
|
||||||
bool MoveNext(GC* ls);
|
bool MoveNext(std::shared_ptr<GC> ls);
|
||||||
TObject GetCurrent(GCList& ls);
|
TObject GetCurrent(GCList& ls);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
@@ -2187,7 +2181,7 @@ class GC {
|
|||||||
bool mustReturn;
|
bool mustReturn;
|
||||||
|
|
||||||
void Mark();
|
void Mark();
|
||||||
void Push(GC* gc,TObject v);
|
void Push(std::shared_ptr<GC> gc,TObject v);
|
||||||
TObject Pop(GCList& gcl);
|
TObject Pop(GCList& gcl);
|
||||||
|
|
||||||
TObject Resume(GCList& ls);
|
TObject Resume(GCList& ls);
|
||||||
@@ -2196,10 +2190,10 @@ class GC {
|
|||||||
{
|
{
|
||||||
TCallable* cont=nullptr;
|
TCallable* cont=nullptr;
|
||||||
std::exception_ptr ex=nullptr;
|
std::exception_ptr ex=nullptr;
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
TObject obj=Undefined();
|
TObject obj=Undefined();
|
||||||
bool isCompleted=false;
|
bool isCompleted=false;
|
||||||
TTask(GC* gc);
|
TTask(std::shared_ptr<GC> gc);
|
||||||
public:
|
public:
|
||||||
static TTask* Create(GCList& ls);
|
static TTask* Create(GCList& ls);
|
||||||
bool IsCompleted();
|
bool IsCompleted();
|
||||||
@@ -2230,84 +2224,84 @@ class GC {
|
|||||||
bool InvokeTwo(GCList& ls,TObject fn, TObject left, TObject right);
|
bool InvokeTwo(GCList& ls,TObject fn, TObject left, TObject right);
|
||||||
bool InvokeOne(GCList& ls,TObject fn, TObject arg);
|
bool InvokeOne(GCList& ls,TObject fn, TObject arg);
|
||||||
bool InvokeMethod(GCList& ls, TObject fn, TObject instance, std::vector<TObject> args);
|
bool InvokeMethod(GCList& ls, TObject fn, TObject instance, std::vector<TObject> args);
|
||||||
bool ExecuteMethod2(GC* gc, TObject instance, std::string key, std::vector<TObject> args);
|
bool ExecuteMethod2(std::shared_ptr<GC> gc, TObject instance, std::string key, std::vector<TObject> args);
|
||||||
protected:
|
protected:
|
||||||
static void* ThreadCallback(void* ptr);
|
static void* ThreadCallback(void* ptr);
|
||||||
bool JumpIfDefined(GC* gc);
|
bool JumpIfDefined(std::shared_ptr<GC> gc);
|
||||||
bool Add(GC* gc);
|
bool Add(std::shared_ptr<GC> gc);
|
||||||
bool Sub(GC* gc);
|
bool Sub(std::shared_ptr<GC> gc);
|
||||||
bool Times(GC* gc);
|
bool Times(std::shared_ptr<GC> gc);
|
||||||
bool Divide(GC* gc);
|
bool Divide(std::shared_ptr<GC> gc);
|
||||||
bool Mod(GC* gc);
|
bool Mod(std::shared_ptr<GC> gc);
|
||||||
bool Neg(GC* gc);
|
bool Neg(std::shared_ptr<GC> gc);
|
||||||
bool Lt(GC* gc);
|
bool Lt(std::shared_ptr<GC> gc);
|
||||||
bool Gt(GC* gc);
|
bool Gt(std::shared_ptr<GC> gc);
|
||||||
bool Lte(GC* gc);
|
bool Lte(std::shared_ptr<GC> gc);
|
||||||
bool Gte(GC* gc);
|
bool Gte(std::shared_ptr<GC> gc);
|
||||||
bool Eq(GC* gc);
|
bool Eq(std::shared_ptr<GC> gc);
|
||||||
bool NEq(GC* gc);
|
bool NEq(std::shared_ptr<GC> gc);
|
||||||
bool LShift(GC* gc);
|
bool LShift(std::shared_ptr<GC> gc);
|
||||||
bool RShift(GC* gc);
|
bool RShift(std::shared_ptr<GC> gc);
|
||||||
bool BOr(GC* gc);
|
bool BOr(std::shared_ptr<GC> gc);
|
||||||
bool XOr(GC* gc);
|
bool XOr(std::shared_ptr<GC> gc);
|
||||||
bool LNot(GC* gc);
|
bool LNot(std::shared_ptr<GC> gc);
|
||||||
bool BNot(GC* gc);
|
bool BNot(std::shared_ptr<GC> gc);
|
||||||
bool BAnd(GC* gc);
|
bool BAnd(std::shared_ptr<GC> gc);
|
||||||
bool ExecuteFunction(GC* gc);
|
bool ExecuteFunction(std::shared_ptr<GC> gc);
|
||||||
bool ExecuteMethod(GC* gc);
|
bool ExecuteMethod(std::shared_ptr<GC> gc);
|
||||||
bool GetVariable(GC* gc);
|
bool GetVariable(std::shared_ptr<GC> gc);
|
||||||
bool SetVariable(GC* gc);
|
bool SetVariable(std::shared_ptr<GC> gc);
|
||||||
bool GetField(GC* gc);
|
bool GetField(std::shared_ptr<GC> gc);
|
||||||
bool SetField(GC* gc);
|
bool SetField(std::shared_ptr<GC> gc);
|
||||||
bool GetArray(GC* gc);
|
bool GetArray(std::shared_ptr<GC> gc);
|
||||||
bool SetArray(GC* gc);
|
bool SetArray(std::shared_ptr<GC> gc);
|
||||||
bool DeclareVariable(GC* gc);
|
bool DeclareVariable(std::shared_ptr<GC> gc);
|
||||||
bool DeclareConstVariable(GC* gc);
|
bool DeclareConstVariable(std::shared_ptr<GC> gc);
|
||||||
bool PushLong(GC* gc);
|
bool PushLong(std::shared_ptr<GC> gc);
|
||||||
bool PushDouble(GC* gc);
|
bool PushDouble(std::shared_ptr<GC> gc);
|
||||||
bool PushChar(GC* gc);
|
bool PushChar(std::shared_ptr<GC> gc);
|
||||||
bool PushString(GC* gc);
|
bool PushString(std::shared_ptr<GC> gc);
|
||||||
bool PushClosure(GC* gc);
|
bool PushClosure(std::shared_ptr<GC> gc);
|
||||||
bool PushScopelessClosure(GC* gc);
|
bool PushScopelessClosure(std::shared_ptr<GC> gc);
|
||||||
bool PushResource(GC* gc);
|
bool PushResource(std::shared_ptr<GC> gc);
|
||||||
bool Illegal(GC* gc);
|
bool Illegal(std::shared_ptr<GC> gc);
|
||||||
bool Throw(GC* gc);
|
bool Throw(std::shared_ptr<GC> gc);
|
||||||
bool Yield(GC* gc);
|
bool Yield(std::shared_ptr<GC> gc);
|
||||||
bool Jump(GC* gc);
|
bool Jump(std::shared_ptr<GC> gc);
|
||||||
bool JumpConditional(GC* gc);
|
bool JumpConditional(std::shared_ptr<GC> gc);
|
||||||
bool JumpUndefined(GC* gc);
|
bool JumpUndefined(std::shared_ptr<GC> gc);
|
||||||
bool Defer(GC* gc);
|
bool Defer(std::shared_ptr<GC> gc);
|
||||||
bool TryCatch(GC* gc);
|
bool TryCatch(std::shared_ptr<GC> gc);
|
||||||
bool Return(GC* gc);
|
bool Return(std::shared_ptr<GC> gc);
|
||||||
bool ScopeBegin(GC* gc);
|
bool ScopeBegin(std::shared_ptr<GC> gc);
|
||||||
bool ScopeEnd(GC* gc);
|
bool ScopeEnd(std::shared_ptr<GC> gc);
|
||||||
bool ScopeEndTimes(GC* gc);
|
bool ScopeEndTimes(std::shared_ptr<GC> gc);
|
||||||
bool PushTrue(GC* gc);
|
bool PushTrue(std::shared_ptr<GC> gc);
|
||||||
bool PushFalse(GC* gc);
|
bool PushFalse(std::shared_ptr<GC> gc);
|
||||||
bool PushNull(GC* gc);
|
bool PushNull(std::shared_ptr<GC> gc);
|
||||||
bool PushUndefined(GC* gc);
|
bool PushUndefined(std::shared_ptr<GC> gc);
|
||||||
bool CreateDictionary(GC* gc);
|
bool CreateDictionary(std::shared_ptr<GC> gc);
|
||||||
bool CreateArray(GC* gc);
|
bool CreateArray(std::shared_ptr<GC> gc);
|
||||||
bool AppendList(GC* gc);
|
bool AppendList(std::shared_ptr<GC> gc);
|
||||||
bool AppendDictionary(GC* gc);
|
bool AppendDictionary(std::shared_ptr<GC> gc);
|
||||||
bool PushRootPath(GC* gc);
|
bool PushRootPath(std::shared_ptr<GC> gc);
|
||||||
bool PushRelativePath(GC* gc);
|
bool PushRelativePath(std::shared_ptr<GC> gc);
|
||||||
bool Pop(GC* gc);
|
bool Pop(std::shared_ptr<GC> gc);
|
||||||
bool Dup(GC* gc);
|
bool Dup(std::shared_ptr<GC> gc);
|
||||||
bool Nop(GC* gc);
|
bool Nop(std::shared_ptr<GC> gc);
|
||||||
bool Breakpoint(GC* gc);
|
bool Breakpoint(std::shared_ptr<GC> gc);
|
||||||
bool PushBreak(GC* gc);
|
bool PushBreak(std::shared_ptr<GC> gc);
|
||||||
bool PushContinue(GC* gc);
|
bool PushContinue(std::shared_ptr<GC> gc);
|
||||||
bool JumpIfBreak(GC* gc);
|
bool JumpIfBreak(std::shared_ptr<GC> gc);
|
||||||
bool JumpIfContinue(GC* gc);
|
bool JumpIfContinue(std::shared_ptr<GC> gc);
|
||||||
bool LineInfo(GC* gc);
|
bool LineInfo(std::shared_ptr<GC> gc);
|
||||||
bool PushResourceStream(GC* gc);
|
bool PushResourceStream(std::shared_ptr<GC> gc);
|
||||||
bool PushResourceDirectory(GC* gc);
|
bool PushResourceDirectory(std::shared_ptr<GC> gc);
|
||||||
public:
|
public:
|
||||||
static InterperterThread* Create(GCList* ls);
|
static InterperterThread* Create(GCList* ls);
|
||||||
static InterperterThread* Create(GCList& ls);
|
static InterperterThread* Create(GCList& ls);
|
||||||
std::vector<CallStackEntry*> call_stack_entries;
|
std::vector<CallStackEntry*> call_stack_entries;
|
||||||
virtual void Execute(GC* gc);
|
virtual void Execute(std::shared_ptr<GC> gc);
|
||||||
void AddCallStackEntry(GCList& ls,TClosure* closure, std::vector<TObject> args);
|
void AddCallStackEntry(GCList& ls,TClosure* closure, std::vector<TObject> args);
|
||||||
void Mark();
|
void Mark();
|
||||||
};
|
};
|
||||||
@@ -2349,7 +2343,7 @@ class GC {
|
|||||||
static T* Create(GCList& ls,TArgs... args)
|
static T* Create(GCList& ls,TArgs... args)
|
||||||
{
|
{
|
||||||
T* obj = new T(args...);
|
T* obj = new T(args...);
|
||||||
GC* gc = ls.GetGC();
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
ls.Add(obj);
|
ls.Add(obj);
|
||||||
gc->Watch(obj);
|
gc->Watch(obj);
|
||||||
return obj;
|
return obj;
|
||||||
@@ -2358,7 +2352,7 @@ class GC {
|
|||||||
static T* Create(GCList* ls,TArgs... args)
|
static T* Create(GCList* ls,TArgs... args)
|
||||||
{
|
{
|
||||||
T* obj = new T(args...);
|
T* obj = new T(args...);
|
||||||
GC* gc = ls->GetGC();
|
std::shared_ptr<GC> gc = ls->GetGC();
|
||||||
ls->Add(obj);
|
ls->Add(obj);
|
||||||
gc->Watch(obj);
|
gc->Watch(obj);
|
||||||
return obj;
|
return obj;
|
||||||
@@ -2367,7 +2361,7 @@ class GC {
|
|||||||
virtual TObject CallMethod(GCList& ls,std::string name, std::vector<TObject> args)=0;
|
virtual TObject CallMethod(GCList& ls,std::string name, std::vector<TObject> args)=0;
|
||||||
virtual std::string TypeName()=0;
|
virtual std::string TypeName()=0;
|
||||||
virtual bool ToBool();
|
virtual bool ToBool();
|
||||||
virtual bool Equals(GC* gc, TObject right);
|
virtual bool Equals(std::shared_ptr<GC> gc, TObject right);
|
||||||
virtual ~TNativeObject();
|
virtual ~TNativeObject();
|
||||||
};
|
};
|
||||||
class TRandom : public TNativeObject
|
class TRandom : public TNativeObject
|
||||||
@@ -2407,7 +2401,7 @@ class GC {
|
|||||||
std::atomic<bool> detached;
|
std::atomic<bool> detached;
|
||||||
TCallable* callable;
|
TCallable* callable;
|
||||||
TObject returnValue;
|
TObject returnValue;
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
|
|
||||||
|
|
||||||
void Mark()
|
void Mark()
|
||||||
@@ -2445,7 +2439,7 @@ class GC {
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
VMByteCodeException(GC* gc,TObject obj, CallStackEntry* ent)
|
VMByteCodeException(std::shared_ptr<GC> gc,TObject obj, CallStackEntry* ent)
|
||||||
{
|
{
|
||||||
gcList = std::make_shared<GCList>(gc);
|
gcList = std::make_shared<GCList>(gc);
|
||||||
gcList->Add(obj);
|
gcList->Add(obj);
|
||||||
@@ -2538,16 +2532,16 @@ class GC {
|
|||||||
bool GetObjectAsPath(TObject& obj, Tesses::Framework::Filesystem::VFSPath& path, bool allowString=true);
|
bool GetObjectAsPath(TObject& obj, Tesses::Framework::Filesystem::VFSPath& path, bool allowString=true);
|
||||||
bool GetArgumentAsPath(std::vector<TObject>& args, size_t index, Tesses::Framework::Filesystem::VFSPath& path,bool allowString=true);
|
bool GetArgumentAsPath(std::vector<TObject>& args, size_t index, Tesses::Framework::Filesystem::VFSPath& path,bool allowString=true);
|
||||||
bool ToBool(TObject obj);
|
bool ToBool(TObject obj);
|
||||||
bool Equals(GC* gc, TObject left, TObject right);
|
bool Equals(std::shared_ptr<GC> gc, TObject left, TObject right);
|
||||||
typedef void (*PluginFunction)(GC* gc,TRootEnvironment* env);
|
typedef void (*PluginFunction)(std::shared_ptr<GC> gc,TRootEnvironment* env);
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
#define DLLEXPORT
|
#define DLLEXPORT
|
||||||
#else
|
#else
|
||||||
#define DLLEXPORT __declspec(dllexport)
|
#define DLLEXPORT __declspec(dllexport)
|
||||||
#endif
|
#endif
|
||||||
#define CROSSLANG_PLUGIN(plugin) DLLEXPORT extern "C" void CrossLangPluginInit(GC* gc, TRootEnvironment* env) { plugin(gc,env); }
|
#define CROSSLANG_PLUGIN(plugin) DLLEXPORT extern "C" void CrossLangPluginInit(std::shared_ptr<GC> gc, TRootEnvironment* env) { plugin(gc,env); }
|
||||||
|
|
||||||
void LoadPlugin(GC* gc, TRootEnvironment* env, Tesses::Framework::Filesystem::VFSPath sharedObjectPath);
|
void LoadPlugin(std::shared_ptr<GC> gc, TRootEnvironment* env, Tesses::Framework::Filesystem::VFSPath sharedObjectPath);
|
||||||
std::string Json_Encode(TObject o,bool indent=false);
|
std::string Json_Encode(TObject o,bool indent=false);
|
||||||
TObject Json_Decode(GCList ls,std::string str);
|
TObject Json_Decode(GCList ls,std::string str);
|
||||||
std::string Json_DocEncode(TObject o,bool indent);
|
std::string Json_DocEncode(TObject o,bool indent);
|
||||||
@@ -2557,15 +2551,14 @@ class GC {
|
|||||||
GCList* ls;
|
GCList* ls;
|
||||||
TObject o;
|
TObject o;
|
||||||
public:
|
public:
|
||||||
SharedPtrTObject(GC* gc, TObject o);
|
SharedPtrTObject(std::shared_ptr<GC> gc, TObject o);
|
||||||
TObject& GetObject();
|
TObject& GetObject();
|
||||||
GC* GetGC();
|
std::shared_ptr<GC> GetGC();
|
||||||
~SharedPtrTObject();
|
~SharedPtrTObject();
|
||||||
};
|
};
|
||||||
using MarkedTObject = std::shared_ptr<SharedPtrTObject>;
|
using MarkedTObject = std::shared_ptr<SharedPtrTObject>;
|
||||||
|
|
||||||
MarkedTObject CreateMarkedTObject(GC* gc, TObject o);
|
MarkedTObject CreateMarkedTObject(std::shared_ptr<GC> gc, TObject o);
|
||||||
MarkedTObject CreateMarkedTObject(GC& gc, TObject o);
|
|
||||||
MarkedTObject CreateMarkedTObject(GCList* gc, TObject o);
|
MarkedTObject CreateMarkedTObject(GCList* gc, TObject o);
|
||||||
MarkedTObject CreateMarkedTObject(GCList& gc, TObject o);
|
MarkedTObject CreateMarkedTObject(GCList& gc, TObject o);
|
||||||
std::string JoinPeriod(std::vector<std::string>& p);
|
std::string JoinPeriod(std::vector<std::string>& p);
|
||||||
@@ -2578,7 +2571,7 @@ class GC {
|
|||||||
Tesses::Framework::Filesystem::VFSPath Merge(std::shared_ptr<Tesses::Framework::Filesystem::VFS> srcFS, Tesses::Framework::Filesystem::VFSPath sourcePath, std::shared_ptr<Tesses::Framework::Filesystem::VFS> destFS);
|
Tesses::Framework::Filesystem::VFSPath Merge(std::shared_ptr<Tesses::Framework::Filesystem::VFS> srcFS, Tesses::Framework::Filesystem::VFSPath sourcePath, std::shared_ptr<Tesses::Framework::Filesystem::VFS> destFS);
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<Tesses::Framework::Http::IHttpServer> ToHttpServer(GC* gc,TObject obj);
|
std::shared_ptr<Tesses::Framework::Http::IHttpServer> ToHttpServer(std::shared_ptr<GC> gc,TObject obj);
|
||||||
|
|
||||||
class EmbedStream : public Tesses::Framework::Streams::Stream
|
class EmbedStream : public Tesses::Framework::Streams::Stream
|
||||||
{
|
{
|
||||||
@@ -2587,7 +2580,7 @@ class GC {
|
|||||||
uint32_t resource;
|
uint32_t resource;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
EmbedStream(GC* gc, TFile* file, uint32_t resource);
|
EmbedStream(std::shared_ptr<GC> gc, TFile* file, uint32_t resource);
|
||||||
bool CanRead();
|
bool CanRead();
|
||||||
bool CanSeek();
|
bool CanSeek();
|
||||||
bool EndOfStream();
|
bool EndOfStream();
|
||||||
@@ -2602,18 +2595,26 @@ class GC {
|
|||||||
MarkedTObject dir;
|
MarkedTObject dir;
|
||||||
TObject getEntry(Tesses::Framework::Filesystem::VFSPath path);
|
TObject getEntry(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
public:
|
public:
|
||||||
EmbedDirectory(GC* gc, TDictionary* dict);
|
EmbedDirectory(std::shared_ptr<GC> gc, TDictionary* dict);
|
||||||
std::shared_ptr<Tesses::Framework::Streams::Stream> OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode);
|
std::shared_ptr<Tesses::Framework::Streams::Stream> OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode);
|
||||||
void CreateDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
void DeleteDirectory(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool RegularFileExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
bool DirectoryExists(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
void DeleteFile(Tesses::Framework::Filesystem::VFSPath path);
|
|
||||||
Tesses::Framework::Filesystem::VFSPathEnumerator EnumeratePaths(Tesses::Framework::Filesystem::VFSPath path);
|
Tesses::Framework::Filesystem::VFSPathEnumerator EnumeratePaths(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
void MoveFile(Tesses::Framework::Filesystem::VFSPath src, Tesses::Framework::Filesystem::VFSPath dest);
|
|
||||||
std::string VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path);
|
std::string VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path);
|
||||||
Tesses::Framework::Filesystem::VFSPath SystemToVFSPath(std::string path);
|
Tesses::Framework::Filesystem::VFSPath SystemToVFSPath(std::string path);
|
||||||
|
|
||||||
|
bool Stat(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatData& data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
namespace Programs {
|
||||||
|
int64_t CrossArchiveCreate(std::vector<std::string>& argv);
|
||||||
|
int64_t CrossArchiveExtract(std::vector<std::string>& argv);
|
||||||
|
TObject CrossLangInterperter(GCList& ls,TRootEnvironment* env,std::vector<std::string>& argv);
|
||||||
|
TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv);
|
||||||
|
|
||||||
|
TObject CrossLangVM(GCList& ls,TRootEnvironment* env, std::vector<std::string>& argv);
|
||||||
|
|
||||||
|
void CrossLangDump(std::shared_ptr<Tesses::Framework::Streams::Stream> strm);
|
||||||
|
void CrossLangCompiler(std::vector<std::string>& argv);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ set(PKGCONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
|||||||
set(PKGCONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
|
set(PKGCONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
|
||||||
set(PKGCONFIG_PROJECT_DESCRIPTION "A programming language")
|
set(PKGCONFIG_PROJECT_DESCRIPTION "A programming language")
|
||||||
set(PKGCONFIG_PROJECT_HOMEPAGE_URL "https://onedev.site.tesses.net/crosslang")
|
set(PKGCONFIG_PROJECT_HOMEPAGE_URL "https://crosslang.tesseslanguage.com/")
|
||||||
|
|
||||||
if(CROSSLANG_ENABLE_FFI)
|
if(CROSSLANG_ENABLE_FFI)
|
||||||
set(PKGCONFIG_DEPS "Requires: libffi")
|
set(PKGCONFIG_DEPS "Requires: libffi")
|
||||||
|
|||||||
@@ -308,7 +308,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
Parser::Parser(std::vector<LexToken> tokens, GC* gc, TRootEnvironment* env)
|
Parser::Parser(std::vector<LexToken> tokens, std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
this->i = 0;
|
this->i = 0;
|
||||||
this->tokens = tokens;
|
this->tokens = tokens;
|
||||||
|
|||||||
@@ -212,15 +212,15 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GC* gc=nullptr;
|
std::shared_ptr<GC> gc;
|
||||||
GCList* ls=nullptr;
|
std::shared_ptr<GCList> ls;
|
||||||
TRootEnvironment* env=nullptr;
|
TRootEnvironment* env=nullptr;
|
||||||
if(comptime != "none")
|
if(comptime != "none")
|
||||||
{
|
{
|
||||||
gc = new GC();
|
gc = std::make_shared<GC>();
|
||||||
gc->Start();
|
gc->Start();
|
||||||
ls = new GCList(gc);
|
ls = std::make_shared<GCList>(gc);
|
||||||
env = TRootEnvironment::Create(ls,TDictionary::Create(ls));
|
env = TRootEnvironment::Create(*ls,TDictionary::Create(*ls));
|
||||||
|
|
||||||
if(comptime == "secure")
|
if(comptime == "secure")
|
||||||
{
|
{
|
||||||
@@ -281,10 +281,5 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
gen.Save(strm);
|
gen.Save(strm);
|
||||||
}
|
}
|
||||||
if(gc != nullptr)
|
|
||||||
{
|
|
||||||
delete ls;
|
|
||||||
delete gc;
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
#include "CrossLang.hpp"
|
|
||||||
using namespace Tesses::Framework;
|
|
||||||
using namespace Tesses::CrossLang;
|
|
||||||
int main(int argc, char** argv)
|
|
||||||
{
|
|
||||||
TF_InitWithConsole();
|
|
||||||
|
|
||||||
if(argc < 2)
|
|
||||||
{
|
|
||||||
printf("USAGE: %s <filename.crvm> <args...>\n",argv[0]);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if(argc > 0)
|
|
||||||
TF_AllowPortable(argv[0]);
|
|
||||||
|
|
||||||
GC gc;
|
|
||||||
gc.Start();
|
|
||||||
GCList ls(gc);
|
|
||||||
TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
|
|
||||||
|
|
||||||
TStd::RegisterStd(&gc,env);
|
|
||||||
env->LoadFileWithDependencies(&gc, Tesses::Framework::Filesystem::LocalFS, Tesses::Framework::Filesystem::LocalFS->SystemToVFSPath(argv[1]));
|
|
||||||
|
|
||||||
if(env->HasVariable("WebAppMain"))
|
|
||||||
{
|
|
||||||
Args args(argc, argv);
|
|
||||||
int port = 4206;
|
|
||||||
for(auto& item : args.options)
|
|
||||||
{
|
|
||||||
if(item.first == "port")
|
|
||||||
{
|
|
||||||
port = std::stoi(item.second);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
env->EnsureDictionary(&gc,"Net")->SetValue("WebServerPort", (int64_t)port);
|
|
||||||
TList* args2 = TList::Create(ls);
|
|
||||||
for(auto& item : args.positional)
|
|
||||||
{
|
|
||||||
args2->Add(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto res = env->CallFunctionWithFatalError(ls, "WebAppMain", {args2});
|
|
||||||
auto svr2 = Tesses::CrossLang::ToHttpServer(&gc,res);
|
|
||||||
if(svr2 == nullptr) return 1;
|
|
||||||
Tesses::Framework::Http::HttpServer svr(port,svr2);
|
|
||||||
svr.StartAccepting();
|
|
||||||
TF_RunEventLoop();
|
|
||||||
TDictionary* _dict;
|
|
||||||
TClassObject* _co;
|
|
||||||
if(GetObjectHeap(res,_dict))
|
|
||||||
{
|
|
||||||
_dict->CallMethod(ls,"Close",{});
|
|
||||||
}
|
|
||||||
if(GetObjectHeap(res,_co))
|
|
||||||
{
|
|
||||||
_co->CallMethod(ls,"","Close",{});
|
|
||||||
}
|
|
||||||
TF_Quit();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
TList* args = TList::Create(ls);
|
|
||||||
for(int arg=1;arg<argc;arg++)
|
|
||||||
args->Add(std::string(argv[arg]));
|
|
||||||
|
|
||||||
auto res = env->CallFunctionWithFatalError(ls,"main",{args});
|
|
||||||
int64_t iresult;
|
|
||||||
if(GetObject(res,iresult))
|
|
||||||
return (int)iresult;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang
|
namespace Tesses::CrossLang
|
||||||
{
|
{
|
||||||
SharedPtrTObject::SharedPtrTObject(GC* gc, TObject o)
|
SharedPtrTObject::SharedPtrTObject(std::shared_ptr<GC> gc, TObject o)
|
||||||
{
|
{
|
||||||
this->ls = new GCList(gc);
|
this->ls = new GCList(gc);
|
||||||
this->ls->Add(o);
|
this->ls->Add(o);
|
||||||
@@ -17,18 +17,15 @@ namespace Tesses::CrossLang
|
|||||||
if(this->ls)
|
if(this->ls)
|
||||||
delete this->ls;
|
delete this->ls;
|
||||||
}
|
}
|
||||||
GC* SharedPtrTObject::GetGC()
|
std::shared_ptr<GC> SharedPtrTObject::GetGC()
|
||||||
{
|
{
|
||||||
return this->ls->GetGC();
|
return this->ls->GetGC();
|
||||||
}
|
}
|
||||||
MarkedTObject CreateMarkedTObject(GC* gc, TObject o)
|
MarkedTObject CreateMarkedTObject(std::shared_ptr<GC> gc, TObject o)
|
||||||
{
|
{
|
||||||
return std::make_shared<SharedPtrTObject>(gc,o);
|
return std::make_shared<SharedPtrTObject>(gc,o);
|
||||||
}
|
}
|
||||||
MarkedTObject CreateMarkedTObject(GC& gc, TObject o)
|
|
||||||
{
|
|
||||||
return CreateMarkedTObject(&gc,o);
|
|
||||||
}
|
|
||||||
MarkedTObject CreateMarkedTObject(GCList* gc, TObject o)
|
MarkedTObject CreateMarkedTObject(GCList* gc, TObject o)
|
||||||
{
|
{
|
||||||
return CreateMarkedTObject(gc->GetGC(),o);
|
return CreateMarkedTObject(gc->GetGC(),o);
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#include "CrossLang.hpp"
|
#include "CrossLang.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace Tesses::CrossLang;
|
namespace Tesses::CrossLang::Programs {
|
||||||
using namespace Tesses::Framework::Filesystem;
|
using namespace Tesses::Framework::Filesystem;
|
||||||
using namespace Tesses::Framework::Streams;
|
using namespace Tesses::Framework::Streams;
|
||||||
void Help(const char* filename)
|
static void Help(std::string& filename)
|
||||||
{
|
{
|
||||||
printf("USAGE: %s [OPTIONS] <dirasroot> <archive.crvm>\n", filename);
|
std::cout << "USAGE: " << filename << " [OPTIONS] <dirasroot> <archive.crvm>" << std::endl;
|
||||||
printf("OPTIONS:\n");
|
printf("OPTIONS:\n");
|
||||||
printf(" -i: Set info (ex {\"maintainer\": \"Mike Nolan\", \"repo\": \"https://example.com/\", \"homepage\": \"https://example.com/\",\"license\":\"MIT\"})\n");
|
printf(" -i: Set info (ex {\"maintainer\": \"Mike Nolan\", \"repo\": \"https://example.com/\", \"homepage\": \"https://example.com/\",\"license\":\"MIT\"})\n");
|
||||||
printf(" -I: Set icon name (relative to dirasroot), should be a 128x128 png\n");
|
printf(" -I: Set icon name (relative to dirasroot), should be a 128x128 png\n");
|
||||||
@@ -15,7 +15,8 @@ void Help(const char* filename)
|
|||||||
printf("Options except for help have flag with arg like this: -F ARG\n");
|
printf("Options except for help have flag with arg like this: -F ARG\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
int main(int argc, char** argv)
|
|
||||||
|
int64_t CrossArchiveCreate(std::vector<std::string>& argv)
|
||||||
{
|
{
|
||||||
Tesses::Framework::TF_Init();
|
Tesses::Framework::TF_Init();
|
||||||
std::string name="out";
|
std::string name="out";
|
||||||
@@ -23,40 +24,40 @@ int main(int argc, char** argv)
|
|||||||
TVMVersion version;
|
TVMVersion version;
|
||||||
std::string icon="";
|
std::string icon="";
|
||||||
std::vector<std::string> args;
|
std::vector<std::string> args;
|
||||||
for(int i = 1; i < argc; i++)
|
for(int i = 1; i < argv.size(); i++)
|
||||||
{
|
{
|
||||||
if(strcmp(argv[i],"--help") == 0 || strcmp(argv[i],"-h")==0)
|
if(argv[i] == "--help" || argv[i] == "-h")
|
||||||
{
|
{
|
||||||
Help(argv[0]);
|
Help(argv[0]);
|
||||||
}
|
}
|
||||||
else if(strcmp(argv[i], "-i") == 0)
|
else if(argv[i] == "-i")
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
if(i < argc)
|
if(i < argv.size())
|
||||||
{
|
{
|
||||||
info = argv[i];
|
info = argv[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(strcmp(argv[i], "-I") == 0)
|
else if(argv[i] == "-I")
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
if(i < argc)
|
if(i < argv.size())
|
||||||
{
|
{
|
||||||
icon = argv[i];
|
icon = argv[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(strcmp(argv[i], "-n") == 0)
|
else if(argv[i] == "-n")
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
if(i < argc)
|
if(i < argv.size())
|
||||||
{
|
{
|
||||||
name = argv[i];
|
name = argv[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(strcmp(argv[i], "-v") == 0)
|
else if(argv[i] == "-v")
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
if(i < argc)
|
if(i < argv.size())
|
||||||
{
|
{
|
||||||
|
|
||||||
if(!TVMVersion::TryParse(argv[i],version))
|
if(!TVMVersion::TryParse(argv[i],version))
|
||||||
@@ -91,3 +92,4 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@@ -1,30 +1,29 @@
|
|||||||
#include "CrossLang.hpp"
|
#include "CrossLang.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace Tesses::CrossLang;
|
|
||||||
|
namespace Tesses::CrossLang::Programs {
|
||||||
using namespace Tesses::Framework::Filesystem;
|
using namespace Tesses::Framework::Filesystem;
|
||||||
using namespace Tesses::Framework::Streams;
|
using namespace Tesses::Framework::Streams;
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int64_t CrossArchiveExtract(std::vector<std::string>& argv)
|
||||||
{
|
{
|
||||||
Tesses::Framework::TF_Init();
|
Tesses::Framework::TF_Init();
|
||||||
if(argc < 3)
|
if(argv.size() < 3)
|
||||||
{
|
{
|
||||||
printf("USAGE: %s <archive.crvm> <dirasroot>\n", argv[0]);
|
std::cout << "USAGE: " << argv[0] << " <archive.crvm> <dirasroot>" << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto sdfs= std::make_shared<SubdirFilesystem>(Tesses::Framework::Filesystem::LocalFS,std::string(argv[2]));
|
auto sdfs= std::make_shared<SubdirFilesystem>(Tesses::Framework::Filesystem::LocalFS,std::string(argv[2]));
|
||||||
|
auto strm= LocalFS->OpenFile(argv[1], "rb");
|
||||||
FILE* f = fopen(argv[1],"rb");
|
if(strm->CanRead())
|
||||||
if(f == NULL)
|
|
||||||
{
|
{
|
||||||
printf("ERROR: could not open %s\n", argv[1]);
|
std::cout << "ERROR: could not open " << argv[1] << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto strm = std::make_shared<FileStream>(f,true,"rb",true);
|
|
||||||
|
|
||||||
auto res = CrossArchiveExtract(strm,sdfs);
|
auto res = Tesses::CrossLang::CrossArchiveExtract(strm,sdfs);
|
||||||
|
|
||||||
std::cout << "Crvm Name: " << res.first.first << std::endl;
|
std::cout << "Crvm Name: " << res.first.first << std::endl;
|
||||||
std::cout << "Crvm Version: " << res.first.second.ToString() << std::endl;
|
std::cout << "Crvm Version: " << res.first.second.ToString() << std::endl;
|
||||||
@@ -32,3 +31,4 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@@ -1,20 +1,20 @@
|
|||||||
#include "CrossLang.hpp"
|
#include "CrossLang.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace Tesses::CrossLang;
|
namespace Tesses::CrossLang::Programs {
|
||||||
void Ensure(Tesses::Framework::Streams::Stream& strm,uint8_t* buffer, size_t len)
|
static void Ensure(std::shared_ptr<Tesses::Framework::Streams::Stream> strm,uint8_t* buffer, size_t len)
|
||||||
{
|
{
|
||||||
if(strm.ReadBlock(buffer,len) != len)
|
if(strm->ReadBlock(buffer,len) != len)
|
||||||
{
|
{
|
||||||
throw VMException("Could not read " + std::to_string(len) + " byte(s).");
|
throw VMException("Could not read " + std::to_string(len) + " byte(s).");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
uint32_t EnsureInt(Tesses::Framework::Streams::Stream& strm)
|
static uint32_t EnsureInt(std::shared_ptr<Tesses::Framework::Streams::Stream> strm)
|
||||||
{
|
{
|
||||||
uint8_t buff[4];
|
uint8_t buff[4];
|
||||||
Ensure(strm,buff,sizeof(buff));
|
Ensure(strm,buff,sizeof(buff));
|
||||||
return BitConverter::ToUint32BE(buff[0]);
|
return BitConverter::ToUint32BE(buff[0]);
|
||||||
}
|
}
|
||||||
std::string EnsureString(Tesses::Framework::Streams::Stream& strm)
|
static std::string EnsureString(std::shared_ptr<Tesses::Framework::Streams::Stream> strm)
|
||||||
{
|
{
|
||||||
size_t len = (size_t)EnsureInt(strm);
|
size_t len = (size_t)EnsureInt(strm);
|
||||||
std::string myStr={};
|
std::string myStr={};
|
||||||
@@ -22,30 +22,24 @@ std::string EnsureString(Tesses::Framework::Streams::Stream& strm)
|
|||||||
Ensure(strm,(uint8_t*)myStr.data(), len);
|
Ensure(strm,(uint8_t*)myStr.data(), len);
|
||||||
return myStr;
|
return myStr;
|
||||||
}
|
}
|
||||||
void DumpFile(std::filesystem::path p)
|
void CrossLangDump(std::shared_ptr<Tesses::Framework::Streams::Stream> strm)
|
||||||
{
|
{
|
||||||
if(std::filesystem::is_regular_file(p))
|
uint8_t main_header[18];
|
||||||
|
Ensure(strm,main_header,sizeof(main_header));
|
||||||
|
if(strncmp((const char*)main_header,"TCROSSVM",8) != 0) throw VMException("Invalid TCrossVM image.");
|
||||||
|
TVMVersion version(main_header+8);
|
||||||
|
if(version.CompareToRuntime() == 1)
|
||||||
{
|
{
|
||||||
try
|
throw VMException("Runtime is too old.");
|
||||||
{
|
}
|
||||||
std::cout << "File: " << p.string() << std::endl;
|
TVMVersion v2(main_header+13);
|
||||||
Tesses::Framework::Streams::FileStream strm(p,"rb");
|
std::cout << "Version: " << v2.ToString() << std::endl;
|
||||||
uint8_t main_header[18];
|
|
||||||
Ensure(strm,main_header,sizeof(main_header));
|
|
||||||
if(strncmp((const char*)main_header,"TCROSSVM",8) != 0) throw VMException("Invalid TCrossVM image.");
|
|
||||||
TVMVersion version(main_header+8);
|
|
||||||
if(version.CompareToRuntime() == 1)
|
|
||||||
{
|
|
||||||
throw VMException("Runtime is too old.");
|
|
||||||
}
|
|
||||||
TVMVersion v2(main_header+13);
|
|
||||||
std::cout << "Version: " << v2.ToString() << std::endl;
|
|
||||||
|
|
||||||
size_t _len = (size_t)EnsureInt(strm);
|
size_t _len = (size_t)EnsureInt(strm);
|
||||||
|
|
||||||
std::cout << "SectionCount: " << _len << std::endl;
|
std::cout << "SectionCount: " << _len << std::endl;
|
||||||
|
|
||||||
std::vector<std::string> strs;
|
std::vector<std::string> strs;
|
||||||
|
|
||||||
std::unordered_map<uint32_t, std::vector<std::string>> funs;
|
std::unordered_map<uint32_t, std::vector<std::string>> funs;
|
||||||
std::vector<std::vector<std::string>> closures;
|
std::vector<std::vector<std::string>> closures;
|
||||||
@@ -177,7 +171,7 @@ void DumpFile(std::filesystem::path p)
|
|||||||
}
|
}
|
||||||
auto len = EnsureInt(strm);
|
auto len = EnsureInt(strm);
|
||||||
|
|
||||||
strm.Seek(len,Tesses::Framework::Streams::SeekOrigin::Current);
|
strm->Seek(len,Tesses::Framework::Streams::SeekOrigin::Current);
|
||||||
|
|
||||||
closures.push_back(args);
|
closures.push_back(args);
|
||||||
}
|
}
|
||||||
@@ -208,7 +202,7 @@ void DumpFile(std::filesystem::path p)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
strm.Seek((int64_t)tableLen,Tesses::Framework::Streams::SeekOrigin::Current);
|
strm->Seek((int64_t)tableLen,Tesses::Framework::Streams::SeekOrigin::Current);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(hasIcon)
|
if(hasIcon)
|
||||||
@@ -252,22 +246,10 @@ void DumpFile(std::filesystem::path p)
|
|||||||
for(auto str : strs) {
|
for(auto str : strs) {
|
||||||
std::cout << EscapeString(str, true) << std::endl;
|
std::cout << EscapeString(str, true) << std::endl;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
catch(std::exception& ex)
|
|
||||||
{
|
|
||||||
std::cout << "Error when reading file \"" << p.string() << "\" " << ex.what() << std::endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
std::cout << "CrossVM file \"" << p.string() << "\" does not exist." << std::endl;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
int main(int argc, char** argv)
|
|
||||||
{
|
|
||||||
Tesses::Framework::TF_Init();
|
|
||||||
for(int i = 1; i < argc; i++)
|
|
||||||
{
|
|
||||||
DumpFile(argv[i]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,28 +1,54 @@
|
|||||||
#include "CrossLang.hpp"
|
#include "CrossLang.hpp"
|
||||||
|
#include "TessesFramework/Platform/Environment.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
using namespace Tesses::Framework;
|
using namespace Tesses::Framework;
|
||||||
using namespace Tesses::CrossLang;
|
|
||||||
using namespace Tesses::Framework::Http;
|
using namespace Tesses::Framework::Http;
|
||||||
|
|
||||||
bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs)
|
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"))
|
||||||
|
{
|
||||||
|
HttpRequest req;
|
||||||
|
req.followRedirects=true;
|
||||||
|
req.url = "https://redirect.tesses.net/crosslang-shell";
|
||||||
|
req.method = "GET";
|
||||||
|
HttpResponse resp(req);
|
||||||
|
if(resp.statusCode == StatusCode::OK)
|
||||||
|
{
|
||||||
|
auto strm = resp.ReadAsStream();
|
||||||
|
CrossLang::CrossArchiveExtract(strm, vfs);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::cout << "Error when fetching the script error: " << std::to_string(resp.statusCode) << " " << HttpUtils::StatusCodeString(resp.statusCode) << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
while(true)
|
while(true)
|
||||||
{
|
{
|
||||||
std::cout << "File " << filename.ToString() << " not found, do you want to download the installer from: https://downloads.tesses.net/ShellPackage.crvm (this may install other stuff as well) (Y/n)? ";
|
std::cout << "File " << filename.ToString() << " not found, do you want to download the installer from: https://redirect.tesses.net/crosslang-shell (this may install other stuff as well) (Y/n)? ";
|
||||||
std::string line;
|
std::string line;
|
||||||
std::getline(std::cin,line);
|
std::getline(std::cin,line);
|
||||||
if(line == "Y" || line == "y")
|
if(line == "Y" || line == "y")
|
||||||
{
|
{
|
||||||
HttpRequest req;
|
HttpRequest req;
|
||||||
req.url = "https://downloads.tesses.net/ShellPackage.crvm";
|
req.followRedirects = true;
|
||||||
|
req.url = "https://redirect.tesses.net/crosslang-shell";
|
||||||
req.method = "GET";
|
req.method = "GET";
|
||||||
HttpResponse resp(req);
|
HttpResponse resp(req);
|
||||||
if(resp.statusCode == StatusCode::OK)
|
if(resp.statusCode == StatusCode::OK)
|
||||||
{
|
{
|
||||||
auto strm = resp.ReadAsStream();
|
auto strm = resp.ReadAsStream();
|
||||||
CrossArchiveExtract(strm, vfs);
|
CrossLang::CrossArchiveExtract(strm, vfs);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -46,13 +72,8 @@ bool Download(Tesses::Framework::Filesystem::VFSPath filename,std::shared_ptr<Te
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
TObject CrossLangShell(GCList& ls, std::vector<std::string>& argv)
|
||||||
{
|
{
|
||||||
TF_InitWithConsole();
|
|
||||||
if(argc > 0)
|
|
||||||
TF_AllowPortable(argv[0]);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Tesses::Framework::Filesystem::VFSPath dir = GetCrossLangConfigDir();
|
Tesses::Framework::Filesystem::VFSPath dir = GetCrossLangConfigDir();
|
||||||
|
|
||||||
@@ -60,23 +81,24 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
|
|
||||||
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";
|
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(argc == 2 && strcmp(argv[1],"configdir") == 0)
|
if(argv.size() == 2 && argv[1] == "configdir")
|
||||||
{
|
{
|
||||||
std::cout << dir.ToString() << std::endl;
|
std::cout << dir.ToString() << std::endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if(argc > 1 && strcmp(argv[1],"update-shell") == 0)
|
if(argv.size() > 1 && argv[1] == "update-shell")
|
||||||
{
|
{
|
||||||
|
|
||||||
auto subdir = std::make_shared<Tesses::Framework::Filesystem::SubdirFilesystem>(Tesses::Framework::Filesystem::LocalFS,dir);
|
auto subdir = std::make_shared<Tesses::Framework::Filesystem::SubdirFilesystem>(Tesses::Framework::Filesystem::LocalFS,dir);
|
||||||
HttpRequest req;
|
HttpRequest req;
|
||||||
req.url = "https://downloads.tesses.net/ShellPackage.crvm";
|
req.followRedirects=true;
|
||||||
|
req.url = "https://redirect.tesses.net/crosslang-shell";
|
||||||
req.method = "GET";
|
req.method = "GET";
|
||||||
HttpResponse resp(req);
|
HttpResponse resp(req);
|
||||||
if(resp.statusCode == StatusCode::OK)
|
if(resp.statusCode == StatusCode::OK)
|
||||||
{
|
{
|
||||||
auto strm = resp.ReadAsStream();
|
auto strm = resp.ReadAsStream();
|
||||||
CrossArchiveExtract(strm, subdir);
|
CrossLang::CrossArchiveExtract(strm, subdir);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -97,7 +119,7 @@ int main(int argc, char** argv)
|
|||||||
auto strm = Tesses::Framework::Filesystem::LocalFS->OpenFile(p,"rb");
|
auto strm = Tesses::Framework::Filesystem::LocalFS->OpenFile(p,"rb");
|
||||||
if(strm != nullptr)
|
if(strm != nullptr)
|
||||||
{
|
{
|
||||||
CrossArchiveExtract(strm, subdir);
|
CrossLang::CrossArchiveExtract(strm, subdir);
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -113,29 +135,24 @@ int main(int argc, char** argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GC gc;
|
|
||||||
gc.Start();
|
|
||||||
|
|
||||||
GCList ls(gc);
|
|
||||||
TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
|
TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
|
||||||
|
|
||||||
|
|
||||||
TStd::RegisterStd(&gc,env);
|
TStd::RegisterStd(ls.GetGC(),env);
|
||||||
|
|
||||||
|
|
||||||
env->LoadFileWithDependencies(&gc, Tesses::Framework::Filesystem::LocalFS, filename);
|
env->LoadFileWithDependencies(ls.GetGC(), Tesses::Framework::Filesystem::LocalFS, filename);
|
||||||
|
|
||||||
|
|
||||||
TList* args = TList::Create(ls);
|
TList* args = TList::Create(ls);
|
||||||
|
|
||||||
args->Add(filename.ToString());
|
args->Add(filename.ToString());
|
||||||
|
|
||||||
for(int arg=1;arg<argc;arg++)
|
for(size_t arg=1;arg<argv.size();arg++)
|
||||||
args->Add(std::string(argv[arg]));
|
args->Add(std::string(argv[arg]));
|
||||||
|
|
||||||
auto res = env->CallFunctionWithFatalError(ls,"main",{args});
|
return env->CallFunctionWithFatalError(ls,"main",{args});
|
||||||
int64_t iresult;
|
|
||||||
if(GetObject(res,iresult))
|
}
|
||||||
return (int)iresult;
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
285
src/program_lib/crosslangcompiler.cpp
Normal file
285
src/program_lib/crosslangcompiler.cpp
Normal file
@@ -0,0 +1,285 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
namespace Tesses::CrossLang::Programs {
|
||||||
|
static void Help(std::string filename)
|
||||||
|
{
|
||||||
|
std::cout << "USAGE: " << filename << " [OPTIONS] source_file1 source_file2 source_file_n" << std::endl;
|
||||||
|
printf("OPTIONS:\n");
|
||||||
|
printf(" -o: Output directory (OUTDIR, defaults to ./bin)\n");
|
||||||
|
printf(" -i: Set info (ex {\"maintainer\": \"Mike Nolan\", \"repo\": \"https://example.com/\", \"homepage\": \"https://example.com/\",\"license\":\"MIT\"})\n");
|
||||||
|
printf(" -I: Set icon resource name (in the resource folder), should be a 128x128 png\n");
|
||||||
|
printf(" -v: Set version (1.0.0.0-prod defaults to 1.0.0.0-dev)\n");
|
||||||
|
printf(" -d: Add dependency (DependencyName-1.0.0.0-prod)\n");
|
||||||
|
printf(" -D: enable debug)\n");
|
||||||
|
printf(" -t: Declare a tool (ToolName-1.0.0.0-prod)\n");
|
||||||
|
printf(" -n: Set name (MyAppOrLibName defaults to out)\n");
|
||||||
|
printf(" -r: Set resource directory (RESDIR defaults to res)\n");
|
||||||
|
printf(" -h, --help: Prints help\n");
|
||||||
|
printf(" -e: Set comptime permissions defaults to none, none for no support, \"secure\" for sane without file access, \"secure_file\" for sane with file access to current directory and sub directories, \"full\" has full runtime.\n");
|
||||||
|
printf("Options except for help have flag with arg like this: -F ARG\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
void CrossLangCompiler(std::vector<std::string>& argv)
|
||||||
|
{
|
||||||
|
/*std::ifstream strm(argv[1],std::ios_base::in|std::ios_base::binary);
|
||||||
|
std::vector<LexToken> tokens;
|
||||||
|
Lex(argv[1],strm,tokens);
|
||||||
|
|
||||||
|
Parser parser(tokens);
|
||||||
|
|
||||||
|
CodeGen gen;
|
||||||
|
gen.GenRoot(parser.ParseRoot());
|
||||||
|
std::vector<uint8_t> data;
|
||||||
|
ByteCodeVectorWriter w(data);
|
||||||
|
gen.Save(std::filesystem::current_path(),w);
|
||||||
|
*/
|
||||||
|
TF_InitWithConsole();
|
||||||
|
std::filesystem::path outputDir = std::filesystem::current_path() / "bin";
|
||||||
|
std::vector<std::filesystem::path> source;
|
||||||
|
std::filesystem::path resourceDir = std::filesystem::current_path() / "res";
|
||||||
|
std::vector<std::pair<std::string, TVMVersion>> dependencies;
|
||||||
|
std::vector<std::pair<std::string, TVMVersion>> tools;
|
||||||
|
std::string name="out";
|
||||||
|
std::string info="{}";
|
||||||
|
std::string icon="";
|
||||||
|
std::string comptime="none";
|
||||||
|
TVMVersion version;
|
||||||
|
bool debug=false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
for(size_t i = 1; i < argv.size(); i++)
|
||||||
|
{
|
||||||
|
if(argv[i] == "--help" || argv[i] == "-h")
|
||||||
|
{
|
||||||
|
Help(argv[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(argv[i] == "-o")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
outputDir = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-r")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
resourceDir = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-e")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
comptime = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(argv[i] == "-i")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
info = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-I")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
icon = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-d")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
std::string str = argv[i];
|
||||||
|
auto lastDash = str.find_last_of('-');
|
||||||
|
if(lastDash < str.size())
|
||||||
|
{
|
||||||
|
std::string str2 = str.substr(lastDash+1);
|
||||||
|
if(str2 == "dev" || str2 == "alpha" || str2 == "beta" || str2 == "prod")
|
||||||
|
{
|
||||||
|
lastDash = str.find_last_of('-',lastDash-1);
|
||||||
|
}
|
||||||
|
std::string str1 = str.substr(0,lastDash);
|
||||||
|
str2 = str.substr(lastDash+1);
|
||||||
|
|
||||||
|
TVMVersion v2;
|
||||||
|
if(!TVMVersion::TryParse(str2,v2))
|
||||||
|
{
|
||||||
|
printf("ERROR: Invalid syntax for version\n");
|
||||||
|
printf("Expected MAJOR[.MINOR[.PATCH[.BUILD[-dev,-alpha,-beta,-prod]]]]\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
dependencies.push_back(std::pair<std::string,TVMVersion>(str1,v2));
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("ERROR: Dependency must have version\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-t")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
std::string str = argv[i];
|
||||||
|
auto lastDash = str.find_last_of('-');
|
||||||
|
if(lastDash < str.size())
|
||||||
|
{
|
||||||
|
std::string str2 = str.substr(lastDash+1);
|
||||||
|
if(str2 == "dev" || str2 == "alpha" || str2 == "beta" || str2 == "prod")
|
||||||
|
{
|
||||||
|
lastDash = str.find_last_of('-',lastDash-1);
|
||||||
|
}
|
||||||
|
std::string str1 = str.substr(0,lastDash);
|
||||||
|
str2 = str.substr(lastDash+1);
|
||||||
|
|
||||||
|
TVMVersion v2;
|
||||||
|
if(!TVMVersion::TryParse(str2,v2))
|
||||||
|
{
|
||||||
|
printf("ERROR: Invalid syntax for version\n");
|
||||||
|
printf("Expected MAJOR[.MINOR[.PATCH[.BUILD[-dev,-alpha,-beta,-prod]]]]\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
tools.push_back(std::pair<std::string,TVMVersion>(str1,v2));
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("ERROR: Tool must have version\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-n")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
name = argv[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-v")
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
if(i < argv.size())
|
||||||
|
{
|
||||||
|
|
||||||
|
if(!TVMVersion::TryParse(argv[i],version))
|
||||||
|
{
|
||||||
|
printf("ERROR: Invalid syntax for version\n");
|
||||||
|
printf("Expected MAJOR[.MINOR[.PATCH[.BUILD[-dev,-alpha,-beta,-prod]]]]\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(argv[i] == "-D" || argv[i] == "--debug")
|
||||||
|
{
|
||||||
|
debug = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
source.push_back(argv[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(source.empty())
|
||||||
|
{
|
||||||
|
Help(argv[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
std::vector<LexToken> tokens;
|
||||||
|
|
||||||
|
for(auto src : source)
|
||||||
|
{
|
||||||
|
std::ifstream strm(src,std::ios_base::in|std::ios_base::binary);
|
||||||
|
int res = Lex(std::filesystem::absolute(src).string(),strm,tokens);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<GC> gc;
|
||||||
|
std::shared_ptr<GCList> ls;
|
||||||
|
TRootEnvironment* env=nullptr;
|
||||||
|
if(comptime != "none")
|
||||||
|
{
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<GC>();
|
||||||
|
gc->Start();
|
||||||
|
ls = std::make_shared<GCList>(gc);
|
||||||
|
env = TRootEnvironment::Create(*ls,TDictionary::Create(*ls));
|
||||||
|
|
||||||
|
if(comptime == "secure")
|
||||||
|
{
|
||||||
|
TStd::RegisterConsole(gc,env);
|
||||||
|
TStd::RegisterClass(gc,env);
|
||||||
|
TStd::RegisterCrypto(gc,env);
|
||||||
|
TStd::RegisterDictionary(gc,env);
|
||||||
|
TStd::RegisterJson(gc,env);
|
||||||
|
TStd::RegisterRoot(gc,env);
|
||||||
|
TStd::RegisterIO(gc,env,false);
|
||||||
|
env->permissions.locked=true;
|
||||||
|
}
|
||||||
|
else if(comptime == "secure_file")
|
||||||
|
{
|
||||||
|
TStd::RegisterConsole(gc,env);
|
||||||
|
TStd::RegisterClass(gc,env);
|
||||||
|
TStd::RegisterCrypto(gc,env);
|
||||||
|
TStd::RegisterDictionary(gc,env);
|
||||||
|
TStd::RegisterJson(gc,env);
|
||||||
|
TStd::RegisterRoot(gc,env);
|
||||||
|
TStd::RegisterIO(gc,env,false);
|
||||||
|
env->permissions.locked=true;
|
||||||
|
auto fs = env->EnsureDictionary(gc,"FS");
|
||||||
|
fs->SetValue("Local", std::make_shared<SubdirFilesystem>(LocalFS,Tesses::Framework::Filesystem::VFSPath::GetAbsoluteCurrentDirectory()));
|
||||||
|
}
|
||||||
|
else if(comptime == "full")
|
||||||
|
{
|
||||||
|
TStd::RegisterStd(gc,env);
|
||||||
|
env->permissions.locked=true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Parser parser(tokens,gc,env);
|
||||||
|
parser.debug = debug;
|
||||||
|
CodeGen gen;
|
||||||
|
|
||||||
|
auto sfs = std::make_shared<SubdirFilesystem>(LocalFS,LocalFS->SystemToVFSPath(resourceDir.string()));
|
||||||
|
gen.embedFS = sfs;
|
||||||
|
|
||||||
|
gen.GenRoot(parser.ParseRoot());
|
||||||
|
gen.name = name;
|
||||||
|
gen.version = version;
|
||||||
|
gen.info = info;
|
||||||
|
gen.icon = icon;
|
||||||
|
for(auto deps : dependencies)
|
||||||
|
{
|
||||||
|
gen.dependencies.push_back(deps);
|
||||||
|
}
|
||||||
|
for(auto tool : tools)
|
||||||
|
{
|
||||||
|
gen.tools.push_back(tool);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::filesystem::create_directory(outputDir);
|
||||||
|
|
||||||
|
{
|
||||||
|
auto strm = std::make_shared<Tesses::Framework::Streams::FileStream>(outputDir / (name + "-" + version.ToString() + ".crvm"),"wb");
|
||||||
|
|
||||||
|
gen.Save(strm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,20 +4,13 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
using namespace Tesses::Framework;
|
using namespace Tesses::Framework;
|
||||||
using namespace Tesses::CrossLang;
|
|
||||||
using namespace Tesses::Framework::Filesystem;
|
using namespace Tesses::Framework::Filesystem;
|
||||||
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));
|
|
||||||
TStd::RegisterStd(&gc,env);
|
|
||||||
|
|
||||||
if(argc > 1)
|
namespace Tesses::CrossLang::Programs {
|
||||||
|
TObject CrossLangInterperter(GCList& ls,TRootEnvironment* env,std::vector<std::string>& argv)
|
||||||
|
{
|
||||||
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
|
if(argv.size() > 1)
|
||||||
{
|
{
|
||||||
std::ifstream strm(argv[1],std::ios_base::in|std::ios_base::binary);
|
std::ifstream strm(argv[1],std::ios_base::in|std::ios_base::binary);
|
||||||
std::vector<LexToken> tokens;
|
std::vector<LexToken> tokens;
|
||||||
@@ -32,30 +25,28 @@ int main(int argc, char** argv)
|
|||||||
gen.GenRoot(parser.ParseRoot());
|
gen.GenRoot(parser.ParseRoot());
|
||||||
std::vector<uint8_t> data;
|
std::vector<uint8_t> data;
|
||||||
{
|
{
|
||||||
auto strm2 = std::make_shared<Tesses::Framework::Streams::MemoryStream>(true);
|
auto strm2 = std::make_shared<Tesses::Framework::Streams::MemoryStream>(true);
|
||||||
gen.Save(strm2);
|
gen.Save(strm2);
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
TFile* file = TFile::Create(ls);
|
TFile* file = TFile::Create(ls);
|
||||||
|
|
||||||
strm2->Seek(0,Tesses::Framework::Streams::SeekOrigin::Begin);
|
strm2->Seek(0,Tesses::Framework::Streams::SeekOrigin::Begin);
|
||||||
file->Load(&gc,strm2);
|
file->Load(gc,strm2);
|
||||||
|
|
||||||
env->LoadFile(&gc, file);
|
env->LoadFile(gc, file);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
TList* args = TList::Create(ls);
|
TList* args = TList::Create(ls);
|
||||||
for(int arg=1;arg<argc;arg++)
|
for(int arg=1;arg<argv.size();arg++)
|
||||||
args->Add(std::string(argv[arg]));
|
args->Add(std::string(argv[arg]));
|
||||||
|
|
||||||
|
return env->CallFunctionWithFatalError(ls,"main",{args});
|
||||||
|
|
||||||
auto res = env->CallFunctionWithFatalError(ls,"main",{args});
|
|
||||||
int64_t iresult;
|
|
||||||
if(GetObject(res,iresult))
|
|
||||||
return (int)iresult;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -91,7 +82,7 @@ int main(int argc, char** argv)
|
|||||||
}
|
}
|
||||||
else if(source == "exit")
|
else if(source == "exit")
|
||||||
{
|
{
|
||||||
return 0;
|
return (int64_t)0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -116,9 +107,9 @@ int main(int argc, char** argv)
|
|||||||
TFile* file = TFile::Create(ls);
|
TFile* file = TFile::Create(ls);
|
||||||
|
|
||||||
strm2->Seek(0,Tesses::Framework::Streams::SeekOrigin::Begin);
|
strm2->Seek(0,Tesses::Framework::Streams::SeekOrigin::Begin);
|
||||||
file->Load(&gc,strm2);
|
file->Load(gc,strm2);
|
||||||
|
|
||||||
env->LoadFile(&gc, file);
|
env->LoadFile(gc, file);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -126,4 +117,8 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return (int64_t)0;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
61
src/program_lib/crosslangvm.cpp
Normal file
61
src/program_lib/crosslangvm.cpp
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
namespace Tesses::CrossLang::Programs {
|
||||||
|
TObject CrossLangVM(GCList& ls,TRootEnvironment* env, std::vector<std::string>& argv)
|
||||||
|
{
|
||||||
|
if(argv.size() < 2)
|
||||||
|
{
|
||||||
|
std::cout << "USAGE: " << (argv.empty() ? (std::string)"crossvm" : argv[0]) << " <filename.crvm> <args...>" << std::endl;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
env->LoadFileWithDependencies(ls.GetGC(), Tesses::Framework::Filesystem::LocalFS, Tesses::Framework::Filesystem::LocalFS->SystemToVFSPath(argv[1]));
|
||||||
|
|
||||||
|
if(env->HasVariable("WebAppMain"))
|
||||||
|
{
|
||||||
|
Args args(argv);
|
||||||
|
int port = 4206;
|
||||||
|
for(auto& item : args.options)
|
||||||
|
{
|
||||||
|
if(item.first == "port")
|
||||||
|
{
|
||||||
|
port = std::stoi(item.second);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
env->EnsureDictionary(ls.GetGC(),"Net")->SetValue("WebServerPort", (int64_t)port);
|
||||||
|
TList* args2 = TList::Create(ls);
|
||||||
|
for(auto& item : args.positional)
|
||||||
|
{
|
||||||
|
args2->Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
auto res = env->CallFunctionWithFatalError(ls, "WebAppMain", {args2});
|
||||||
|
auto svr2 = Tesses::CrossLang::ToHttpServer(ls.GetGC(),res);
|
||||||
|
if(svr2 == nullptr) return 1;
|
||||||
|
Tesses::Framework::Http::HttpServer svr(port,svr2);
|
||||||
|
svr.StartAccepting();
|
||||||
|
TF_RunEventLoop();
|
||||||
|
TDictionary* _dict;
|
||||||
|
TClassObject* _co;
|
||||||
|
if(GetObjectHeap(res,_dict))
|
||||||
|
{
|
||||||
|
_dict->CallMethod(ls,"Close",{});
|
||||||
|
}
|
||||||
|
if(GetObjectHeap(res,_co))
|
||||||
|
{
|
||||||
|
_co->CallMethod(ls,"","Close",{});
|
||||||
|
}
|
||||||
|
TF_Quit();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
TList* args = TList::Create(ls);
|
||||||
|
for(size_t arg=1;arg<argv.size();arg++)
|
||||||
|
args->Add(std::string(argv[arg]));
|
||||||
|
|
||||||
|
return env->CallFunctionWithFatalError(ls,"main",{args});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
src/programs/crossarchivecreate.cpp
Normal file
9
src/programs/crossarchivecreate.cpp
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
return (int)Tesses::CrossLang::Programs::CrossArchiveCreate(args);
|
||||||
|
}
|
||||||
9
src/programs/crossarchiveextract.cpp
Normal file
9
src/programs/crossarchiveextract.cpp
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
return (int)Tesses::CrossLang::Programs::CrossArchiveExtract(args);
|
||||||
|
}
|
||||||
25
src/programs/crosslang.cpp
Normal file
25
src/programs/crosslang.cpp
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<GC>();
|
||||||
|
gc->Start();
|
||||||
|
GCList ls(gc);
|
||||||
|
|
||||||
|
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
auto res = Programs::CrossLangShell(ls, args);
|
||||||
|
|
||||||
|
int64_t myi64;
|
||||||
|
if(GetObject(res,myi64))
|
||||||
|
return (int)myi64;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
23
src/programs/crosslangcompiler.cpp
Normal file
23
src/programs/crosslangcompiler.cpp
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
Programs::CrossLangCompiler(args);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
28
src/programs/crosslangdump.cpp
Normal file
28
src/programs/crosslangdump.cpp
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
|
||||||
|
for(int i = 1; i < argc; i++)
|
||||||
|
{
|
||||||
|
VFSPath path(argv[i]);
|
||||||
|
if(LocalFS->FileExists(path))
|
||||||
|
{
|
||||||
|
std::cout << "File: " << path.ToString() << std::endl;
|
||||||
|
auto strm = LocalFS->OpenFile(path, "rb");
|
||||||
|
Programs::CrossLangDump(strm);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::cout << "File: " << path.ToString() << " does not exist." << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
30
src/programs/crosslanginterperter.cpp
Normal file
30
src/programs/crosslanginterperter.cpp
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<GC>();
|
||||||
|
gc->Start();
|
||||||
|
GCList ls(gc);
|
||||||
|
TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
|
||||||
|
TStd::RegisterStd(gc,env);
|
||||||
|
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
auto res = Programs::CrossLangInterperter(ls, env, args);
|
||||||
|
|
||||||
|
int64_t myi64;
|
||||||
|
if(GetObject(res,myi64))
|
||||||
|
return (int)myi64;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
30
src/programs/crosslangvm.cpp
Normal file
30
src/programs/crosslangvm.cpp
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<GC>();
|
||||||
|
gc->Start();
|
||||||
|
GCList ls(gc);
|
||||||
|
TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
|
||||||
|
TStd::RegisterStd(gc,env);
|
||||||
|
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
auto res = Programs::CrossLangVM(ls, env, args);
|
||||||
|
|
||||||
|
int64_t myi64;
|
||||||
|
if(GetObject(res,myi64))
|
||||||
|
return (int)myi64;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
176
src/programs/slim.cpp
Normal file
176
src/programs/slim.cpp
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
#include "CrossLang.hpp"
|
||||||
|
#include "TessesFramework/Filesystem/VFS.hpp"
|
||||||
|
using namespace Tesses::Framework;
|
||||||
|
using namespace Tesses::CrossLang;
|
||||||
|
using namespace Tesses::Framework::Filesystem;
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
//crosslang crossint
|
||||||
|
//crosslang
|
||||||
|
//crosslang ...
|
||||||
|
|
||||||
|
std::string programName = "crosslang";
|
||||||
|
|
||||||
|
TF_InitWithConsole();
|
||||||
|
if(argc > 0)
|
||||||
|
{
|
||||||
|
TF_AllowPortable(argv[0]);
|
||||||
|
Tesses::Framework::Filesystem::VFSPath path=(std::string)argv[0];
|
||||||
|
path.RemoveExtension();
|
||||||
|
programName = path.GetFileName();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> args(argc);
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
args[i] = argv[i];
|
||||||
|
if(programName == "crossint")
|
||||||
|
{
|
||||||
|
|
||||||
|
int64_t myi64=0;
|
||||||
|
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<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);
|
||||||
|
|
||||||
|
GetObject(res,myi64);
|
||||||
|
|
||||||
|
|
||||||
|
return (int)myi64;
|
||||||
|
}
|
||||||
|
else if(programName == "crossc")
|
||||||
|
{
|
||||||
|
Programs::CrossLangCompiler(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(programName == "crossarchivecreate")
|
||||||
|
{
|
||||||
|
Programs::CrossArchiveCreate(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(programName == "crossarchiveextract")
|
||||||
|
{
|
||||||
|
Programs::CrossArchiveExtract(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(programName == "crossdump")
|
||||||
|
{
|
||||||
|
for(size_t i = 1; i < args.size(); i++)
|
||||||
|
{
|
||||||
|
VFSPath path = args[i];
|
||||||
|
if(LocalFS->FileExists(path))
|
||||||
|
{
|
||||||
|
std::cout << "File: " << path.ToString() << std::endl;
|
||||||
|
auto strm = LocalFS->OpenFile(path, "rb");
|
||||||
|
Programs::CrossLangDump(strm);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::cout << "File: " << path.ToString() << " does not exist." << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(programName == "crossvm")
|
||||||
|
{
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<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);
|
||||||
|
GetObject(res,myi64);
|
||||||
|
|
||||||
|
return (int)myi64;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(args.size() > 1)
|
||||||
|
{
|
||||||
|
|
||||||
|
if(args[1] == "crossint")
|
||||||
|
{
|
||||||
|
int64_t myi64=0;
|
||||||
|
args.erase(args.begin());
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<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);
|
||||||
|
|
||||||
|
GetObject(res,myi64);
|
||||||
|
|
||||||
|
return (int)myi64;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(args[1] == "crossc")
|
||||||
|
{
|
||||||
|
args.erase(args.begin());
|
||||||
|
Programs::CrossLangCompiler(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(args[1] == "crossarchivecreate")
|
||||||
|
{
|
||||||
|
args.erase(args.begin());
|
||||||
|
Programs::CrossArchiveCreate(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(args[1] == "crossarchiveextract")
|
||||||
|
{
|
||||||
|
args.erase(args.begin());
|
||||||
|
Programs::CrossArchiveExtract(args);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(args[1] == "crossdump")
|
||||||
|
{
|
||||||
|
for(size_t i = 2; i < args.size(); i++)
|
||||||
|
{
|
||||||
|
VFSPath path = args[i];
|
||||||
|
if(LocalFS->FileExists(path))
|
||||||
|
{
|
||||||
|
std::cout << "File: " << path.ToString() << std::endl;
|
||||||
|
auto strm = LocalFS->OpenFile(path, "rb");
|
||||||
|
Programs::CrossLangDump(strm);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::cout << "File: " << path.ToString() << " does not exist." << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if(args[1] == "crossvm")
|
||||||
|
{
|
||||||
|
int64_t myi64=0;
|
||||||
|
|
||||||
|
args.erase(args.begin());
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<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);
|
||||||
|
GetObject(res,myi64);
|
||||||
|
|
||||||
|
|
||||||
|
return (int)myi64;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
int64_t myi64=0;
|
||||||
|
std::shared_ptr<GC> gc= std::make_shared<GC>();
|
||||||
|
gc->Start();
|
||||||
|
GCList ls(gc);
|
||||||
|
auto res= Programs::CrossLangShell(ls, args);
|
||||||
|
|
||||||
|
GetObject(res,myi64);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return (int)myi64;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -226,7 +226,7 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TStd::RegisterClass(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterClass(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
env->permissions.canRegisterClass=true;
|
env->permissions.canRegisterClass=true;
|
||||||
|
|||||||
@@ -280,7 +280,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return dict;
|
return dict;
|
||||||
}
|
}
|
||||||
void TStd::RegisterConsole(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterConsole(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
env->permissions.canRegisterConsole=true;
|
env->permissions.canRegisterConsole=true;
|
||||||
if(env->permissions.customConsole != nullptr)
|
if(env->permissions.customConsole != nullptr)
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TStd::RegisterCrypto(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterCrypto(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterCrypto=true;
|
env->permissions.canRegisterCrypto=true;
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TStd::RegisterDictionary(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterDictionary(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterDictionary=true;
|
env->permissions.canRegisterDictionary=true;
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
return Tesses::Framework::Serialization::BitConverter::IsLittleEndian();
|
return Tesses::Framework::Serialization::BitConverter::IsLittleEndian();
|
||||||
}
|
}
|
||||||
void TStd::RegisterEnv(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterEnv(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterEnv=true;
|
env->permissions.canRegisterEnv=true;
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return Undefined();
|
return Undefined();
|
||||||
}
|
}
|
||||||
void TStd::RegisterHelpers(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterHelpers(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
auto helpers=env->EnsureDictionary(gc,"Helpers");
|
auto helpers=env->EnsureDictionary(gc,"Helpers");
|
||||||
helpers->DeclareFunction(gc,"CopyToProgress","Copy Stream to another (but with progress event)",{"src","dest","progressCB","$precision"},Helpers_CopyToProgress);
|
helpers->DeclareFunction(gc,"CopyToProgress","Copy Stream to another (but with progress event)",{"src","dest","progressCB","$precision"},Helpers_CopyToProgress);
|
||||||
|
|||||||
@@ -4,23 +4,6 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang
|
namespace Tesses::CrossLang
|
||||||
{
|
{
|
||||||
static TObject FS_MakeFull(GCList& ls, std::vector<TObject> args)
|
|
||||||
{
|
|
||||||
Tesses::Framework::Filesystem::VFSPath path;
|
|
||||||
if(GetArgumentAsPath(args,0,path))
|
|
||||||
{
|
|
||||||
if(path.relative)
|
|
||||||
{
|
|
||||||
Tesses::Framework::Filesystem::LocalFilesystem lfs;
|
|
||||||
auto curDir = std::filesystem::current_path();
|
|
||||||
auto myPath = lfs.SystemToVFSPath(curDir.string()) / path;
|
|
||||||
myPath = myPath.CollapseRelativeParents();
|
|
||||||
return myPath;
|
|
||||||
}
|
|
||||||
return path.CollapseRelativeParents();
|
|
||||||
}
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
static TObject FS_CreateArchive(GCList& ls, std::vector<TObject> args)
|
static TObject FS_CreateArchive(GCList& ls, std::vector<TObject> args)
|
||||||
{
|
{
|
||||||
std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs;
|
std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs;
|
||||||
@@ -160,17 +143,7 @@ namespace Tesses::CrossLang
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TObject FS_getCurrentPath(GCList& ls, std::vector<TObject> args)
|
|
||||||
{
|
|
||||||
return Tesses::Framework::Filesystem::VFSPath::GetAbsoluteCurrentDirectory();
|
|
||||||
}
|
|
||||||
static TObject FS_setCurrentPath(GCList& ls, std::vector<TObject> args)
|
|
||||||
{
|
|
||||||
Tesses::Framework::Filesystem::VFSPath path;
|
|
||||||
if(GetArgumentAsPath(args,0,path))
|
|
||||||
Tesses::Framework::Filesystem::VFSPath::SetAbsoluteCurrentDirectory(path);
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -287,12 +260,22 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
void TStd::RegisterIO(std::shared_ptr<GC> gc,TRootEnvironment* env, bool enable)
|
||||||
void TStd::RegisterIO(GC* gc,TRootEnvironment* env,bool enableLocalFilesystem)
|
{
|
||||||
|
if(enable)
|
||||||
|
{
|
||||||
|
RegisterIO(gc,env,std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(Tesses::Framework::Filesystem::LocalFS, Tesses::Framework::Filesystem::VFSPath::GetAbsoluteCurrentDirectory()));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RegisterIO(gc,env,nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void TStd::RegisterIO(std::shared_ptr<GC> gc,TRootEnvironment* env,std::shared_ptr<Tesses::Framework::Filesystem::RelativeFilesystem> fs)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterIO=true;
|
env->permissions.canRegisterIO=true;
|
||||||
env->permissions.canRegisterLocalFS = enableLocalFilesystem;
|
env->permissions.localfs = fs;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
|
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
@@ -323,14 +306,42 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
));
|
));
|
||||||
|
|
||||||
if(enableLocalFilesystem)
|
if(fs)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
dict->SetValue("Local", Tesses::Framework::Filesystem::LocalFS);
|
dict->SetValue("Local", fs);
|
||||||
dict->DeclareFunction(gc, "MakeFull", "Make absolute path from relative path",{"path"},FS_MakeFull);
|
dict->DeclareFunction(gc, "MakeFull", "Make absolute path from relative path",{"path"},[fs](GCList& ls, std::vector<TObject> args)->TObject{
|
||||||
dict->DeclareFunction(gc,"getCurrentPath","Get current path",{},FS_getCurrentPath);
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
dict->DeclareFunction(gc,"setCurrentPath","Set the current path",{"path"},FS_setCurrentPath);
|
if(GetArgumentAsPath(args,0,path))
|
||||||
|
{
|
||||||
|
if(path.relative)
|
||||||
|
{
|
||||||
|
auto myPath = fs->GetWorking() / path;
|
||||||
|
myPath = myPath.CollapseRelativeParents();
|
||||||
|
return myPath;
|
||||||
|
}
|
||||||
|
return path.CollapseRelativeParents();
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
});
|
||||||
|
dict->DeclareFunction(gc,"getCurrentPath","Get current path",{},[fs](GCList& ls, std::vector<TObject> args)->TObject{
|
||||||
|
return fs->GetWorking();
|
||||||
|
});
|
||||||
|
dict->DeclareFunction(gc,"setCurrentPath","Set the current path",{"path"}, [fs](GCList& ls, std::vector<TObject> args)->TObject {
|
||||||
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
|
if(GetArgumentAsPath(args,0,path))
|
||||||
|
{
|
||||||
|
if(path.relative)
|
||||||
|
{
|
||||||
|
fs->SetWorking(path.MakeAbsolute(fs->GetWorking()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fs->SetWorking(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return path;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
dict->DeclareFunction(gc, "ReadAllText","Read all text from file", {"fs","filename"},FS_ReadAllText);
|
dict->DeclareFunction(gc, "ReadAllText","Read all text from file", {"fs","filename"},FS_ReadAllText);
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
return JsonDeserialize(ls,Json::DocDecode(str));
|
return JsonDeserialize(ls,Json::DocDecode(str));
|
||||||
}
|
}
|
||||||
void TStd::RegisterJson(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterJson(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterJSON=true;
|
env->permissions.canRegisterJSON=true;
|
||||||
|
|||||||
@@ -379,6 +379,56 @@ namespace Tesses::CrossLang
|
|||||||
ctx->WithLastModified(*da);
|
ctx->WithLastModified(*da);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
else if(key == "WithDebug")
|
||||||
|
{
|
||||||
|
bool debug=true;
|
||||||
|
GetArgument(args,0,debug);
|
||||||
|
|
||||||
|
ctx->WithDebug(debug);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(key == "getDebug")
|
||||||
|
{
|
||||||
|
return ctx->Debug();
|
||||||
|
}
|
||||||
|
else if(key == "SendServerSentEvents")
|
||||||
|
{
|
||||||
|
if(!args.empty() && std::holds_alternative<std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>>(args[0]))
|
||||||
|
{
|
||||||
|
ctx->SendServerSentEvents(std::get<std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>>(args[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(key == "WithHeaderIntercepter")
|
||||||
|
{
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetArgumentHeap(args, 0, callable))
|
||||||
|
{
|
||||||
|
auto marked = CreateMarkedTObject(ls.GetGC(),callable);
|
||||||
|
ctx->WithHeaderIntercepter([marked](ServerContext& ctx)->bool {
|
||||||
|
auto obj = marked->GetObject();
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetObjectHeap(obj, callable))
|
||||||
|
{
|
||||||
|
GCList ls(marked->GetGC());
|
||||||
|
|
||||||
|
auto ptr=TNativeObject::Create<TServerContext>(ls, &ctx);
|
||||||
|
|
||||||
|
auto res = callable->Call(ls, {ptr});
|
||||||
|
ptr->Finish();
|
||||||
|
bool r0;
|
||||||
|
if(GetObject(res, r0)) return r0;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
else if(key == "WithContentDisposition")
|
else if(key == "WithContentDisposition")
|
||||||
{
|
{
|
||||||
std::string filename;
|
std::string filename;
|
||||||
@@ -589,7 +639,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
TObjectHttpServer::TObjectHttpServer(GC* gc,TObject obj)
|
TObjectHttpServer::TObjectHttpServer(std::shared_ptr<GC> gc,TObject obj)
|
||||||
{
|
{
|
||||||
this->ls=new GCList(gc);
|
this->ls=new GCList(gc);
|
||||||
this->ls->Add(obj);
|
this->ls->Add(obj);
|
||||||
@@ -598,10 +648,10 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
class TDictionaryHttpRequestBody : public HttpRequestBody
|
class TDictionaryHttpRequestBody : public HttpRequestBody
|
||||||
{
|
{
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
TDictionary* req;
|
TDictionary* req;
|
||||||
public:
|
public:
|
||||||
TDictionaryHttpRequestBody(GC* gc,TDictionary* req)
|
TDictionaryHttpRequestBody(std::shared_ptr<GC> gc,TDictionary* req)
|
||||||
{
|
{
|
||||||
this->gc = gc;
|
this->gc = gc;
|
||||||
this->req = req;
|
this->req = req;
|
||||||
@@ -790,7 +840,7 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(GetArgument(args,1,pathStr) && env->permissions.canRegisterLocalFS)
|
if(GetArgument(args,1,pathStr) && env->permissions.localfs)
|
||||||
{
|
{
|
||||||
std::shared_ptr<IHttpServer> httpSvr = ToHttpServer(ls.GetGC(),args[0]);
|
std::shared_ptr<IHttpServer> httpSvr = ToHttpServer(ls.GetGC(),args[0]);
|
||||||
|
|
||||||
@@ -979,7 +1029,7 @@ namespace Tesses::CrossLang
|
|||||||
GetObject(_obj,req.followRedirects);
|
GetObject(_obj,req.followRedirects);
|
||||||
_obj = options->GetValue("TrustedRootCertBundle");
|
_obj = options->GetValue("TrustedRootCertBundle");
|
||||||
GetObject(_obj,req.trusted_root_cert_bundle);
|
GetObject(_obj,req.trusted_root_cert_bundle);
|
||||||
if(env->permissions.canRegisterLocalFS)
|
if(env->permissions.localfs)
|
||||||
{
|
{
|
||||||
_obj = options->GetValue("UnixSocket");
|
_obj = options->GetValue("UnixSocket");
|
||||||
GetObject(_obj,req.unixSocket);
|
GetObject(_obj,req.unixSocket);
|
||||||
@@ -1403,7 +1453,7 @@ namespace Tesses::CrossLang
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<IHttpServer> ToHttpServer(GC* gc, TObject obj)
|
std::shared_ptr<IHttpServer> ToHttpServer(std::shared_ptr<GC> gc, TObject obj)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<std::shared_ptr<IHttpServer>>(obj)) return std::get<std::shared_ptr<IHttpServer>>(obj);
|
if(std::holds_alternative<std::shared_ptr<IHttpServer>>(obj)) return std::get<std::shared_ptr<IHttpServer>>(obj);
|
||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
@@ -1523,7 +1573,12 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TStd::RegisterNet(GC* gc, TRootEnvironment* env)
|
static TObject New_ServerSentEvents(GCList& ls, std::vector<TObject> args)
|
||||||
|
{
|
||||||
|
return std::make_shared<Tesses::Framework::Http::ServerSentEvents>();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TStd::RegisterNet(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterNet=true;
|
env->permissions.canRegisterNet=true;
|
||||||
@@ -1545,6 +1600,7 @@ namespace Tesses::CrossLang
|
|||||||
_new->DeclareFunction(gc, "MountableServer","Create a server you can mount to, must mount parents before child",{"root"}, New_MountableServer);
|
_new->DeclareFunction(gc, "MountableServer","Create a server you can mount to, must mount parents before child",{"root"}, New_MountableServer);
|
||||||
_new->DeclareFunction(gc, "NetworkStream","Create a network stream",{"ipv6","datagram"},New_NetworkStream);
|
_new->DeclareFunction(gc, "NetworkStream","Create a network stream",{"ipv6","datagram"},New_NetworkStream);
|
||||||
|
|
||||||
|
_new->DeclareFunction(gc, "ServerSentEvents", "Create server sent events object",{""},New_ServerSentEvents);
|
||||||
|
|
||||||
|
|
||||||
TDictionary* http = TDictionary::Create(ls);
|
TDictionary* http = TDictionary::Create(ls);
|
||||||
@@ -1617,7 +1673,7 @@ namespace Tesses::CrossLang
|
|||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
Tesses::Framework::Http::ServerRequestHandler TCallable::ToRouteServerRequestHandler(GC* gc)
|
Tesses::Framework::Http::ServerRequestHandler TCallable::ToRouteServerRequestHandler(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
auto value = CreateMarkedTObject(gc,this);
|
auto value = CreateMarkedTObject(gc,this);
|
||||||
return [value,this](ServerContext& ctx)->bool {
|
return [value,this](ServerContext& ctx)->bool {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
void TStd::RegisterOGC(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterOGC(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
#if defined(GEKKO)
|
#if defined(GEKKO)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TStd::RegisterPath(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterPath(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterPath=true;
|
env->permissions.canRegisterPath=true;
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ namespace Tesses::CrossLang
|
|||||||
return Undefined();
|
return Undefined();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
static TObject Process_Start(GCList& ls, std::vector<TObject> args)
|
static TObject Process_Start(GCList& ls, std::vector<TObject> args, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
//Process.Start({
|
//Process.Start({
|
||||||
@@ -220,6 +220,10 @@ namespace Tesses::CrossLang
|
|||||||
GetObject(name,process->process.name);
|
GetObject(name,process->process.name);
|
||||||
|
|
||||||
Tesses::Framework::Filesystem::VFSPath wdPath;
|
Tesses::Framework::Filesystem::VFSPath wdPath;
|
||||||
|
if(env->permissions.localfs)
|
||||||
|
{
|
||||||
|
process->process.workingDirectory = env->permissions.localfs->GetWorking().ToString();
|
||||||
|
}
|
||||||
|
|
||||||
if(GetObject(workingDirectory,wdPath))
|
if(GetObject(workingDirectory,wdPath))
|
||||||
{
|
{
|
||||||
@@ -274,23 +278,36 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
static TObject New_Process(GCList& ls, std::vector<TObject> args)
|
|
||||||
{
|
|
||||||
return TNativeObject::Create<ProcessObject>(ls,ls);
|
|
||||||
}
|
|
||||||
|
|
||||||
void TStd::RegisterProcess(GC* gc,TRootEnvironment* env)
|
|
||||||
|
void TStd::RegisterProcess(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterProcess=true;
|
env->permissions.canRegisterProcess=true;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
TDictionary* dict = TDictionary::Create(ls);
|
TDictionary* dict = TDictionary::Create(ls);
|
||||||
dict->DeclareFunction(gc,"Start","Start a process",{"process_object"},Process_Start);
|
|
||||||
|
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
|
auto processStart = TExternalMethod::Create(ls,"Start a process",{"process_object"},[env](GCList& ls, std::vector<TObject> args)->TObject{
|
||||||
|
return Process_Start(ls,args,env);
|
||||||
|
});
|
||||||
|
processStart->watch.push_back(env);
|
||||||
|
dict->SetValue("Start",processStart);
|
||||||
|
|
||||||
|
|
||||||
env->SetVariable("Process",dict);
|
env->SetVariable("Process",dict);
|
||||||
auto process = env->EnsureDictionary(gc,"New");
|
auto process = env->EnsureDictionary(gc,"New");
|
||||||
process->DeclareFunction(gc, "Process", "Create process",{},New_Process);
|
auto newProcess = TExternalMethod::Create(ls, "Create process",{},[env](GCList& ls, std::vector<TObject> args)->TObject {
|
||||||
|
auto obj= TNativeObject::Create<ProcessObject>(ls,ls);
|
||||||
|
if(env->permissions.localfs)
|
||||||
|
{
|
||||||
|
obj->process.workingDirectory = env->permissions.localfs->GetWorking().ToString();
|
||||||
|
}
|
||||||
|
return obj;
|
||||||
|
});
|
||||||
|
newProcess->watch.push_back(env);
|
||||||
|
process->SetValue("Process",newProcess);
|
||||||
|
//process->DeclareFunction(gc, "Process", "Create process",{},New_Process);
|
||||||
process->DeclareFunction(gc, "CGIServer", "Create a CGI Server",{"path"},[](GCList& ls, std::vector<TObject> args)->TObject{
|
process->DeclareFunction(gc, "CGIServer", "Create a CGI Server",{"path"},[](GCList& ls, std::vector<TObject> args)->TObject{
|
||||||
Tesses::Framework::Filesystem::VFSPath path;
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
if(GetArgumentAsPath(args,0,path))
|
if(GetArgumentAsPath(args,0,path))
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
void TStd::RegisterSqlite(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterSqlite(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
|
|
||||||
env->permissions.canRegisterSqlite=true;
|
env->permissions.canRegisterSqlite=true;
|
||||||
|
|||||||
@@ -376,7 +376,7 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void RegisterFFI(GC* gc, TDictionary* dict)
|
void RegisterFFI(std::shared_ptr<GC> gc, TDictionary* dict)
|
||||||
{
|
{
|
||||||
dict->SetValue("SizeOfChar",(int64_t)sizeof(char));
|
dict->SetValue("SizeOfChar",(int64_t)sizeof(char));
|
||||||
dict->SetValue("SizeOfShort",(int64_t)sizeof(short));
|
dict->SetValue("SizeOfShort",(int64_t)sizeof(short));
|
||||||
@@ -485,14 +485,14 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LoadPlugin(GC* gc, TRootEnvironment* env, Tesses::Framework::Filesystem::VFSPath sharedObjectPath)
|
void LoadPlugin(std::shared_ptr<GC> gc, TRootEnvironment* env, Tesses::Framework::Filesystem::VFSPath sharedObjectPath)
|
||||||
{
|
{
|
||||||
|
|
||||||
#if defined(CROSSLANG_ENABLE_SHARED)
|
#if defined(CROSSLANG_ENABLE_SHARED)
|
||||||
auto ptr = std::make_shared<DL>(GetPluginPath(sharedObjectPath));
|
auto ptr = std::make_shared<DL>(GetPluginPath(sharedObjectPath));
|
||||||
auto cb = ptr->Resolve<PluginFunction>("CrossLangPluginInit");
|
auto cb = ptr->Resolve<PluginFunction>("CrossLangPluginInit");
|
||||||
if(cb == nullptr) return;
|
if(cb == nullptr) return;
|
||||||
gc->RegisterEverythingCallback([ptr,cb](GC* gc, TRootEnvironment* env)-> void{
|
gc->RegisterEverythingCallback([ptr,cb](std::shared_ptr<GC> gc, TRootEnvironment* env)-> void{
|
||||||
cb(gc,env);
|
cb(gc,env);
|
||||||
});
|
});
|
||||||
cb(gc,env);
|
cb(gc,env);
|
||||||
@@ -641,10 +641,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
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)
|
static TObject New_Filesystem(GCList& ls, std::vector<TObject> args)
|
||||||
{
|
{
|
||||||
@@ -750,6 +747,9 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
std::string GetObjectTypeString(TObject _obj)
|
std::string GetObjectTypeString(TObject _obj)
|
||||||
{
|
{
|
||||||
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::TF_Timer_Handle>>(_obj)) return "Timer";
|
||||||
|
|
||||||
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>>(_obj)) return "ServerSentEvents";
|
||||||
if(std::holds_alternative<std::regex>(_obj)) return "Regex";
|
if(std::holds_alternative<std::regex>(_obj)) return "Regex";
|
||||||
if(std::holds_alternative<Undefined>(_obj)) return "Undefined";
|
if(std::holds_alternative<Undefined>(_obj)) return "Undefined";
|
||||||
if(std::holds_alternative<std::nullptr_t>(_obj)) return "Null";
|
if(std::holds_alternative<std::nullptr_t>(_obj)) return "Null";
|
||||||
@@ -864,11 +864,12 @@ namespace Tesses::CrossLang
|
|||||||
auto vfs = std::get<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(_obj);
|
auto vfs = std::get<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(_obj);
|
||||||
if(vfs != nullptr)
|
if(vfs != nullptr)
|
||||||
{
|
{
|
||||||
|
auto rfs = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs);
|
||||||
auto localVFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::LocalFilesystem>(vfs);
|
auto localVFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::LocalFilesystem>(vfs);
|
||||||
auto mountableVFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::MountableFilesystem>(vfs);
|
auto mountableVFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::MountableFilesystem>(vfs);
|
||||||
auto subFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::SubdirFilesystem>(vfs);
|
auto subFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::SubdirFilesystem>(vfs);
|
||||||
auto tempFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::TempFS>(vfs);
|
auto tempFS = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::TempFS>(vfs);
|
||||||
|
if(rfs) return "RelativeFilesystem";
|
||||||
if(localVFS != nullptr) return "LocalFilesystem";
|
if(localVFS != nullptr) return "LocalFilesystem";
|
||||||
if(subFS != nullptr) return "SubdirFilesystem";
|
if(subFS != nullptr) return "SubdirFilesystem";
|
||||||
if(mountableVFS != nullptr) return "MountableFilesystem";
|
if(mountableVFS != nullptr) return "MountableFilesystem";
|
||||||
@@ -900,6 +901,7 @@ namespace Tesses::CrossLang
|
|||||||
auto natObj = dynamic_cast<TNativeObject*>(obj);
|
auto natObj = dynamic_cast<TNativeObject*>(obj);
|
||||||
auto cobj = dynamic_cast<TClassObject*>(obj);
|
auto cobj = dynamic_cast<TClassObject*>(obj);
|
||||||
auto aarray = dynamic_cast<TAssociativeArray*>(obj);
|
auto aarray = dynamic_cast<TAssociativeArray*>(obj);
|
||||||
|
auto file = dynamic_cast<TFile*>(obj);
|
||||||
|
|
||||||
if(rootEnv != nullptr) return "RootEnvironment";
|
if(rootEnv != nullptr) return "RootEnvironment";
|
||||||
if(subEnv != nullptr) return "SubEnvironment";
|
if(subEnv != nullptr) return "SubEnvironment";
|
||||||
@@ -920,6 +922,7 @@ namespace Tesses::CrossLang
|
|||||||
if(byteArray != nullptr) return "ByteArray";
|
if(byteArray != nullptr) return "ByteArray";
|
||||||
if(native != nullptr) return "Native";
|
if(native != nullptr) return "Native";
|
||||||
if(any != nullptr) return "Any";
|
if(any != nullptr) return "Any";
|
||||||
|
if(file != nullptr) return "File";
|
||||||
|
|
||||||
return "HeapObject";
|
return "HeapObject";
|
||||||
}
|
}
|
||||||
@@ -1016,7 +1019,6 @@ namespace Tesses::CrossLang
|
|||||||
this->canRegisterEnv=false;
|
this->canRegisterEnv=false;
|
||||||
this->canRegisterIO=false;
|
this->canRegisterIO=false;
|
||||||
this->canRegisterJSON=false;
|
this->canRegisterJSON=false;
|
||||||
this->canRegisterLocalFS=false;
|
|
||||||
this->canRegisterNet=false;
|
this->canRegisterNet=false;
|
||||||
this->canRegisterOGC=false;
|
this->canRegisterOGC=false;
|
||||||
this->canRegisterPath=false;
|
this->canRegisterPath=false;
|
||||||
@@ -1264,8 +1266,45 @@ namespace Tesses::CrossLang
|
|||||||
return std::make_shared<Tesses::Framework::Streams::ByteWriter>(strm);
|
return std::make_shared<Tesses::Framework::Streams::ByteWriter>(strm);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
static void empty(){}
|
||||||
|
static TObject New_Timer(GCList& ls, std::vector<TObject> args)
|
||||||
|
{
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetArgumentHeap(args, 0, callable))
|
||||||
|
{
|
||||||
|
int64_t interval = 1000;
|
||||||
|
bool enabled=true;
|
||||||
|
GetArgument(args,1, interval);
|
||||||
|
GetArgument(args,2,enabled);
|
||||||
|
|
||||||
void TStd::RegisterRoot(GC* gc, TRootEnvironment* env)
|
auto obj = CreateMarkedTObject(ls.GetGC(), callable);
|
||||||
|
|
||||||
|
return Tesses::Framework::TF_Timer([obj]()->void {
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetObjectHeap(obj->GetObject(), callable))
|
||||||
|
{
|
||||||
|
GCList ls(obj->GetGC());
|
||||||
|
callable->Call(ls,{});
|
||||||
|
}
|
||||||
|
}, interval , enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return Tesses::Framework::TF_Timer(empty, 1000L, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static TObject New_RelativeFilesystem(GCList& ls, std::vector<TObject> args)
|
||||||
|
{
|
||||||
|
std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs;
|
||||||
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
|
if(GetArgument(args,0,vfs) && GetArgumentAsPath(args,1,path) && !path.relative)
|
||||||
|
{
|
||||||
|
return std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs,path);
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TStd::RegisterRoot(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
|
|
||||||
@@ -1327,11 +1366,11 @@ namespace Tesses::CrossLang
|
|||||||
newTypes->DeclareFunction(gc, "SubdirFilesystem","Create a subdir filesystem",{"fs","subdir"}, New_SubdirFilesystem);
|
newTypes->DeclareFunction(gc, "SubdirFilesystem","Create a subdir filesystem",{"fs","subdir"}, New_SubdirFilesystem);
|
||||||
newTypes->DeclareFunction(gc, "MemoryStream","Create a memory stream",{"writable"}, New_MemoryStream);
|
newTypes->DeclareFunction(gc, "MemoryStream","Create a memory stream",{"writable"}, New_MemoryStream);
|
||||||
newTypes->DeclareFunction(gc, "Filesystem","Create filesystem", {"fs"},New_Filesystem);
|
newTypes->DeclareFunction(gc, "Filesystem","Create filesystem", {"fs"},New_Filesystem);
|
||||||
|
newTypes->DeclareFunction(gc, "RelativeFilesystem", "Create relativefs",{"parent", "absoluteDir"}, New_RelativeFilesystem);
|
||||||
newTypes->DeclareFunction(gc, "TempFS","Create a temp directory",{"",""}, New_TempFS);
|
newTypes->DeclareFunction(gc, "TempFS","Create a temp directory",{"",""}, New_TempFS);
|
||||||
|
newTypes->DeclareFunction(gc, "Timer", "Create a timer",{"$cb","$interval","$enabled"}, New_Timer);
|
||||||
newTypes->DeclareFunction(gc, "Stream","Create stream", {"strm"},New_Stream);
|
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{
|
newTypes->DeclareFunction(gc,"Version","Create a version object",{"$major","$minor","$patch","$build","$stage"},[](GCList& ls, std::vector<TObject> args)->TObject{
|
||||||
int64_t major=1;
|
int64_t major=1;
|
||||||
@@ -1482,14 +1521,19 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
void TStd::RegisterStd(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterStd(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
|
{
|
||||||
|
RegisterStd(gc, env, std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(Tesses::Framework::Filesystem::LocalFS, Tesses::Framework::Filesystem::VFSPath::GetAbsoluteCurrentDirectory()));
|
||||||
|
}
|
||||||
|
void TStd::RegisterStd(std::shared_ptr<GC> gc, TRootEnvironment* env,std::shared_ptr<Tesses::Framework::Filesystem::RelativeFilesystem> localfs)
|
||||||
{
|
{
|
||||||
env->permissions.canRegisterEverything=true;
|
env->permissions.canRegisterEverything=true;
|
||||||
RegisterEnv(gc, env);
|
RegisterEnv(gc, env);
|
||||||
RegisterRoot(gc,env);
|
RegisterRoot(gc,env);
|
||||||
RegisterPath(gc,env);
|
RegisterPath(gc,env);
|
||||||
|
|
||||||
RegisterConsole(gc, env);
|
RegisterConsole(gc, env);
|
||||||
RegisterIO(gc, env);
|
RegisterIO(gc, env, localfs);
|
||||||
RegisterNet(gc, env);
|
RegisterNet(gc, env);
|
||||||
RegisterSqlite(gc, env);
|
RegisterSqlite(gc, env);
|
||||||
RegisterVM(gc, env);
|
RegisterVM(gc, env);
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace Tesses::CrossLang {
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TStd::RegisterUuid(GC* gc, TRootEnvironment* env)
|
void TStd::RegisterUuid(std::shared_ptr<GC> gc, TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
TDictionary* guid = env->EnsureDictionary(gc, "Uuid");
|
TDictionary* guid = env->EnsureDictionary(gc, "Uuid");
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TStd::RegisterVM(GC* gc,TRootEnvironment* env)
|
void TStd::RegisterVM(std::shared_ptr<GC> gc,TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
env->permissions.canRegisterVM=true;
|
env->permissions.canRegisterVM=true;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -354,6 +354,11 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
});
|
});
|
||||||
|
#if defined(CROSSLANG_ENABLE_SUPERSLIM)
|
||||||
|
dict->SetValue("SuperSlim", true);
|
||||||
|
#else
|
||||||
|
dict->SetValue("SuperSlim", false);
|
||||||
|
#endif
|
||||||
dict->DeclareFunction(gc, "Eval", "Eval source code",{"source"}, VM_Eval);
|
dict->DeclareFunction(gc, "Eval", "Eval source code",{"source"}, VM_Eval);
|
||||||
dict->DeclareFunction(gc, "Compile", "Compile Source",{"dict"},VM_Compile);
|
dict->DeclareFunction(gc, "Compile", "Compile Source",{"dict"},VM_Compile);
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TAny* anyObj = new TAny();
|
TAny* anyObj = new TAny();
|
||||||
|
|
||||||
GC* gc = ls.GetGC();
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
ls.Add(anyObj);
|
ls.Add(anyObj);
|
||||||
gc->Watch(anyObj);
|
gc->Watch(anyObj);
|
||||||
return anyObj;
|
return anyObj;
|
||||||
@@ -14,7 +14,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TAny* anyObj = new TAny();
|
TAny* anyObj = new TAny();
|
||||||
|
|
||||||
GC* gc = ls->GetGC();
|
std::shared_ptr<GC> gc = ls->GetGC();
|
||||||
ls->Add(anyObj);
|
ls->Add(anyObj);
|
||||||
gc->Watch(anyObj);
|
gc->Watch(anyObj);
|
||||||
return anyObj;
|
return anyObj;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace Tesses::CrossLang
|
|||||||
TAssociativeArray* TAssociativeArray::Create(GCList& ls)
|
TAssociativeArray* TAssociativeArray::Create(GCList& ls)
|
||||||
{
|
{
|
||||||
TAssociativeArray* list=new TAssociativeArray();
|
TAssociativeArray* list=new TAssociativeArray();
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(list);
|
ls.Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
@@ -14,12 +14,12 @@ namespace Tesses::CrossLang
|
|||||||
TAssociativeArray* TAssociativeArray::Create(GCList* ls)
|
TAssociativeArray* TAssociativeArray::Create(GCList* ls)
|
||||||
{
|
{
|
||||||
TAssociativeArray* list=new TAssociativeArray();
|
TAssociativeArray* list=new TAssociativeArray();
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(list);
|
ls->Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
void TAssociativeArray::Set(GC* gc, TObject key, TObject value)
|
void TAssociativeArray::Set(std::shared_ptr<GC> gc, TObject key, TObject value)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<Undefined>(key)) return;
|
if(std::holds_alternative<Undefined>(key)) return;
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
@@ -46,7 +46,7 @@ namespace Tesses::CrossLang
|
|||||||
this->items.push_back(std::pair<TObject,TObject>(key,value));
|
this->items.push_back(std::pair<TObject,TObject>(key,value));
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
TObject TAssociativeArray::Get(GC* gc, TObject key)
|
TObject TAssociativeArray::Get(std::shared_ptr<GC> gc, TObject key)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<Undefined>(key)) return Undefined();
|
if(std::holds_alternative<Undefined>(key)) return Undefined();
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "CrossLang.hpp"
|
#include "CrossLang.hpp"
|
||||||
//THANKS TO https://www.youtube.com/watch?v=R-z2Hv-7nxk
|
//THANKS TO https://www.youtube.com/watch?v=R-z2Hv-7nxk
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
TTask::TTask(GC* gc)
|
TTask::TTask(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
this->gc = gc;
|
this->gc = gc;
|
||||||
}
|
}
|
||||||
@@ -172,10 +172,10 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class TTaskCseObj {
|
class TTaskCseObj {
|
||||||
GC* gc;
|
std::shared_ptr<GC> gc;
|
||||||
TTask* task;
|
TTask* task;
|
||||||
public:
|
public:
|
||||||
TTaskCseObj(GC* gc, TTask* task)
|
TTaskCseObj(std::shared_ptr<GC> gc, TTask* task)
|
||||||
{
|
{
|
||||||
this->gc = gc;
|
this->gc = gc;
|
||||||
this->task = task;
|
this->task = task;
|
||||||
@@ -230,7 +230,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
//try {
|
//try {
|
||||||
GCList ls2(ls.GetGC());
|
GCList ls2(ls.GetGC());
|
||||||
GC* gc = ls.GetGC();
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
|
|
||||||
std::shared_ptr<TTaskCseObj> obj = std::make_shared<TTaskCseObj>(gc,task);
|
std::shared_ptr<TTaskCseObj> obj = std::make_shared<TTaskCseObj>(gc,task);
|
||||||
|
|
||||||
|
|||||||
@@ -43,6 +43,9 @@ namespace Tesses::CrossLang
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
//DO NOTHING
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return &item;
|
return &item;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
TClassEnvironment* env2=new TClassEnvironment(env,obj);
|
TClassEnvironment* env2=new TClassEnvironment(env,obj);
|
||||||
|
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(env2);
|
gc->Add(env2);
|
||||||
_gc->Watch(env2);
|
_gc->Watch(env2);
|
||||||
return env2;
|
return env2;
|
||||||
@@ -23,7 +23,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
TClassEnvironment* env2=new TClassEnvironment(env,obj);
|
TClassEnvironment* env2=new TClassEnvironment(env,obj);
|
||||||
|
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(env2);
|
gc.Add(env2);
|
||||||
_gc->Watch(env2);
|
_gc->Watch(env2);
|
||||||
return env2;
|
return env2;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TArgWrapper* argWrapper = new TArgWrapper();
|
TArgWrapper* argWrapper = new TArgWrapper();
|
||||||
argWrapper->callable = callable;
|
argWrapper->callable = callable;
|
||||||
GC* gc = ls.GetGC();
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
ls.Add(argWrapper);
|
ls.Add(argWrapper);
|
||||||
gc->Watch(argWrapper);
|
gc->Watch(argWrapper);
|
||||||
return argWrapper;
|
return argWrapper;
|
||||||
@@ -13,7 +13,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TArgWrapper* argWrapper = new TArgWrapper();
|
TArgWrapper* argWrapper = new TArgWrapper();
|
||||||
argWrapper->callable = callable;
|
argWrapper->callable = callable;
|
||||||
GC* gc = ls->GetGC();
|
std::shared_ptr<GC> gc = ls->GetGC();
|
||||||
ls->Add(argWrapper);
|
ls->Add(argWrapper);
|
||||||
gc->Watch(argWrapper);
|
gc->Watch(argWrapper);
|
||||||
return argWrapper;
|
return argWrapper;
|
||||||
@@ -54,7 +54,7 @@ namespace Tesses::CrossLang {
|
|||||||
TClosure* closure = new TClosure();
|
TClosure* closure = new TClosure();
|
||||||
closure->className="";
|
closure->className="";
|
||||||
closure->ownScope=ownScope;
|
closure->ownScope=ownScope;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(closure);
|
ls.Add(closure);
|
||||||
_gc->Watch(closure);
|
_gc->Watch(closure);
|
||||||
closure->chunkId = chunkId;
|
closure->chunkId = chunkId;
|
||||||
@@ -71,7 +71,7 @@ namespace Tesses::CrossLang {
|
|||||||
TClosure* closure = new TClosure();
|
TClosure* closure = new TClosure();
|
||||||
closure->className="";
|
closure->className="";
|
||||||
closure->ownScope=ownScope;
|
closure->ownScope=ownScope;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(closure);
|
ls->Add(closure);
|
||||||
_gc->Watch(closure);
|
_gc->Watch(closure);
|
||||||
closure->chunkId = chunkId;
|
closure->chunkId = chunkId;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
TDynamicDictionary* dict=new TDynamicDictionary();
|
TDynamicDictionary* dict=new TDynamicDictionary();
|
||||||
dict->cb = callable;
|
dict->cb = callable;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(dict);
|
ls.Add(dict);
|
||||||
_gc->Watch(dict);
|
_gc->Watch(dict);
|
||||||
return dict;
|
return dict;
|
||||||
@@ -15,7 +15,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TDynamicDictionary* dict=new TDynamicDictionary();
|
TDynamicDictionary* dict=new TDynamicDictionary();
|
||||||
dict->cb = callable;
|
dict->cb = callable;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(dict);
|
ls->Add(dict);
|
||||||
_gc->Watch(dict);
|
_gc->Watch(dict);
|
||||||
return dict;
|
return dict;
|
||||||
@@ -153,41 +153,27 @@ namespace Tesses::CrossLang {
|
|||||||
return Undefined();
|
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)
|
void TDictionary::DeclareFunction(std::shared_ptr<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();
|
gc->BarrierBegin();
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
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)
|
|
||||||
{
|
void TDictionary::DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy)
|
||||||
gc.BarrierBegin();
|
|
||||||
GCList ls(gc);
|
|
||||||
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
|
||||||
gc.BarrierEnd();
|
|
||||||
}
|
|
||||||
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,std::function<void()> destroy)
|
|
||||||
{
|
{
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
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,std::function<void()> destroy)
|
|
||||||
{
|
|
||||||
gc.BarrierBegin();
|
|
||||||
GCList ls(gc);
|
|
||||||
this->SetValue(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
|
||||||
gc.BarrierEnd();
|
|
||||||
}
|
|
||||||
TObject TDictionary::GetValue(std::string key)
|
TObject TDictionary::GetValue(std::string key)
|
||||||
{
|
{
|
||||||
if(this->items.empty()) return Undefined();
|
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();
|
return Undefined();
|
||||||
}
|
}
|
||||||
void TDictionary::SetValue(std::string key, TObject value)
|
void TDictionary::SetValue(std::string key, TObject value)
|
||||||
@@ -218,7 +204,7 @@ namespace Tesses::CrossLang {
|
|||||||
TDictionary* TDictionary::Create(GCList* gc)
|
TDictionary* TDictionary::Create(GCList* gc)
|
||||||
{
|
{
|
||||||
TDictionary* dict=new TDictionary();
|
TDictionary* dict=new TDictionary();
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(dict);
|
gc->Add(dict);
|
||||||
_gc->Watch(dict);
|
_gc->Watch(dict);
|
||||||
return dict;
|
return dict;
|
||||||
@@ -226,7 +212,7 @@ namespace Tesses::CrossLang {
|
|||||||
TDictionary* TDictionary::Create(GCList& gc)
|
TDictionary* TDictionary::Create(GCList& gc)
|
||||||
{
|
{
|
||||||
TDictionary* dict=new TDictionary();
|
TDictionary* dict=new TDictionary();
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(dict);
|
gc.Add(dict);
|
||||||
_gc->Watch(dict);
|
_gc->Watch(dict);
|
||||||
return dict;
|
return dict;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
|
|
||||||
EmbedStream::EmbedStream(GC* gc, TFile* file, uint32_t resource)
|
EmbedStream::EmbedStream(std::shared_ptr<GC> gc, TFile* file, uint32_t resource)
|
||||||
{
|
{
|
||||||
this->offset = 0;
|
this->offset = 0;
|
||||||
this->resource = resource;
|
this->resource = resource;
|
||||||
@@ -124,17 +124,58 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
bool EmbedDirectory::RegularFileExists(Tesses::Framework::Filesystem::VFSPath path)
|
|
||||||
{
|
bool EmbedDirectory::Stat(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatData& data)
|
||||||
auto ent = getEntry(path);
|
|
||||||
TCallable* call;
|
|
||||||
return GetObjectHeap(ent,call);
|
|
||||||
}
|
|
||||||
bool EmbedDirectory::DirectoryExists(Tesses::Framework::Filesystem::VFSPath path)
|
|
||||||
{
|
{
|
||||||
auto ent = getEntry(path);
|
auto ent = getEntry(path);
|
||||||
|
|
||||||
|
|
||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
return GetObjectHeap(ent,dict);
|
if(GetObjectHeap(ent,dict))
|
||||||
|
{
|
||||||
|
data.Size = 0;
|
||||||
|
data.Mode = Tesses::Framework::Filesystem::MODE_DIRECTORY | 0755;
|
||||||
|
data.BlockCount = 0;
|
||||||
|
data.BlockSize = 0;
|
||||||
|
data.Device = 0;
|
||||||
|
data.DeviceId = 0;
|
||||||
|
data.GroupId = 0;
|
||||||
|
data.HardLinks = 1;
|
||||||
|
data.Inode = 0;
|
||||||
|
data.LastAccess = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.LastModified = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.LastStatus = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.UserId = 0;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
TCallable* cal;
|
||||||
|
if(GetObjectHeap(ent, cal))
|
||||||
|
{
|
||||||
|
GCList ls(this->dir->GetGC());
|
||||||
|
auto fileO= cal->Call(ls, {});
|
||||||
|
std::shared_ptr<Tesses::Framework::Streams::Stream> strm;
|
||||||
|
if(GetObject(fileO,strm)) {
|
||||||
|
|
||||||
|
data.Size = (uint64_t)strm->GetLength();
|
||||||
|
data.Mode = Tesses::Framework::Filesystem::MODE_REGULAR | 0755;
|
||||||
|
data.BlockSize = 512;
|
||||||
|
data.BlockCount = data.Size / data.BlockSize;
|
||||||
|
|
||||||
|
data.Device = 0;
|
||||||
|
data.DeviceId = 0;
|
||||||
|
data.GroupId = 0;
|
||||||
|
data.HardLinks = 1;
|
||||||
|
data.Inode = 0;
|
||||||
|
data.LastAccess = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.LastModified = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.LastStatus = Tesses::Framework::Date::DateTime(0);
|
||||||
|
data.UserId = 0;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
class DICT_DIRENUM
|
class DICT_DIRENUM
|
||||||
@@ -148,7 +189,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
return this->current->first;
|
return this->current->first;
|
||||||
}
|
}
|
||||||
DICT_DIRENUM(GC* gc, TDictionary* dict) : ls(gc), dict(dict)
|
DICT_DIRENUM(std::shared_ptr<GC> gc, TDictionary* dict) : ls(gc), dict(dict)
|
||||||
{
|
{
|
||||||
ls.Add(dict);
|
ls.Add(dict);
|
||||||
}
|
}
|
||||||
@@ -197,26 +238,11 @@ namespace Tesses::CrossLang {
|
|||||||
return Tesses::Framework::Filesystem::VFSPathEnumerator();
|
return Tesses::Framework::Filesystem::VFSPathEnumerator();
|
||||||
}
|
}
|
||||||
|
|
||||||
EmbedDirectory::EmbedDirectory(GC* gc, TDictionary* dict)
|
EmbedDirectory::EmbedDirectory(std::shared_ptr<GC> gc, TDictionary* dict)
|
||||||
{
|
{
|
||||||
this->dir = CreateMarkedTObject(gc, dict);
|
this->dir = CreateMarkedTObject(gc, dict);
|
||||||
}
|
}
|
||||||
void EmbedDirectory::CreateDirectory(Tesses::Framework::Filesystem::VFSPath path)
|
|
||||||
{
|
|
||||||
//DO NOTHING
|
|
||||||
}
|
|
||||||
void EmbedDirectory::DeleteDirectory(Tesses::Framework::Filesystem::VFSPath path)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
void EmbedDirectory::DeleteFile(Tesses::Framework::Filesystem::VFSPath path)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
void EmbedDirectory::MoveFile(Tesses::Framework::Filesystem::VFSPath src, Tesses::Framework::Filesystem::VFSPath dest)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
std::string EmbedDirectory::VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path)
|
std::string EmbedDirectory::VFSPathToSystem(Tesses::Framework::Filesystem::VFSPath path)
|
||||||
{
|
{
|
||||||
return path.ToString();
|
return path.ToString();
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang
|
namespace Tesses::CrossLang
|
||||||
{
|
{
|
||||||
bool TYieldEnumerator::MoveNext(GC* ls)
|
bool TYieldEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
CallStackEntry* ent;
|
CallStackEntry* ent;
|
||||||
GCList ls2(ls);
|
GCList ls2(ls);
|
||||||
@@ -56,7 +56,7 @@ namespace Tesses::CrossLang
|
|||||||
yieldEnum->hasStarted=false;
|
yieldEnum->hasStarted=false;
|
||||||
yieldEnum->enumerator = v;
|
yieldEnum->enumerator = v;
|
||||||
|
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(yieldEnum);
|
ls.Add(yieldEnum);
|
||||||
_gc->Watch(yieldEnum);
|
_gc->Watch(yieldEnum);
|
||||||
return yieldEnum;
|
return yieldEnum;
|
||||||
@@ -69,13 +69,13 @@ namespace Tesses::CrossLang
|
|||||||
yieldEnum->hasStarted=false;
|
yieldEnum->hasStarted=false;
|
||||||
yieldEnum->enumerator = v;
|
yieldEnum->enumerator = v;
|
||||||
|
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(yieldEnum);
|
ls->Add(yieldEnum);
|
||||||
_gc->Watch(yieldEnum);
|
_gc->Watch(yieldEnum);
|
||||||
return yieldEnum;
|
return yieldEnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TCustomEnumerator::MoveNext(GC* ls)
|
bool TCustomEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
GCList ls2(ls);
|
GCList ls2(ls);
|
||||||
auto res = this->dict->CallMethod(ls2,"MoveNext",{});
|
auto res = this->dict->CallMethod(ls2,"MoveNext",{});
|
||||||
@@ -110,7 +110,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TCustomEnumerator* customEnum = new TCustomEnumerator();
|
TCustomEnumerator* customEnum = new TCustomEnumerator();
|
||||||
customEnum->dict = dict;
|
customEnum->dict = dict;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(customEnum);
|
ls->Add(customEnum);
|
||||||
_gc->Watch(customEnum);
|
_gc->Watch(customEnum);
|
||||||
return customEnum;
|
return customEnum;
|
||||||
@@ -119,7 +119,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TCustomEnumerator* customEnum = new TCustomEnumerator();
|
TCustomEnumerator* customEnum = new TCustomEnumerator();
|
||||||
customEnum->dict = dict;
|
customEnum->dict = dict;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(customEnum);
|
ls.Add(customEnum);
|
||||||
_gc->Watch(customEnum);
|
_gc->Watch(customEnum);
|
||||||
return customEnum;
|
return customEnum;
|
||||||
@@ -162,7 +162,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TVFSPathEnumerator* vfspathe = new TVFSPathEnumerator();
|
TVFSPathEnumerator* vfspathe = new TVFSPathEnumerator();
|
||||||
vfspathe->enumerator = enumerator;
|
vfspathe->enumerator = enumerator;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(vfspathe);
|
ls.Add(vfspathe);
|
||||||
_gc->Watch(vfspathe);
|
_gc->Watch(vfspathe);
|
||||||
return vfspathe;
|
return vfspathe;
|
||||||
@@ -171,12 +171,12 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TVFSPathEnumerator* vfspathe = new TVFSPathEnumerator();
|
TVFSPathEnumerator* vfspathe = new TVFSPathEnumerator();
|
||||||
vfspathe->enumerator = enumerator;
|
vfspathe->enumerator = enumerator;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(vfspathe);
|
ls->Add(vfspathe);
|
||||||
_gc->Watch(vfspathe);
|
_gc->Watch(vfspathe);
|
||||||
return vfspathe;
|
return vfspathe;
|
||||||
}
|
}
|
||||||
bool TVFSPathEnumerator::MoveNext(GC* ls)
|
bool TVFSPathEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
return enumerator.MoveNext();
|
return enumerator.MoveNext();
|
||||||
}
|
}
|
||||||
@@ -189,7 +189,7 @@ namespace Tesses::CrossLang
|
|||||||
TDictionaryEnumerator* dicte=new TDictionaryEnumerator();
|
TDictionaryEnumerator* dicte=new TDictionaryEnumerator();
|
||||||
dicte->dict = dict;
|
dicte->dict = dict;
|
||||||
dicte->hasStarted=false;
|
dicte->hasStarted=false;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(dicte);
|
ls.Add(dicte);
|
||||||
_gc->Watch(dicte);
|
_gc->Watch(dicte);
|
||||||
return dicte;
|
return dicte;
|
||||||
@@ -199,13 +199,13 @@ namespace Tesses::CrossLang
|
|||||||
TDictionaryEnumerator* dicte=new TDictionaryEnumerator();
|
TDictionaryEnumerator* dicte=new TDictionaryEnumerator();
|
||||||
dicte->dict = dict;
|
dicte->dict = dict;
|
||||||
dicte->hasStarted=false;
|
dicte->hasStarted=false;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(dicte);
|
ls->Add(dicte);
|
||||||
_gc->Watch(dicte);
|
_gc->Watch(dicte);
|
||||||
return dicte;
|
return dicte;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TDictionaryEnumerator::MoveNext(GC* ls)
|
bool TDictionaryEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
if(!this->hasStarted)
|
if(!this->hasStarted)
|
||||||
{
|
{
|
||||||
@@ -248,7 +248,7 @@ namespace Tesses::CrossLang
|
|||||||
TListEnumerator* liste=new TListEnumerator();
|
TListEnumerator* liste=new TListEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(liste);
|
ls.Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
@@ -258,12 +258,12 @@ namespace Tesses::CrossLang
|
|||||||
TListEnumerator* liste=new TListEnumerator();
|
TListEnumerator* liste=new TListEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(liste);
|
ls->Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
}
|
}
|
||||||
bool TListEnumerator::MoveNext(GC* ls)
|
bool TListEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
this->index++;
|
this->index++;
|
||||||
return this->index >= 0 && this->index < this->ls->Count();
|
return this->index >= 0 && this->index < this->ls->Count();
|
||||||
@@ -291,7 +291,7 @@ namespace Tesses::CrossLang
|
|||||||
TAssociativeArrayEnumerator* liste=new TAssociativeArrayEnumerator();
|
TAssociativeArrayEnumerator* liste=new TAssociativeArrayEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(liste);
|
ls.Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
@@ -301,12 +301,12 @@ namespace Tesses::CrossLang
|
|||||||
TAssociativeArrayEnumerator* liste=new TAssociativeArrayEnumerator();
|
TAssociativeArrayEnumerator* liste=new TAssociativeArrayEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(liste);
|
ls->Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
}
|
}
|
||||||
bool TAssociativeArrayEnumerator::MoveNext(GC* ls)
|
bool TAssociativeArrayEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
this->index++;
|
this->index++;
|
||||||
return this->index >= 0 && this->index < this->ls->Count();
|
return this->index >= 0 && this->index < this->ls->Count();
|
||||||
@@ -338,7 +338,7 @@ namespace Tesses::CrossLang
|
|||||||
TDynamicListEnumerator* liste=new TDynamicListEnumerator();
|
TDynamicListEnumerator* liste=new TDynamicListEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(liste);
|
ls.Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
@@ -348,12 +348,12 @@ namespace Tesses::CrossLang
|
|||||||
TDynamicListEnumerator* liste=new TDynamicListEnumerator();
|
TDynamicListEnumerator* liste=new TDynamicListEnumerator();
|
||||||
liste->ls = list;
|
liste->ls = list;
|
||||||
liste->index = -1;
|
liste->index = -1;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(liste);
|
ls->Add(liste);
|
||||||
_gc->Watch(liste);
|
_gc->Watch(liste);
|
||||||
return liste;
|
return liste;
|
||||||
}
|
}
|
||||||
bool TDynamicListEnumerator::MoveNext(GC* ls)
|
bool TDynamicListEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
this->index++;
|
this->index++;
|
||||||
GCList ls2(ls);
|
GCList ls2(ls);
|
||||||
@@ -384,7 +384,7 @@ namespace Tesses::CrossLang
|
|||||||
TStringEnumerator* stre=new TStringEnumerator();
|
TStringEnumerator* stre=new TStringEnumerator();
|
||||||
stre->str = str;
|
stre->str = str;
|
||||||
stre->hasStarted=false;
|
stre->hasStarted=false;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(stre);
|
ls.Add(stre);
|
||||||
_gc->Watch(stre);
|
_gc->Watch(stre);
|
||||||
return stre;
|
return stre;
|
||||||
@@ -394,12 +394,12 @@ namespace Tesses::CrossLang
|
|||||||
TStringEnumerator* stre=new TStringEnumerator();
|
TStringEnumerator* stre=new TStringEnumerator();
|
||||||
stre->str = str;
|
stre->str = str;
|
||||||
stre->hasStarted=false;
|
stre->hasStarted=false;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(stre);
|
ls->Add(stre);
|
||||||
_gc->Watch(stre);
|
_gc->Watch(stre);
|
||||||
return stre;
|
return stre;
|
||||||
}
|
}
|
||||||
bool TStringEnumerator::MoveNext(GC* ls)
|
bool TStringEnumerator::MoveNext(std::shared_ptr<GC> ls)
|
||||||
{
|
{
|
||||||
if(!this->hasStarted)
|
if(!this->hasStarted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TDynamicList* list=new TDynamicList();
|
TDynamicList* list=new TDynamicList();
|
||||||
list->cb = callable;
|
list->cb = callable;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(list);
|
ls.Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
@@ -13,7 +13,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
TDynamicList* list=new TDynamicList();
|
TDynamicList* list=new TDynamicList();
|
||||||
list->cb = callable;
|
list->cb = callable;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(list);
|
ls->Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
@@ -140,7 +140,7 @@ namespace Tesses::CrossLang {
|
|||||||
TByteArray* TByteArray::Create(GCList& ls)
|
TByteArray* TByteArray::Create(GCList& ls)
|
||||||
{
|
{
|
||||||
TByteArray* arr=new TByteArray();
|
TByteArray* arr=new TByteArray();
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(arr);
|
ls.Add(arr);
|
||||||
_gc->Watch(arr);
|
_gc->Watch(arr);
|
||||||
return arr;
|
return arr;
|
||||||
@@ -149,7 +149,7 @@ namespace Tesses::CrossLang {
|
|||||||
TByteArray* TByteArray::Create(GCList* ls)
|
TByteArray* TByteArray::Create(GCList* ls)
|
||||||
{
|
{
|
||||||
TByteArray* arr=new TByteArray();
|
TByteArray* arr=new TByteArray();
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(arr);
|
ls->Add(arr);
|
||||||
_gc->Watch(arr);
|
_gc->Watch(arr);
|
||||||
return arr;
|
return arr;
|
||||||
@@ -157,7 +157,7 @@ namespace Tesses::CrossLang {
|
|||||||
TList* TList::Create(GCList* gc)
|
TList* TList::Create(GCList* gc)
|
||||||
{
|
{
|
||||||
TList* list=new TList();
|
TList* list=new TList();
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(list);
|
gc->Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
@@ -165,7 +165,7 @@ namespace Tesses::CrossLang {
|
|||||||
TList* TList::Create(GCList& gc)
|
TList* TList::Create(GCList& gc)
|
||||||
{
|
{
|
||||||
TList* list=new TList();
|
TList* list=new TList();
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(list);
|
gc.Add(list);
|
||||||
_gc->Watch(list);
|
_gc->Watch(list);
|
||||||
return list;
|
return list;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
bool TNativeObject::Equals(GC* gc, TObject right)
|
bool TNativeObject::Equals(std::shared_ptr<GC> gc, TObject right)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<THeapObjectHolder>(right))
|
if(std::holds_alternative<THeapObjectHolder>(right))
|
||||||
{
|
{
|
||||||
@@ -54,7 +54,7 @@ namespace Tesses::CrossLang
|
|||||||
TNative* TNative::Create(GCList& ls, void* ptr,std::function<void(void*)> destroy)
|
TNative* TNative::Create(GCList& ls, void* ptr,std::function<void(void*)> destroy)
|
||||||
{
|
{
|
||||||
TNative* native = new TNative(ptr,destroy);
|
TNative* native = new TNative(ptr,destroy);
|
||||||
GC* gc = ls.GetGC();
|
std::shared_ptr<GC> gc = ls.GetGC();
|
||||||
ls.Add(native);
|
ls.Add(native);
|
||||||
gc->Watch(native);
|
gc->Watch(native);
|
||||||
return native;
|
return native;
|
||||||
@@ -62,7 +62,7 @@ namespace Tesses::CrossLang
|
|||||||
TNative* TNative::Create(GCList* ls, void* ptr,std::function<void(void*)> destroy)
|
TNative* TNative::Create(GCList* ls, void* ptr,std::function<void(void*)> destroy)
|
||||||
{
|
{
|
||||||
TNative* native = new TNative(ptr,destroy);
|
TNative* native = new TNative(ptr,destroy);
|
||||||
GC* gc = ls->GetGC();
|
std::shared_ptr<GC> gc = ls->GetGC();
|
||||||
ls->Add(native);
|
ls->Add(native);
|
||||||
gc->Watch(native);
|
gc->Watch(native);
|
||||||
return native;
|
return native;
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ namespace Tesses::CrossLang {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TRootEnvironment::LoadDependency(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, std::pair<std::string,TVMVersion> dep)
|
void TRootEnvironment::LoadDependency(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, std::pair<std::string,TVMVersion> dep)
|
||||||
{
|
{
|
||||||
for(auto item : this->dependencies)
|
for(auto item : this->dependencies)
|
||||||
if(item.first == dep.first && item.second.CompareTo(dep.second) >= 0) return;
|
if(item.first == dep.first && item.second.CompareTo(dep.second) >= 0) return;
|
||||||
@@ -129,7 +129,7 @@ namespace Tesses::CrossLang {
|
|||||||
f->Load(ls.GetGC(),ms);
|
f->Load(ls.GetGC(),ms);
|
||||||
return this->LoadFile(ls.GetGC(), f);
|
return this->LoadFile(ls.GetGC(), f);
|
||||||
}
|
}
|
||||||
TDictionary* TEnvironment::EnsureDictionary(GC* gc, std::string key)
|
TDictionary* TEnvironment::EnsureDictionary(std::shared_ptr<GC> gc, std::string key)
|
||||||
{
|
{
|
||||||
TObject item = this->GetVariable(key);
|
TObject item = this->GetVariable(key);
|
||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
@@ -139,7 +139,7 @@ namespace Tesses::CrossLang {
|
|||||||
this->DeclareVariable(key, dict);
|
this->DeclareVariable(key, dict);
|
||||||
return dict;
|
return dict;
|
||||||
}
|
}
|
||||||
void TEnvironment::DeclareVariable(GC* gc, std::vector<std::string> name, TObject o)
|
void TEnvironment::DeclareVariable(std::shared_ptr<GC> gc, std::vector<std::string> name, TObject o)
|
||||||
{
|
{
|
||||||
if(name.size() == 0)
|
if(name.size() == 0)
|
||||||
throw VMException("name can't be empty.");
|
throw VMException("name can't be empty.");
|
||||||
@@ -209,7 +209,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TObject TEnvironment::LoadFile(GC* gc, TFile* file)
|
TObject TEnvironment::LoadFile(std::shared_ptr<GC> gc, TFile* file)
|
||||||
{
|
{
|
||||||
file->EnsureCanRunInCrossLang();
|
file->EnsureCanRunInCrossLang();
|
||||||
for(size_t i = 0; i < file->classes.size(); i++)
|
for(size_t i = 0; i < file->classes.size(); i++)
|
||||||
@@ -266,7 +266,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
void TRootEnvironment::LoadFileWithDependencies(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, TFile* file)
|
void TRootEnvironment::LoadFileWithDependencies(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, TFile* file)
|
||||||
{
|
{
|
||||||
this->dependencies.push_back(std::pair<std::string,TVMVersion>(file->name,file->version));
|
this->dependencies.push_back(std::pair<std::string,TVMVersion>(file->name,file->version));
|
||||||
for(auto item : file->dependencies)
|
for(auto item : file->dependencies)
|
||||||
@@ -276,7 +276,7 @@ namespace Tesses::CrossLang {
|
|||||||
LoadFile(gc, file);
|
LoadFile(gc, file);
|
||||||
|
|
||||||
}
|
}
|
||||||
void TRootEnvironment::LoadFileWithDependencies(GC* gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, Tesses::Framework::Filesystem::VFSPath path)
|
void TRootEnvironment::LoadFileWithDependencies(std::shared_ptr<GC> gc,std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs, Tesses::Framework::Filesystem::VFSPath path)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
@@ -344,7 +344,7 @@ namespace Tesses::CrossLang {
|
|||||||
TRootEnvironment* TRootEnvironment::Create(GCList* gc,TDictionary* dict)
|
TRootEnvironment* TRootEnvironment::Create(GCList* gc,TDictionary* dict)
|
||||||
{
|
{
|
||||||
TRootEnvironment* env=new TRootEnvironment(dict);
|
TRootEnvironment* env=new TRootEnvironment(dict);
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(env);
|
gc->Add(env);
|
||||||
_gc->Watch(env);
|
_gc->Watch(env);
|
||||||
return env;
|
return env;
|
||||||
@@ -352,13 +352,13 @@ namespace Tesses::CrossLang {
|
|||||||
TRootEnvironment* TRootEnvironment::Create(GCList& gc,TDictionary* dict)
|
TRootEnvironment* TRootEnvironment::Create(GCList& gc,TDictionary* dict)
|
||||||
{
|
{
|
||||||
TRootEnvironment* env=new TRootEnvironment(dict);
|
TRootEnvironment* env=new TRootEnvironment(dict);
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(env);
|
gc.Add(env);
|
||||||
_gc->Watch(env);
|
_gc->Watch(env);
|
||||||
return env;
|
return env;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TRootEnvironment::HandleException(GC* gc,TEnvironment* env, TObject err)
|
bool TRootEnvironment::HandleException(std::shared_ptr<GC> gc,TEnvironment* env, TObject err)
|
||||||
{
|
{
|
||||||
if(error != nullptr)
|
if(error != nullptr)
|
||||||
{
|
{
|
||||||
@@ -373,7 +373,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool TRootEnvironment::HandleBreakpoint(GC* gc,TEnvironment* env, TObject err)
|
bool TRootEnvironment::HandleBreakpoint(std::shared_ptr<GC> gc,TEnvironment* env, TObject err)
|
||||||
{
|
{
|
||||||
if(error != nullptr)
|
if(error != nullptr)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
return Tesses::Framework::Streams::Stream::GetLength();
|
return Tesses::Framework::Streams::Stream::GetLength();
|
||||||
}
|
}
|
||||||
TObjectStream::TObjectStream(GC* gc, TObject obj)
|
TObjectStream::TObjectStream(std::shared_ptr<GC> gc, TObject obj)
|
||||||
{
|
{
|
||||||
this->ls = new GCList(gc);
|
this->ls = new GCList(gc);
|
||||||
this->ls->Add(obj);
|
this->ls->Add(obj);
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
auto dict=TDictionary::Create(gc);
|
auto dict=TDictionary::Create(gc);
|
||||||
TSubEnvironment* sEnv = this->GetSubEnvironment(dict);
|
TSubEnvironment* sEnv = this->GetSubEnvironment(dict);
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(sEnv);
|
gc->Add(sEnv);
|
||||||
_gc->Watch(sEnv);
|
_gc->Watch(sEnv);
|
||||||
return sEnv;
|
return sEnv;
|
||||||
@@ -189,7 +189,7 @@ namespace Tesses::CrossLang {
|
|||||||
{
|
{
|
||||||
auto dict=TDictionary::Create(gc);
|
auto dict=TDictionary::Create(gc);
|
||||||
TSubEnvironment* sEnv = this->GetSubEnvironment(dict);
|
TSubEnvironment* sEnv = this->GetSubEnvironment(dict);
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(sEnv);
|
gc.Add(sEnv);
|
||||||
_gc->Watch(sEnv);
|
_gc->Watch(sEnv);
|
||||||
return sEnv;
|
return sEnv;
|
||||||
@@ -197,7 +197,7 @@ namespace Tesses::CrossLang {
|
|||||||
TSubEnvironment* TSubEnvironment::Create(GCList* gc, TEnvironment* env, TDictionary* dict)
|
TSubEnvironment* TSubEnvironment::Create(GCList* gc, TEnvironment* env, TDictionary* dict)
|
||||||
{
|
{
|
||||||
TSubEnvironment* senv = new TSubEnvironment(env,dict);
|
TSubEnvironment* senv = new TSubEnvironment(env,dict);
|
||||||
GC* _gc = gc->GetGC();
|
std::shared_ptr<GC> _gc = gc->GetGC();
|
||||||
gc->Add(senv);
|
gc->Add(senv);
|
||||||
_gc->Watch(senv);
|
_gc->Watch(senv);
|
||||||
return senv;
|
return senv;
|
||||||
@@ -205,7 +205,7 @@ namespace Tesses::CrossLang {
|
|||||||
TSubEnvironment* TSubEnvironment::Create(GCList& gc, TEnvironment* env, TDictionary* dict)
|
TSubEnvironment* TSubEnvironment::Create(GCList& gc, TEnvironment* env, TDictionary* dict)
|
||||||
{
|
{
|
||||||
TSubEnvironment* senv = new TSubEnvironment(env,dict);
|
TSubEnvironment* senv = new TSubEnvironment(env,dict);
|
||||||
GC* _gc = gc.GetGC();
|
std::shared_ptr<GC> _gc = gc.GetGC();
|
||||||
gc.Add(senv);
|
gc.Add(senv);
|
||||||
_gc->Watch(senv);
|
_gc->Watch(senv);
|
||||||
return senv;
|
return senv;
|
||||||
@@ -227,32 +227,20 @@ namespace Tesses::CrossLang {
|
|||||||
this->env->Mark();
|
this->env->Mark();
|
||||||
for(auto defer : defers) defer->Mark();
|
for(auto defer : defers) defer->Mark();
|
||||||
}
|
}
|
||||||
void TEnvironment::DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb)
|
void TEnvironment::DeclareFunction(std::shared_ptr<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();
|
gc->BarrierBegin();
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
void TEnvironment::DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb)
|
|
||||||
{
|
void TEnvironment::DeclareFunction(std::shared_ptr<GC> gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy)
|
||||||
gc.BarrierBegin();
|
|
||||||
GCList ls(gc);
|
|
||||||
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb));
|
|
||||||
gc.BarrierEnd();
|
|
||||||
}
|
|
||||||
void TEnvironment::DeclareFunction(GC* gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy)
|
|
||||||
{
|
{
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
void TEnvironment::DeclareFunction(GC& gc,std::string key,std::string documentation, std::vector<std::string> argNames, std::function<TObject(GCList& ls, std::vector<TObject> args)> cb,std::function<void()> destroy)
|
|
||||||
{
|
|
||||||
gc.BarrierBegin();
|
|
||||||
GCList ls(gc);
|
|
||||||
this->DeclareVariable(key, TExternalMethod::Create(ls,documentation,argNames,cb,destroy));
|
|
||||||
gc.BarrierEnd();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,135 +2,28 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
|
|
||||||
TObjectVFS::TObjectVFS(GC* gc, TObject obj)
|
TObjectVFS::TObjectVFS(std::shared_ptr<GC> gc, TObject obj)
|
||||||
{
|
{
|
||||||
this->ls = new GCList(gc);
|
this->ls = new GCList(gc);
|
||||||
this->ls->Add(obj);
|
this->ls->Add(obj);
|
||||||
this->obj = 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)
|
std::shared_ptr<Tesses::Framework::Streams::Stream> TObjectVFS::OpenFile(Tesses::Framework::Filesystem::VFSPath path, std::string mode)
|
||||||
{
|
{
|
||||||
TDictionary* dict;
|
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;
|
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;
|
TDictionary* dict;
|
||||||
|
|
||||||
@@ -484,31 +233,6 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return Tesses::Framework::Filesystem::VFSPath();
|
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)
|
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)
|
bool TObjectVFS::StatVFS(Tesses::Framework::Filesystem::VFSPath path, Tesses::Framework::Filesystem::StatVFSData& data)
|
||||||
{
|
{
|
||||||
TDictionary* dict;
|
TDictionary* dict;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
bool InterperterThread::Add(GC* gc)
|
bool InterperterThread::Add(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
|
|
||||||
bool Equals(GC* gc, TObject left, TObject right)
|
bool Equals(std::shared_ptr<GC> gc, TObject left, TObject right)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
if(std::holds_alternative<std::nullptr_t>(left) && std::holds_alternative<std::nullptr_t>(right))
|
if(std::holds_alternative<std::nullptr_t>(left) && std::holds_alternative<std::nullptr_t>(right))
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
extern bool IHttpServer_Handle(std::shared_ptr<Tesses::Framework::Http::IHttpServer> svr,std::vector<TObject>& args);
|
extern bool IHttpServer_Handle(std::shared_ptr<Tesses::Framework::Http::IHttpServer> svr,std::vector<TObject>& args);
|
||||||
|
|
||||||
bool InterperterThread::ExecuteMethod2(GC* gc, TObject instance, std::string key, std::vector<TObject> args)
|
bool InterperterThread::ExecuteMethod2(std::shared_ptr<GC> gc, TObject instance, std::string key, std::vector<TObject> args)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -395,7 +395,7 @@ namespace Tesses::CrossLang {
|
|||||||
cse.back()->Push(gc, path.GetExtension());
|
cse.back()->Push(gc, path.GetExtension());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if(cse.back()->env->GetRootEnvironment()->permissions.canRegisterLocalFS && key == "MakeAbsolute")
|
if(cse.back()->env->GetRootEnvironment()->permissions.localfs && key == "MakeAbsolute")
|
||||||
{
|
{
|
||||||
Tesses::Framework::Filesystem::VFSPath p;
|
Tesses::Framework::Filesystem::VFSPath p;
|
||||||
if(GetArgumentAsPath(args,0,p))
|
if(GetArgumentAsPath(args,0,p))
|
||||||
@@ -405,11 +405,11 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cse.back()->Push(gc,path.MakeAbsolute());
|
cse.back()->Push(gc,path.MakeAbsolute(cse.back()->env->GetRootEnvironment()->permissions.localfs->GetWorking()));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(cse.back()->env->GetRootEnvironment()->permissions.canRegisterLocalFS && key == "MakeRelative")
|
if(cse.back()->env->GetRootEnvironment()->permissions.localfs && key == "MakeRelative")
|
||||||
{
|
{
|
||||||
Tesses::Framework::Filesystem::VFSPath p;
|
Tesses::Framework::Filesystem::VFSPath p;
|
||||||
if(GetArgumentAsPath(args,0,p))
|
if(GetArgumentAsPath(args,0,p))
|
||||||
@@ -419,7 +419,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cse.back()->Push(gc,path.MakeRelative());
|
cse.back()->Push(gc,path.MakeRelative(cse.back()->env->GetRootEnvironment()->permissions.localfs->GetWorking()));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1199,6 +1199,48 @@ namespace Tesses::CrossLang {
|
|||||||
cse.back()->Push(gc,Undefined());
|
cse.back()->Push(gc,Undefined());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
else if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>>(instance))
|
||||||
|
{
|
||||||
|
auto& sse = std::get<std::shared_ptr<Tesses::Framework::Http::ServerSentEvents>>(instance);
|
||||||
|
if(sse != nullptr)
|
||||||
|
{
|
||||||
|
std::string text;
|
||||||
|
std::string text2;
|
||||||
|
if(key == "SendComment" && GetArgument(args, 0, text))
|
||||||
|
{
|
||||||
|
sse->SendComment(text);
|
||||||
|
}
|
||||||
|
else if(key == "SendCustomEvent" && GetArgument(args, 0, text) && GetArgument(args,1,text2)) {
|
||||||
|
sse->SendCustomEvent(text,text2);
|
||||||
|
}
|
||||||
|
else if(key == "SendCustomEvent" && GetArgument(args, 0, text)) {
|
||||||
|
if(GetArgument(args,1,text2))
|
||||||
|
sse->SendData(text,text2);
|
||||||
|
else
|
||||||
|
sse->SendData(text);
|
||||||
|
}
|
||||||
|
else if(key == "SendId" && GetArgument(args, 0, text))
|
||||||
|
{
|
||||||
|
sse->SendId(text);
|
||||||
|
}
|
||||||
|
else if(key == "SendRetry")
|
||||||
|
{
|
||||||
|
std::shared_ptr<Tesses::Framework::Date::TimeSpan> ts;
|
||||||
|
int64_t num;
|
||||||
|
if(GetArgument(args,0,ts) && ts)
|
||||||
|
{
|
||||||
|
sse->SendRetry(*ts);
|
||||||
|
}
|
||||||
|
else if(GetArgument(args,0,num))
|
||||||
|
{
|
||||||
|
sse->SendRetry((uint32_t)num);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cse.back()->Push(gc, Undefined());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
else if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Streams::Stream>>(instance))
|
else if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Streams::Stream>>(instance))
|
||||||
{
|
{
|
||||||
auto& strm = std::get<std::shared_ptr<Tesses::Framework::Streams::Stream>>(instance);
|
auto& strm = std::get<std::shared_ptr<Tesses::Framework::Streams::Stream>>(instance);
|
||||||
@@ -1234,6 +1276,18 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
if(netStrm != nullptr)
|
if(netStrm != nullptr)
|
||||||
{
|
{
|
||||||
|
if(key == "SetMulticastMembership")
|
||||||
|
{
|
||||||
|
std::string ma;
|
||||||
|
std::string ifaceIP = "0.0.0.0";
|
||||||
|
if(GetArgument(args,0,ma))
|
||||||
|
{
|
||||||
|
GetArgument(args,1,ifaceIP);
|
||||||
|
netStrm->SetMulticastMembership(ma,ifaceIP);
|
||||||
|
}
|
||||||
|
cse.back()->Push(gc, Undefined());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(key == "GetPort")
|
if(key == "GetPort")
|
||||||
{
|
{
|
||||||
cse.back()->Push(gc, (int64_t)netStrm->GetPort());
|
cse.back()->Push(gc, (int64_t)netStrm->GetPort());
|
||||||
@@ -1623,6 +1677,8 @@ namespace Tesses::CrossLang {
|
|||||||
auto myvfs = std::dynamic_pointer_cast<TObjectVFS>(vfs);
|
auto myvfs = std::dynamic_pointer_cast<TObjectVFS>(vfs);
|
||||||
|
|
||||||
auto mountable = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::MountableFilesystem>(vfs);
|
auto mountable = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::MountableFilesystem>(vfs);
|
||||||
|
|
||||||
|
|
||||||
if(myvfs != nullptr)
|
if(myvfs != nullptr)
|
||||||
{
|
{
|
||||||
TDictionary* dict2;
|
TDictionary* dict2;
|
||||||
@@ -1997,6 +2053,38 @@ namespace Tesses::CrossLang {
|
|||||||
cse.back()->Push(gc, nullptr);
|
cse.back()->Push(gc, nullptr);
|
||||||
return false;
|
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")
|
if(key == "StatVFS")
|
||||||
{
|
{
|
||||||
Tesses::Framework::Filesystem::VFSPath path;
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
@@ -2198,9 +2286,36 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
if(key == "RegisterEverything")
|
if(key == "RegisterEverything")
|
||||||
{
|
{
|
||||||
|
if(rootEnv->permissions.locked)
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc,nullptr);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if(myEnv->permissions.canRegisterEverything)
|
if(myEnv->permissions.canRegisterEverything)
|
||||||
{
|
{
|
||||||
TStd::RegisterStd(gc, rootEnv);
|
std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs;
|
||||||
|
if(GetArgument(args,0, vfs))
|
||||||
|
{
|
||||||
|
|
||||||
|
auto rfs = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs);
|
||||||
|
if(rfs)
|
||||||
|
{
|
||||||
|
TStd::RegisterStd(gc,rootEnv, rfs);
|
||||||
|
cse.back()->Push(gc,nullptr);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(myEnv->permissions.localfs)
|
||||||
|
TStd::RegisterStd(gc, rootEnv, std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(myEnv->permissions.localfs->GetVFS(),myEnv->permissions.localfs->GetWorking()));
|
||||||
|
else
|
||||||
|
TStd::RegisterStd(gc, rootEnv, nullptr);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
cse.back()->Push(gc,nullptr);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2218,7 +2333,15 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
|
|
||||||
if(myEnv->permissions.canRegisterIO && !rootEnv->permissions.locked)
|
if(myEnv->permissions.canRegisterIO && !rootEnv->permissions.locked)
|
||||||
TStd::RegisterIO(gc, rootEnv, myEnv->permissions.canRegisterLocalFS);
|
{
|
||||||
|
if(myEnv->permissions.localfs)
|
||||||
|
{
|
||||||
|
TStd::RegisterIO(gc, rootEnv, std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(myEnv->permissions.localfs->GetVFS(),myEnv->permissions.localfs->GetWorking()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
TStd::RegisterIO(gc, rootEnv, nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(myEnv->permissions.canRegisterJSON && !rootEnv->permissions.locked)
|
if(myEnv->permissions.canRegisterJSON && !rootEnv->permissions.locked)
|
||||||
TStd::RegisterJson(gc, rootEnv);
|
TStd::RegisterJson(gc, rootEnv);
|
||||||
@@ -2293,11 +2416,29 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
if(key == "RegisterIO")
|
if(key == "RegisterIO")
|
||||||
{
|
{
|
||||||
|
std::shared_ptr<Tesses::Framework::Filesystem::VFS> vfs;
|
||||||
|
|
||||||
bool r;
|
bool r;
|
||||||
if(GetArgument(args,0,r))
|
if(GetArgument(args,0,r))
|
||||||
{
|
{
|
||||||
if((myEnv->permissions.canRegisterEverything || myEnv->permissions.canRegisterIO) && !rootEnv->permissions.locked)
|
if((myEnv->permissions.canRegisterEverything || myEnv->permissions.canRegisterIO) && !rootEnv->permissions.locked)
|
||||||
TStd::RegisterIO(gc, rootEnv, myEnv->permissions.canRegisterLocalFS ? r : false);
|
{
|
||||||
|
if(myEnv->permissions.localfs)
|
||||||
|
{
|
||||||
|
TStd::RegisterIO(gc, rootEnv, std::make_shared<Tesses::Framework::Filesystem::RelativeFilesystem>(myEnv->permissions.localfs->GetVFS(),myEnv->permissions.localfs->GetWorking()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
TStd::RegisterIO(gc, rootEnv, nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(GetArgument(args,0,vfs))
|
||||||
|
{
|
||||||
|
auto rfs = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs);
|
||||||
|
if(rfs && (myEnv->permissions.canRegisterEverything || myEnv->permissions.canRegisterIO) && !rootEnv->permissions.locked)
|
||||||
|
{
|
||||||
|
TStd::RegisterIO(gc, rootEnv, rfs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cse.back()->Push(gc,nullptr);
|
cse.back()->Push(gc,nullptr);
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
bool InterperterThread::GetField(GC* gc)
|
bool InterperterThread::GetField(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -47,10 +47,52 @@ namespace Tesses::CrossLang {
|
|||||||
cse.back()->Push(gc, Undefined());
|
cse.back()->Push(gc, Undefined());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::TF_Timer_Handle>>(instance))
|
||||||
|
{
|
||||||
|
auto timer = std::get<std::shared_ptr<Tesses::Framework::TF_Timer_Handle>>(instance);
|
||||||
|
if(timer)
|
||||||
|
{
|
||||||
|
if(key == "Interval")
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc, timer->GetIntervalMilliseconds());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if(key == "Enabled")
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc, timer->GetEnabled());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cse.back()->Push(gc, Undefined());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance))
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance))
|
||||||
{
|
{
|
||||||
auto vfs = std::get<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance);
|
auto vfs = std::get<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance);
|
||||||
auto tmpFS=std::dynamic_pointer_cast<Tesses::Framework::Filesystem::TempFS>(vfs);
|
auto tmpFS=std::dynamic_pointer_cast<Tesses::Framework::Filesystem::TempFS>(vfs);
|
||||||
|
auto relative = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs);
|
||||||
|
auto myFS = std::dynamic_pointer_cast<TObjectVFS>(vfs);
|
||||||
|
if(relative)
|
||||||
|
{
|
||||||
|
if(key == "Working")
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc, relative->GetWorking());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if(key == "Filesystem")
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc, relative->GetVFS());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(myFS)
|
||||||
|
{
|
||||||
|
if(key == "Inner")
|
||||||
|
{
|
||||||
|
cse.back()->Push(gc, myFS->obj);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(tmpFS)
|
if(tmpFS)
|
||||||
{
|
{
|
||||||
if(key == "TempDirectoryName")
|
if(key == "TempDirectoryName")
|
||||||
|
|||||||
@@ -11,7 +11,11 @@
|
|||||||
#include <variant>
|
#include <variant>
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
|
|
||||||
bool InterperterThread::SetField(GC* gc)
|
static void empty()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
bool InterperterThread::SetField(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -30,7 +34,61 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string key = std::get<std::string>(_key);
|
std::string key = std::get<std::string>(_key);
|
||||||
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>>(instance))
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::TF_Timer_Handle>>(instance))
|
||||||
|
{
|
||||||
|
auto handle = std::get<std::shared_ptr<Tesses::Framework::TF_Timer_Handle>>(instance);
|
||||||
|
if(handle)
|
||||||
|
{
|
||||||
|
int64_t ms;
|
||||||
|
bool b;
|
||||||
|
if(key == "Enabled" && GetObject(value,b))
|
||||||
|
{
|
||||||
|
|
||||||
|
handle->SetEnabled(b);
|
||||||
|
|
||||||
|
cse.back()->Push(gc,b);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(key == "Interval" && GetObject(value, ms))
|
||||||
|
{
|
||||||
|
handle->SetIntervalFromMilliseconds(ms);
|
||||||
|
|
||||||
|
cse.back()->Push(gc,ms);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if(key == "Callback")
|
||||||
|
{
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetObjectHeap(value,callable))
|
||||||
|
{
|
||||||
|
|
||||||
|
auto obj = CreateMarkedTObject(ls.GetGC(), callable);
|
||||||
|
handle->SetCallback([obj]()->void {
|
||||||
|
TCallable* callable;
|
||||||
|
if(GetObjectHeap(obj->GetObject(), callable))
|
||||||
|
{
|
||||||
|
GCList ls(obj->GetGC());
|
||||||
|
callable->Call(ls,{});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cse.back()->Push(gc, callable);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
handle->SetCallback(empty);
|
||||||
|
cse.back()->Push(gc, nullptr);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
cse.back()->Push(gc, Undefined());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>>(instance))
|
||||||
{
|
{
|
||||||
auto writer = std::get<std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>>(instance);
|
auto writer = std::get<std::shared_ptr<Tesses::Framework::TextStreams::TextWriter>>(instance);
|
||||||
auto stringWriter = std::dynamic_pointer_cast<Tesses::Framework::TextStreams::StringWriter>(writer);
|
auto stringWriter = std::dynamic_pointer_cast<Tesses::Framework::TextStreams::StringWriter>(writer);
|
||||||
@@ -58,6 +116,34 @@ namespace Tesses::CrossLang {
|
|||||||
cse.back()->Push(gc,Undefined());
|
cse.back()->Push(gc,Undefined());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance))
|
||||||
|
{
|
||||||
|
|
||||||
|
auto vfs = std::get<std::shared_ptr<Tesses::Framework::Filesystem::VFS>>(instance);
|
||||||
|
auto relative = std::dynamic_pointer_cast<Tesses::Framework::Filesystem::RelativeFilesystem>(vfs);
|
||||||
|
|
||||||
|
if(relative)
|
||||||
|
{
|
||||||
|
if(key == "Working")
|
||||||
|
{
|
||||||
|
Tesses::Framework::Filesystem::VFSPath path;
|
||||||
|
if(GetObjectAsPath(value,path))
|
||||||
|
{
|
||||||
|
if(path.relative)
|
||||||
|
{
|
||||||
|
relative->SetWorking(path.MakeAbsolute(relative->GetWorking()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
relative->SetWorking(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
cse.back()->Push(gc,Undefined());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Http::IHttpServer>>(instance))
|
if(std::holds_alternative<std::shared_ptr<Tesses::Framework::Http::IHttpServer>>(instance))
|
||||||
{
|
{
|
||||||
auto svr = std::get<std::shared_ptr<Tesses::Framework::Http::IHttpServer>>(instance);
|
auto svr = std::get<std::shared_ptr<Tesses::Framework::Http::IHttpServer>>(instance);
|
||||||
@@ -177,11 +263,19 @@ namespace Tesses::CrossLang {
|
|||||||
auto netStrm = std::dynamic_pointer_cast<Tesses::Framework::Streams::NetworkStream>(strm);
|
auto netStrm = std::dynamic_pointer_cast<Tesses::Framework::Streams::NetworkStream>(strm);
|
||||||
if(netStrm != nullptr)
|
if(netStrm != nullptr)
|
||||||
{
|
{
|
||||||
|
int64_t n0;
|
||||||
bool bc;
|
bool bc;
|
||||||
if(key == "Broadcast" && GetObject(value,bc))
|
if(key == "Broadcast" && GetObject(value,bc))
|
||||||
netStrm->SetBroadcast(bc);
|
netStrm->SetBroadcast(bc);
|
||||||
if(key == "NoDelay" && GetObject(value,bc))
|
if(key == "NoDelay" && GetObject(value,bc))
|
||||||
netStrm->SetNoDelay(bc);
|
netStrm->SetNoDelay(bc);
|
||||||
|
if(key == "ReuseAddress" && GetObject(value,bc))
|
||||||
|
netStrm->SetReuseAddress(bc);
|
||||||
|
if(key == "ReusePort" && GetObject(value,bc))
|
||||||
|
netStrm->SetReusePort(bc);
|
||||||
|
if(key == "MulticastTTL" && GetObject(value,n0))
|
||||||
|
netStrm->SetMulticastTTL((uint8_t)n0);
|
||||||
|
|
||||||
}
|
}
|
||||||
stk->Push(gc, Undefined());
|
stk->Push(gc, Undefined());
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
bool InterperterThread::Sub(GC* gc)
|
bool InterperterThread::Sub(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
namespace Tesses::CrossLang {
|
namespace Tesses::CrossLang {
|
||||||
std::string ToString(GC* gc, TObject o)
|
std::string ToString(std::shared_ptr<GC> gc, TObject o)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<Tesses::Framework::Filesystem::VFSPath>(o))
|
if(std::holds_alternative<Tesses::Framework::Filesystem::VFSPath>(o))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TFile* f = new TFile();
|
TFile* f = new TFile();
|
||||||
f->icon = -1;
|
f->icon = -1;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(f);
|
ls.Add(f);
|
||||||
_gc->Watch(f);
|
_gc->Watch(f);
|
||||||
return f;
|
return f;
|
||||||
@@ -20,7 +20,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
TFile* f = new TFile();
|
TFile* f = new TFile();
|
||||||
f->icon=-1;
|
f->icon=-1;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(f);
|
ls->Add(f);
|
||||||
_gc->Watch(f);
|
_gc->Watch(f);
|
||||||
return f;
|
return f;
|
||||||
@@ -35,7 +35,7 @@ namespace Tesses::CrossLang
|
|||||||
TFileChunk* TFileChunk::Create(GCList& ls)
|
TFileChunk* TFileChunk::Create(GCList& ls)
|
||||||
{
|
{
|
||||||
TFileChunk* chk = new TFileChunk();
|
TFileChunk* chk = new TFileChunk();
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(chk);
|
ls.Add(chk);
|
||||||
_gc->Watch(chk);
|
_gc->Watch(chk);
|
||||||
return chk;
|
return chk;
|
||||||
@@ -43,7 +43,7 @@ namespace Tesses::CrossLang
|
|||||||
TFileChunk* TFileChunk::Create(GCList* ls)
|
TFileChunk* TFileChunk::Create(GCList* ls)
|
||||||
{
|
{
|
||||||
TFileChunk* chk = new TFileChunk();
|
TFileChunk* chk = new TFileChunk();
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(chk);
|
ls->Add(chk);
|
||||||
_gc->Watch(chk);
|
_gc->Watch(chk);
|
||||||
return chk;
|
return chk;
|
||||||
@@ -280,7 +280,7 @@ namespace Tesses::CrossLang
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TFile::Load(GC* gc, std::shared_ptr<Tesses::Framework::Streams::Stream> stream)
|
void TFile::Load(std::shared_ptr<GC> gc, std::shared_ptr<Tesses::Framework::Streams::Stream> stream)
|
||||||
{
|
{
|
||||||
|
|
||||||
uint8_t main_header[18];
|
uint8_t main_header[18];
|
||||||
|
|||||||
@@ -24,11 +24,6 @@ namespace Tesses::CrossLang
|
|||||||
GC::GC()
|
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* CreateThread(GCList& ls, TCallable* callable,bool detached)
|
||||||
{
|
{
|
||||||
@@ -76,7 +71,7 @@ namespace Tesses::CrossLang
|
|||||||
|
|
||||||
ls.GetGC()->BarrierEnd();
|
ls.GetGC()->BarrierEnd();
|
||||||
th->thrd =new Thread([th]()->void {
|
th->thrd =new Thread([th]()->void {
|
||||||
GC* gc=th->gc;
|
std::shared_ptr<GC> gc=th->gc;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
ls.Add(th);
|
ls.Add(th);
|
||||||
th->hasInit=true;
|
th->hasInit=true;
|
||||||
@@ -91,6 +86,12 @@ namespace Tesses::CrossLang
|
|||||||
}
|
}
|
||||||
void GC::Start()
|
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->mtx=new Mutex();
|
||||||
this->running = true;
|
this->running = true;
|
||||||
this->thrd = new Thread([this]()->void {
|
this->thrd = new Thread([this]()->void {
|
||||||
@@ -203,6 +204,7 @@ namespace Tesses::CrossLang
|
|||||||
{
|
{
|
||||||
return this->tpool->GetValue();
|
return this->tpool->GetValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GC::UnsetRoot(TObject obj)
|
void GC::UnsetRoot(TObject obj)
|
||||||
{
|
{
|
||||||
if(std::holds_alternative<THeapObjectHolder>(obj))
|
if(std::holds_alternative<THeapObjectHolder>(obj))
|
||||||
@@ -224,24 +226,29 @@ namespace Tesses::CrossLang
|
|||||||
GC::~GC()
|
GC::~GC()
|
||||||
{
|
{
|
||||||
GC::BarrierBegin();
|
GC::BarrierBegin();
|
||||||
|
|
||||||
this->roots.clear();
|
this->roots.clear();
|
||||||
GC::BarrierEnd();
|
GC::BarrierEnd();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this->running=false;
|
this->running=false;
|
||||||
this->thrd->Join();
|
this->thrd->Join();
|
||||||
delete this->thrd;
|
delete this->thrd;
|
||||||
for(auto item : objects) delete item;
|
for(auto item : objects) delete item;
|
||||||
delete this->mtx;
|
|
||||||
delete this->tpool;
|
delete this->tpool;
|
||||||
|
delete this->mtx;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GC::RegisterEverythingCallback(std::function<void(GC* gc, TRootEnvironment* env)> cb)
|
void GC::RegisterEverythingCallback(std::function<void(std::shared_ptr<GC> gc, TRootEnvironment* env)> cb)
|
||||||
{
|
{
|
||||||
this->register_everything.push_back(cb);
|
this->register_everything.push_back(cb);
|
||||||
}
|
}
|
||||||
void GC::RegisterEverything(TRootEnvironment* env)
|
void GC::RegisterEverything(TRootEnvironment* env)
|
||||||
{
|
{
|
||||||
for(auto item : this->register_everything)
|
for(auto item : this->register_everything)
|
||||||
item(this,env);
|
item(this->shared_from_this(),env);
|
||||||
}
|
}
|
||||||
void GC::Collect()
|
void GC::Collect()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,21 +2,15 @@
|
|||||||
|
|
||||||
namespace Tesses::CrossLang
|
namespace Tesses::CrossLang
|
||||||
{
|
{
|
||||||
GCList::GCList(GC* gc)
|
GCList::GCList(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
this->gc = gc;
|
this->gc = gc;
|
||||||
gc->SetRoot(this);
|
gc->SetRoot(this);
|
||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
}
|
}
|
||||||
GCList::GCList(GC& gc)
|
|
||||||
{
|
std::shared_ptr<GC> GCList::GetGC()
|
||||||
gc.BarrierBegin();
|
|
||||||
this->gc = &gc;
|
|
||||||
gc.SetRoot(this);
|
|
||||||
gc.BarrierEnd();
|
|
||||||
}
|
|
||||||
GC* GCList::GetGC()
|
|
||||||
{
|
{
|
||||||
return this->gc;
|
return this->gc;
|
||||||
}
|
}
|
||||||
|
|||||||
142
src/vm/vm.cpp
142
src/vm/vm.cpp
@@ -36,9 +36,9 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
#define TVM_HANDLER(hndl) if(hndl(gc)) goto execute
|
#define TVM_HANDLER(hndl) if(hndl(gc)) goto execute
|
||||||
|
|
||||||
typedef bool (InterperterThread::*opcode)(GC* gc);
|
typedef bool (InterperterThread::*opcode)(std::shared_ptr<GC> gc);
|
||||||
|
|
||||||
bool InterperterThread::InterperterThread::Breakpoint(GC* gc)
|
bool InterperterThread::InterperterThread::Breakpoint(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -53,7 +53,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::Times(GC* gc)
|
bool InterperterThread::Times(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -138,7 +138,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Divide(GC* gc)
|
bool InterperterThread::Divide(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -253,7 +253,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Mod(GC* gc)
|
bool InterperterThread::Mod(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -340,7 +340,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Neg(GC* gc)
|
bool InterperterThread::Neg(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -414,7 +414,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::LNot(GC* gc)
|
bool InterperterThread::LNot(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -499,7 +499,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::BNot(GC* gc)
|
bool InterperterThread::BNot(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -571,7 +571,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Lt(GC* gc)
|
bool InterperterThread::Lt(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -691,7 +691,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Gt(GC* gc)
|
bool InterperterThread::Gt(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -812,7 +812,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Lte(GC* gc)
|
bool InterperterThread::Lte(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -933,7 +933,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Gte(GC* gc)
|
bool InterperterThread::Gte(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1056,7 +1056,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Eq(GC* gc)
|
bool InterperterThread::Eq(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1242,7 +1242,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::NEq(GC* gc)
|
bool InterperterThread::NEq(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1420,7 +1420,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::LShift(GC* gc)
|
bool InterperterThread::LShift(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1491,7 +1491,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::RShift(GC* gc)
|
bool InterperterThread::RShift(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1563,7 +1563,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::BOr(GC* gc)
|
bool InterperterThread::BOr(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1635,7 +1635,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::XOr(GC* gc)
|
bool InterperterThread::XOr(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1707,7 +1707,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::BAnd(GC* gc)
|
bool InterperterThread::BAnd(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -1812,7 +1812,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::ExecuteFunction(GC* gc)
|
bool InterperterThread::ExecuteFunction(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -1889,7 +1889,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::Yield(GC* gc)
|
bool InterperterThread::Yield(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -1902,7 +1902,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::ExecuteMethod(GC* gc)
|
bool InterperterThread::ExecuteMethod(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -1939,7 +1939,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::GetVariable(GC* gc)
|
bool InterperterThread::GetVariable(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -1961,7 +1961,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::SetVariable(GC* gc)
|
bool InterperterThread::SetVariable(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2120,7 +2120,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::DeclareVariable(GC* gc)
|
bool InterperterThread::DeclareVariable(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2279,7 +2279,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool InterperterThread::DeclareConstVariable(GC* gc)
|
bool InterperterThread::DeclareConstVariable(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2436,7 +2436,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushResourceStream(GC* gc)
|
bool InterperterThread::PushResourceStream(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2466,7 +2466,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::PushResource(GC* gc)
|
bool InterperterThread::PushResource(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2495,7 +2495,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Throw(GC* gc)
|
bool InterperterThread::Throw(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -2509,7 +2509,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushResourceDirectory(GC* gc)
|
bool InterperterThread::PushResourceDirectory(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
@@ -2524,7 +2524,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::JumpIfDefined(GC* gc)
|
bool InterperterThread::JumpIfDefined(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2550,7 +2550,7 @@ namespace Tesses::CrossLang {
|
|||||||
throw VMException("Can't read jmpifdefined pc.");
|
throw VMException("Can't read jmpifdefined pc.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::JumpIfBreak(GC* gc)
|
bool InterperterThread::JumpIfBreak(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2576,7 +2576,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::JumpIfContinue(GC* gc)
|
bool InterperterThread::JumpIfContinue(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2601,7 +2601,7 @@ namespace Tesses::CrossLang {
|
|||||||
throw VMException("Can't read jmpifcontinue pc.");
|
throw VMException("Can't read jmpifcontinue pc.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::JumpUndefined(GC* gc)
|
bool InterperterThread::JumpUndefined(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2626,7 +2626,7 @@ namespace Tesses::CrossLang {
|
|||||||
throw VMException("Can't read jmpundefined pc.");
|
throw VMException("Can't read jmpundefined pc.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Jump(GC* gc)
|
bool InterperterThread::Jump(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2641,7 +2641,7 @@ namespace Tesses::CrossLang {
|
|||||||
throw VMException("Can't read jmp pc.");
|
throw VMException("Can't read jmp pc.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushNull(GC* gc)
|
bool InterperterThread::PushNull(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2650,7 +2650,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,nullptr);
|
stk->Push(gc,nullptr);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushBreak(GC* gc)
|
bool InterperterThread::PushBreak(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2659,7 +2659,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,TBreak());
|
stk->Push(gc,TBreak());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushContinue(GC* gc)
|
bool InterperterThread::PushContinue(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2668,7 +2668,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,TContinue());
|
stk->Push(gc,TContinue());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushUndefined(GC* gc)
|
bool InterperterThread::PushUndefined(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2677,7 +2677,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,Undefined());
|
stk->Push(gc,Undefined());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::LineInfo(GC* gc)
|
bool InterperterThread::LineInfo(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
GCList ls(gc);
|
GCList ls(gc);
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2695,7 +2695,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushFalse(GC* gc)
|
bool InterperterThread::PushFalse(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2704,7 +2704,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,false);
|
stk->Push(gc,false);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushTrue(GC* gc)
|
bool InterperterThread::PushTrue(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2713,7 +2713,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,true);
|
stk->Push(gc,true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::CreateDictionary(GC* gc)
|
bool InterperterThread::CreateDictionary(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2723,11 +2723,11 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,dict);
|
stk->Push(gc,dict);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Nop(GC* gc)
|
bool InterperterThread::Nop(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::AppendList(GC* gc)
|
bool InterperterThread::AppendList(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2760,7 +2760,7 @@ namespace Tesses::CrossLang {
|
|||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::AppendDictionary(GC* gc)
|
bool InterperterThread::AppendDictionary(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2800,7 +2800,7 @@ namespace Tesses::CrossLang {
|
|||||||
gc->BarrierEnd();
|
gc->BarrierEnd();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::CreateArray(GC* gc)
|
bool InterperterThread::CreateArray(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2810,7 +2810,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc,dict);
|
stk->Push(gc,dict);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Pop(GC* gc)
|
bool InterperterThread::Pop(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2819,7 +2819,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Pop(ls);
|
stk->Pop(ls);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::TryCatch(GC* gc)
|
bool InterperterThread::TryCatch(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2861,7 +2861,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::JumpConditional(GC* gc)
|
bool InterperterThread::JumpConditional(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2884,7 +2884,7 @@ namespace Tesses::CrossLang {
|
|||||||
throw VMException("Can't read jmpc pc.");
|
throw VMException("Can't read jmpc pc.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushClosure(GC* gc)
|
bool InterperterThread::PushClosure(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2912,7 +2912,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushScopelessClosure(GC* gc)
|
bool InterperterThread::PushScopelessClosure(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2941,7 +2941,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::PushString(GC* gc)
|
bool InterperterThread::PushString(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -2962,7 +2962,7 @@ namespace Tesses::CrossLang {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InterperterThread::PushLong(GC* gc)
|
bool InterperterThread::PushLong(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2978,7 +2978,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushChar(GC* gc)
|
bool InterperterThread::PushChar(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -2994,7 +2994,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushDouble(GC* gc)
|
bool InterperterThread::PushDouble(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
if(!cse.empty())
|
if(!cse.empty())
|
||||||
@@ -3010,7 +3010,7 @@ namespace Tesses::CrossLang {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Return(GC* gc)
|
bool InterperterThread::Return(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
@@ -3020,7 +3020,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->ip = (uint32_t)stk->callable->closure->code.size();
|
stk->ip = (uint32_t)stk->callable->closure->code.size();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::ScopeBegin(GC* gc)
|
bool InterperterThread::ScopeBegin(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3034,7 +3034,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Defer(GC* gc)
|
bool InterperterThread::Defer(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3050,7 +3050,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Dup(GC* gc)
|
bool InterperterThread::Dup(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3062,7 +3062,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::ScopeEndTimes(GC* gc)
|
bool InterperterThread::ScopeEndTimes(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3097,7 +3097,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::ScopeEnd(GC* gc)
|
bool InterperterThread::ScopeEnd(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3127,7 +3127,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushRelativePath(GC* gc)
|
bool InterperterThread::PushRelativePath(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3138,7 +3138,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc, p);
|
stk->Push(gc, p);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::PushRootPath(GC* gc)
|
bool InterperterThread::PushRootPath(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
|
|
||||||
@@ -3149,7 +3149,7 @@ namespace Tesses::CrossLang {
|
|||||||
stk->Push(gc, p);
|
stk->Push(gc, p);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
bool InterperterThread::Illegal(GC* gc)
|
bool InterperterThread::Illegal(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
@@ -3162,7 +3162,7 @@ namespace Tesses::CrossLang {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InterperterThread::Execute(GC* gc)
|
void InterperterThread::Execute(std::shared_ptr<GC> gc)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
std::vector<CallStackEntry*>& cse=this->call_stack_entries;
|
||||||
@@ -3342,7 +3342,7 @@ namespace Tesses::CrossLang {
|
|||||||
this->callable->Mark();
|
this->callable->Mark();
|
||||||
for(auto item : this->stack) GC::Mark(item);
|
for(auto item : this->stack) GC::Mark(item);
|
||||||
}
|
}
|
||||||
void CallStackEntry::Push(GC* gc,TObject o)
|
void CallStackEntry::Push(std::shared_ptr<GC> gc,TObject o)
|
||||||
{
|
{
|
||||||
gc->BarrierBegin();
|
gc->BarrierBegin();
|
||||||
this->stack.push_back(o);
|
this->stack.push_back(o);
|
||||||
@@ -3376,7 +3376,7 @@ namespace Tesses::CrossLang {
|
|||||||
InterperterThread* InterperterThread::Create(GCList& ls)
|
InterperterThread* InterperterThread::Create(GCList& ls)
|
||||||
{
|
{
|
||||||
InterperterThread* it = new InterperterThread();
|
InterperterThread* it = new InterperterThread();
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(it);
|
ls.Add(it);
|
||||||
_gc->Watch(it);
|
_gc->Watch(it);
|
||||||
return it;
|
return it;
|
||||||
@@ -3384,7 +3384,7 @@ namespace Tesses::CrossLang {
|
|||||||
InterperterThread* InterperterThread::Create(GCList* ls)
|
InterperterThread* InterperterThread::Create(GCList* ls)
|
||||||
{
|
{
|
||||||
InterperterThread* it = new InterperterThread();
|
InterperterThread* it = new InterperterThread();
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(it);
|
ls->Add(it);
|
||||||
_gc->Watch(it);
|
_gc->Watch(it);
|
||||||
return it;
|
return it;
|
||||||
@@ -3396,7 +3396,7 @@ namespace Tesses::CrossLang {
|
|||||||
cse->srcline = -1;
|
cse->srcline = -1;
|
||||||
cse->srcfile = "";
|
cse->srcfile = "";
|
||||||
cse->thread=nullptr;
|
cse->thread=nullptr;
|
||||||
GC* _gc = ls.GetGC();
|
std::shared_ptr<GC> _gc = ls.GetGC();
|
||||||
ls.Add(cse);
|
ls.Add(cse);
|
||||||
_gc->Watch(cse);
|
_gc->Watch(cse);
|
||||||
return cse;
|
return cse;
|
||||||
@@ -3409,7 +3409,7 @@ namespace Tesses::CrossLang {
|
|||||||
cse->srcline = -1;
|
cse->srcline = -1;
|
||||||
cse->srcfile = "";
|
cse->srcfile = "";
|
||||||
cse->thread=nullptr;
|
cse->thread=nullptr;
|
||||||
GC* _gc = ls->GetGC();
|
std::shared_ptr<GC> _gc = ls->GetGC();
|
||||||
ls->Add(cse);
|
ls->Add(cse);
|
||||||
_gc->Watch(cse);
|
_gc->Watch(cse);
|
||||||
return cse;
|
return cse;
|
||||||
|
|||||||
Reference in New Issue
Block a user