Flaten project structure (#20)

Author: 0xGeorgii

.github/workflows/build.yml

@@ -7,46 +7,14 @@ on:
   pull_request:
     branches:
       - main
-# change to repeat for two directories ./infc_compiler and ./infc
 jobs:
-  build_infc_compiler:
-    name: Build and test infc_compiler
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        toolchain:
-          - nightly
-    defaults:
-      run:
-        working-directory: ./infc_compiler
-    steps:
-      - name: Setup Rust
-        uses: actions/checkout@v4.1.3
-      - name: Update Rust
-        run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
-      - name: Install clippy nightly
-        run: rustup component add clippy-preview
-      - name: Install Cargo audit
-        run: cargo install cargo-audit
-      - name: Build
-        run: cargo build --verbose
-      - name: Test
-        run: cargo test --verbose
-      - name: Clippy
-        run: cargo clippy --verbose -- -D warnings
-      - name: Audit
-        run: cargo audit
-
-  build_infc:
+  build:
     name: Build and test infc
     runs-on: ubuntu-latest
     strategy:
       matrix:
         toolchain:
           - nightly
-    defaults:
-      run:
-        working-directory: ./infc
     steps:
       - name: Setup Rust
         uses: actions/checkout@v4.1.3

.vscode/settings.json

@@ -1,7 +1,11 @@
 {
     "rust-analyzer.linkedProjects": [
-        "./infc_compiler/Cargo.toml",
-        "./infc/Cargo.toml",
-        "./tests/Cargo.toml"
+        "./inference/Cargo.toml",
+        "./ast/Cargo.toml",
+        "./cli/Cargo.toml",
+        "./wasm-coq-translator/Cargo.toml",
+        "./wat-codegen/Cargo.toml",
+        "./tests/Cargo.toml",
+        "./playground-server/Cargo.toml"
     ]
 }

Cargo.toml

@@ -0,0 +1,33 @@
+[workspace]
+
+resolver = "2"
+
+members = [
+    "ast",
+    "cli",
+    "wasm-coq-translator",
+    "wat-codegen",
+    "inference",
+    "tests",
+    "playground-server",
+]
+
+exclude = ["riscv-runtime"]
+
+[workspace.package]
+version = "0.0.1"
+edition = "2021"
+license = "GPL-3.0"
+homepage = "https://inferara.com"
+repository = "https://github.com/Inferara/inference"
+
+[workspace.dependencies]
+inference = { path = "./inference", version = "0.0.1" }
+inference-ast = { path = "./ast", version = "0.0.1" }
+inference-cli = { path = "./cli", version = "0.0.1" }
+inference-wasm-coq-translator = { path = "./wasm-coq-translator", version = "0.0.1" }
+inference-wat-codegen = { path = "./wat-codegen", version = "0.0.1" }
+inference-tests = { path = "./tests", version = "0.0.1" }
+inference-playground-server = { path = "./playground-server", version = "0.0.1" }
+tree-sitter = ">=0.22.6"
+tree-sitter-inference = "0.0.28"

ast/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "inference-ast"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+
+[dependencies]
+tree-sitter = ">=0.22.6"

infc_compiler/src/ast/builder.rs ast/src/builder.rsinfc_compiler/src/ast/builder.rs renamed to ast/src/builder.rs

@@ -1,6 +1,6 @@
 #![warn(clippy::pedantic)]
 
-use crate::ast::types::{
+use crate::types::{
     ArrayIndexAccessExpression, ArrayLiteral, AssertStatement, AssignExpression, BinaryExpression,
     Block, BoolLiteral, BreakStatement, ConstantDefinition, Definition, EnumDefinition, Expression,
     ExpressionStatement, ExternalFunctionDefinition, FunctionCallExpression, FunctionDefinition,

infc_compiler/src/ast/mod.rs ast/src/lib.rsinfc_compiler/src/ast/mod.rs renamed to ast/src/lib.rs

@@ -0,0 +1,16 @@
+[package]
+name = "inrence-cli"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+
+[dependencies]
+clap = { version = "4.5.15", features = ["derive"] }
+walkdir = "2.5.0"
+tempfile = "3"
+tree-sitter.workspace = true
+tree-sitter-inference.workspace = true
+inference-ast.workspace = true
+inference-wasm-coq-translator.workspace = true

infc_compiler/src/ast/types.rs ast/src/types.rsinfc_compiler/src/ast/types.rs renamed to ast/src/types.rs

@@ -30,9 +30,8 @@
 
 mod parser;
 use clap::Parser;
-use infc_compiler::ast::{builder::build_ast, types::SourceFile};
-use infc_compiler::wasm_to_coq_translator;
-use infc_compiler::wasm_to_coq_translator::translator::WasmModuleParseError;
+use inference_ast::{builder::build_ast, types::SourceFile};
+use inference_wasm_coq_translator::translator::WasmModuleParseError;
 use parser::Cli;
 use std::{fs, path::Path, process};
 use walkdir::WalkDir;
@@ -134,7 +133,8 @@ fn wasm_bytes_to_coq_file(
     sub_path: Option<&Path>,
     filename: &String,
 ) -> Result<String, String> {
-    let coq = wasm_to_coq_translator::wasm_parser::translate_bytes(filename, bytes.as_slice());
+    let coq =
+        inference_wasm_coq_translator::wasm_parser::translate_bytes(filename, bytes.as_slice());
 
     if let Err(e) = coq {
         let WasmModuleParseError::UnsupportedOperation(error_message) = e;
@@ -180,7 +180,7 @@ mod test {
 
         let bytes = std::fs::read(absolute_path).unwrap();
         let mod_name = String::from("index");
-        let coq = crate::wasm_to_coq_translator::wasm_parser::translate_bytes(
+        let coq = inference_wasm_coq_translator::wasm_parser::translate_bytes(
             &mod_name,
             bytes.as_slice(),
         );