Extend string objects (#201)

* Upgrade to Antlr 4.11.0 * Upgrade to Antlr 4.11.1 and LLVM 15.0.0 * Fix bug and update test refs * Extend * Better management of dtor calls * Fix test * Update test ref * Use gcc 12 for CI and publish workflows
spicelang · Sep 12, 2022 · 90e6dec · 90e6dec
1 parent cfc1f08
commit 90e6dec
Show file tree

Hide file tree

Showing 125 changed files with 2,979 additions and 2,631 deletions.
diff --git a/.github/workflows/ci-cpp.yml b/.github/workflows/ci-cpp.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build:
     name: C++ CI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
@@ -24,10 +24,10 @@ jobs:
           distribution: zulu
           java-version: 11
 
-      - name: Setup latest GCC and build dependencies
+      - name: Setup latest Clang and build dependencies
         run: |
-          sudo apt install gcc-11 g++-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11 --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-11 --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-11
+          sudo apt install gcc-12 g++-12
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 110 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12 --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-12 --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-12
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -43,14 +43,14 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/work/spice/llvm
-          key: llvm-15.0.0-rc3
+          key: llvm-15.0.0
 
       - name: Setup LLVM
         if: steps.cache-llvm.outputs.cache-hit != 'true'
         run: |
           cd ..
           rm -rf llvm
-          git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project llvm
+          git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project llvm
           mkdir ./llvm/build
           cd ./llvm/build
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS_RELEASE="-O2" -GNinja ../llvm

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   analyze-cpp:
     name: Analyze C++ Code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -41,13 +41,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/work/spice/llvm
-          key: 15.0.0-rc3
+          key: 15.0.0
 
       - name: Setup LLVM
         if: steps.cache-llvm.outputs.cache-hit != 'true'
         run: |
           cd ..
-          git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project llvm
+          git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project llvm
           mkdir ./llvm/build
           cd ./llvm/build
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS_RELEASE="-O2" -GNinja ../llvm

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   docs-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -29,4 +29,4 @@ jobs:
 
       - name: Build and deploy
         working-directory: docs
-        run: mkdocs gh-deploy --force
+        run: mkdocs gh-deploy --force
diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml
@@ -10,11 +10,11 @@ on:
 
 jobs:
   spellcheck:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
+
       - name: Misspell
         uses: reviewdog/action-misspell@v1
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-compiler-linux:
     name: Build compiler binaries - Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
@@ -30,8 +30,8 @@ jobs:
 
       - name: Setup latest GCC and build dependencies
         run: |
-          sudo apt install gcc-11 g++-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11 --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-11 --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-11
+          sudo apt install gcc-12 g++-12
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 110 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12 --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-12 --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-12
 
       - name: Setup Ninja
         uses: seanmiddleditch/gha-setup-ninja@master
@@ -44,12 +44,12 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/work/spice/spice/llvm
-          key: llvm-15.0.0-rc3-linux-x64
+          key: llvm-15.0.0-linux-x64
 
       - name: Setup LLVM
         if: steps.cache-llvm.outputs.cache-hit != 'true'
         run: |
-          git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project.git llvm
+          git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project.git llvm
           mkdir ./llvm/build
           cd ./llvm/build
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS_RELEASE="-O2" -GNinja -Wno-dev -Wattributes ../llvm
@@ -109,9 +109,9 @@ jobs:
           choco uninstall llvm --all-versions
           Remove-Item -Recurse -Force C:/Strawberry
           echo "Uninstalling done."
-          Invoke-WebRequest https://chillibits.com/files/gh/mingw64_12_1_0.zip -OutFile mingw64.zip
+          Invoke-WebRequest https://chillibits.com/files/gh/mingw64_12_2_0.7z -OutFile mingw64.7z
           echo "Downloading done."
-          7z x mingw64.zip -oC:\mingw64
+          7z x mingw64.7z -oC:\mingw64
           echo "Unpacking done."
           Copy-Item -Path C:\mingw64\mingw64\bin\mingw32-make.exe -Destination C:\mingw64\mingw64\bin\make.exe
           echo "All done."
@@ -124,12 +124,12 @@ jobs:
         uses: actions/cache@v3
         with:
           path: D:/a/spice/spice/llvm
-          key: llvm-15.0.0-rc3-win-x64
+          key: llvm-15.0.0-win-x64
 
       - name: Setup LLVM
         if: steps.cache-llvm.outputs.cache-hit != 'true'
         run: |
-          git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project.git llvm
+          git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project.git llvm
           setx /M PATH "%PATH%;C:\mingw64\mingw64\bin"
           $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
           echo "Adding MinGW to path done."
@@ -259,6 +259,7 @@ jobs:
 
       - name: Deploy to Debian / Raspbian repo
         run: |
+          curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/debian-bookworm/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/debian-bullseye/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/debian-buster/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/debian-stretch/"
@@ -273,6 +274,7 @@ jobs:
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-bionic/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-xenial/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-trusty/"
+          curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./spice_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-jammy/"
 
       - name: Deploy to CentOS repo
         run: |

diff --git a/.run/Spice_run.run.xml b/.run/Spice_run.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Spice_run" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="run -O2 ../../media/test-project/os-test.spice" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="Spice_run" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="Spice_run">
+  <configuration default="false" name="Spice_run" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="run -O2 -ir ../../media/test-project/os-test.spice" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="Spice_run" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="Spice_run">
     <envs>
       <env name="RUN_TESTS" value="OFF" />
       <env name="SPICE_STD_DIR" value="$PROJECT_DIR$/std" />

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s -O2")
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/cmake)
 add_definitions(-DANTLR4CPP_STATIC)
 include(ExternalAntlr4Cpp)
-set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/antlr-4.10.1-complete.jar)
+set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/antlr-4.11.1-complete.jar)
 
 # Find Google Test
 add_subdirectory(lib/googletest)

diff --git a/dev-setup.bat b/dev-setup.bat
@@ -27,7 +27,7 @@ echo done.
 
 REM - Clone LLVM
 echo [Step 2] Cloning LLVM (Could take a while) ...
-git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project llvm
+git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project llvm
 echo done.
 
 REM - Build LLVM

diff --git a/dev-setup.sh b/dev-setup.sh
@@ -10,13 +10,12 @@ colored_echo() {
 colored_echo "[Step 1] Installing dependencies via Linux packages (Could take a while) ... "
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt update -y
-sudo apt-get install -y cmake make ninja-build uuid-dev openjdk-11-jre-headless gcc-11 g++-11
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11 --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-11 --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-11
+sudo apt-get install -y cmake make ninja-build uuid-dev openjdk-11-jre-headless
 colored_echo "done."
 
 # Clone LLVM
 colored_echo "[Step 2] Cloning LLVM (Could take a while) ... "
-git clone --depth 1 --branch llvmorg-15.0.0-rc3 https://github.com/llvm/llvm-project llvm
+git clone --depth 1 --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project llvm
 colored_echo "done."
 
 # Build LLVM

diff --git a/docs/docs/language/enums.md b/docs/docs/language/enums.md
@@ -2,7 +2,7 @@
 title: Enumerations
 ---
 
-Enumerations in spice work like this:
+Enumerations in Spice work like this:
 
 ```spice
 type Fruit enum {

diff --git a/media/setup-guide-windows.md b/media/setup-guide-windows.md
@@ -1,5 +1,5 @@
 # Setup Guide for Windows
 
-- Download and install MinGW64 from [here](https://winlibs.com/)
+- Download and install MinGW64 with LLVM from [here](https://winlibs.com/)
 - Build LLVM with the included GCC version
 - Delete CMake output directories in Spice project and re-build Spice
diff --git a/media/test-project/os-test.spice b/media/test-project/os-test.spice
@@ -1,3 +1,7 @@
+f<int> main() {
+    printf("Test: %s", "Hi " + "World!");
+}
+
 /*import "std/data/vector" as vec;
 import "std/data/pair" as pair;
 
@@ -17,10 +21,34 @@ f<int> main() {
     server.serve("/test", "Hello World!");
 }*/
 
-import "std/runtime/string_rt" as _rt_str;
+/*import "std/runtime/string_rt" as _rt_str;
+
+f<int> main() {
+    //_rt_str::String s = _rt_str::String("Test");
+    //printf("%s", s.getRaw());
+     // Plus
+    printf("Result: %s\n", "Hello " + "World!");
+    string s1 = "Hello " + "World!";
+    printf("Result: %s\n", s1);
+    // Mul
+    printf("Result: %s\n", 4s * "Hi");
+    string s2 = "Hello " * 5;
+    printf("Result: %s\n", s2);
+    printf("Result: %s\n", 20 * 'a');
+    string s3 = 2 * 'c' * 7;
+    printf("Result: %s\n", s3);
+    //printf("%s", s1 + s2);
+}*/
+
+/*public f<int> src(int x, int y) {
+    return x + (x | -x);
+}
+
+public f<int> tgt(int x) {
+    return x & (x - 1);
+}
 
 f<int> main() {
-    string s = "Test";
-    s *= 3;
-    printf("%s", s);
-}
+    printf("Src: %d\n", src(21, 10));
+    printf("Tgt: %d\n", tgt(21));
+}*/
diff --git a/setup-libs.bat b/setup-libs.bat
@@ -3,7 +3,7 @@
 mkdir lib
 pushd lib
 
-git clone --depth 1 --branch 4.10.1 https://github.com/antlr/antlr4.git
+git clone --depth 1 --branch 4.11.1 https://github.com/antlr/antlr4.git
 
 git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest.git
 

diff --git a/setup-libs.sh b/setup-libs.sh
@@ -3,7 +3,7 @@
 mkdir lib
 cd lib || exit
 
-git clone --depth 1 --branch 4.10.1 https://github.com/antlr/antlr4.git
+git clone --depth 1 --branch 4.11.1 https://github.com/antlr/antlr4.git
 
 git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest.git