Merge branch 'master' into feat/gen_flow_chart

Author: CjiW

.config/nextest.toml

@@ -0,0 +1,3 @@
+[profile.ci]
+# Don't fail fast in CI to run the full test suite.
+fail-fast = false

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "04:00" # UTC
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "bump"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore(ci)"

.github/workflows/brew_release.yml

@@ -33,8 +33,8 @@ jobs:
 
           # Custom dependencies in case other formulas are needed to build the current one.
           # Optional - multiline string.
-          depends_on: |
-            "llvm@14"
+          # depends_on: |
+          #   "llvm@14"
           # Custom install command for your formula.
           # Required - string.
           install: |

.github/workflows/release.yml

@@ -50,19 +50,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache LLVM and Clang
-        id: cache-llvm
-        uses: actions/cache@v2
-        with:
-          path: ${{ runner.temp }}/llvm
-          key: llvm-14
-      - name: Install LLVM and Clang
-        if: ${{ matrix.config.os != 'windows-latest' }}
-        uses: KyleMayes/install-llvm-action@v1
-        with:
-          version: "14"
-          directory: ${{ runner.temp }}/llvm
-          cached: ${{ steps.cache-llvm.outputs.cache-hit }}
+      - name: Install LLVM
+        uses: Pivot-Studio/setup-llvm@main
 
       - name: set up win scoop
         if: ${{ matrix.config.os == 'windows-latest' }}
@@ -91,21 +80,18 @@ jobs:
         if: ${{ matrix.config.os == 'windows-latest' }}
         env:
           RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
-          LLVM_SYS_140_PREFIX: ${{ runner.temp }}\llvm
         run: cargo build --release --verbose
 
       - name: Cargo build
         if: ${{ matrix.config.os != 'windows-latest' }}
         env:
           RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
-          LLVM_SYS_140_PREFIX: ${{ runner.temp }}/llvm
         run: cargo build --release
 
       - name: Cargo build vm
         if: ${{ matrix.config.os != 'windows-latest' }}
         env:
           RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
-          LLVM_SYS_140_PREFIX: ${{ runner.temp }}/llvm
         run: cd vm && cargo build --release
 
       - run: mkdir -p ${{ matrix.config.dir }}

.github/workflows/test.yml

@@ -7,33 +7,136 @@ on:
     - '.github/workflows/**.yml'
     - '**.pi'
     - '**/Kagari.*'
+    - 'codecov.yml'
   push:
     branches:
       - "master"
       - "release/*"
       - "staging"
       - "trying"
 
+env:
+  RUSTFLAGS: -Dwarnings
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  container-test-job:
+  check:
+    name: Check
     runs-on: ubuntu-latest
-    container:
-      image: registry.cn-hangzhou.aliyuncs.com/pivotstudio/rust-pl:latest
-      options: --security-opt seccomp=unconfined
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-      - name: auto test
+          submodules: true
+
+      - name: Install packages
         run: |
-          export KAGARI_LIB_ROOT=$(pwd)/planglib
-          cargo test --all
-          bash -c 'for file in target/debug/deps/plc-*; do [ -x "$file" ] || continue; mkdir -p "target/cov/$(basename $file)"; /kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done'
-          bash -c 'for file in target/debug/deps/vm-*; do [ -x "$file" ] || continue; mkdir -p "target/cov/$(basename $file)"; /kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done'
-          ls target/cov/
-      - uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODE_COV }} # not required for public repos
-          name: codecov-umbrella # optional
-          fail_ci_if_error: true # optional (default = false)
-          verbose: true # optional (default = false)
+          sudo apt-get update
+          sudo apt-get install libasound2-dev libudev-dev
+
+      - name: Install Rust (stable)
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+
+      - name: Install LLVM
+        uses: Pivot-Studio/setup-llvm@main
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --all-targets
+
+  test:
+    name: Test Rust
+    runs-on: ${{ matrix.os }}
+    needs: check
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macOS-latest"]
+        include:
+          - RUSTFLAGS: "-Dwarnings"
+            CARGO_INCREMENTAL: 1
+            CARGO_TARGET_DIR: "target"
+            KAGARI_LIB_ROOT: /planglib
+            PL_ROOT: /target/release/
+          - os: "windows-latest"
+            RUSTFLAGS: "-Dwarnings -Ctarget-feature=+crt-static"
+            CARGO_INCREMENTAL: 0
+            CARGO_TARGET_DIR: "C:\\cargo-target-dir"
+            KAGARI_LIB_ROOT: \planglib
+            PL_ROOT: \target\release
+    env:
+      RUSTFLAGS: ${{ matrix.RUSTFLAGS }}
+      CARGO_INCREMENTAL: ${{ matrix.CARGO_INCREMENTAL }}
+      # Disable generating debug info, we don't need it here anyway and its only using disk space
+      CARGO_PROFILE_DEV_DEBUG: 0
+      CARGO_TARGET_DIR: ${{ matrix.CARGO_TARGET_DIR }}
+      KAGARI_LIB_ROOT: ${{ github.workspace }}${{ matrix.KAGARI_LIB_ROOT }}
+      PL_ROOT: ${{ github.workspace }}${{ matrix.PL_ROOT }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install LLVM
+        uses: Pivot-Studio/setup-llvm@main
+
+      - name: Install packages
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install libasound2-dev libudev-dev
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+          components: rustfmt, llvm-tools-preview
+
+      - uses: actions/cache@v3
+        name: Cache Cargo
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Install latest llvm-cov release
+        uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: Install latest nextest release
+        uses: taiki-e/install-action@nextest
+
+      - name: build vm release
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --manifest-path vm/Cargo.toml --release --target-dir target
+
+      - name: Test with latest nextest release
+        uses: actions-rs/cargo@v1
+        with:
+          command: llvm-cov
+          args: nextest --all-features --workspace --lcov --output-path lcov.info --profile ci
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODE_COV }}
+          files: lcov.info
+          name: ${{ matrix.os }}
+          fail_ci_if_error: true
+          verbose: true

.gitignore

@@ -19,4 +19,7 @@ out.*
 *out
 *.dSYM
 *.dot
-dots
+dots
+.DS_Store
+!7zr.exe
+*.info

Cargo.lock

@@ -7,12 +7,13 @@ authors = ["The pivot-lang Authors"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm14-0"] }
+inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm14-0", "no-libffi-linking"] }
 indexmap = "1.9.2"
 lazy_static = "1.4.0"
 paste = "1.0"
 llvm-sys = "140"
 internal_macro = { path = "./internal_macro" }
+pl_linker = { path = "./pl_linker" }
 vm = { path = "./vm", optional = true, features = ["jit"] }
 nom_locate = "4.0.0"
 rowan = "0.15.10"
@@ -52,5 +53,6 @@ path = "src/main.rs"
 members = [
     "internal_macro",
     "vm",
+    "pl_linker",
 ]
 

Cargo.toml

@@ -1,12 +1,12 @@
 .PHONY: devlinux devmac vm install fmt test clean
 devlinux:
-	@echo "KAGARI_LIB_ROOT=$(pwd)/planglib">>~/.bashrc
-	@echo "PL_ROOT=$(pwd)/target/release/">>~/.bashrc
+	@echo "export KAGARI_LIB_ROOT=$(pwd)/planglib">>~/.bashrc
+	@echo "export PL_ROOT=$(pwd)/target/release/">>~/.bashrc
 	@echo "请重启终端和vsc应用更改"
 
 devmac:
-	@echo "KAGARI_LIB_ROOT=$(pwd)/planglib">>~/.bash_profile
-	@echo "PL_ROOT=$(pwd)/target/release/">>~/.bash_profile
+	@echo "export KAGARI_LIB_ROOT=$(pwd)/planglib">>~/.bash_profile
+	@echo "export PL_ROOT=$(pwd)/target/release/">>~/.bash_profile
 	@echo "请重启终端和vsc应用更改"
 
 vm: