Flattening

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  push:
+    paths:
+      - "src/**"
+      - "tests/**"
+      - "features/**"
+      - "Cargo.*"
+      - ".rustfmt.toml"
+      - "README.md"
+      - ".github/workflows/ci.yml"
+
+env:
+  # We use environment variables to specify the Rust version and other settings once
+  RUST_TOOLCHAIN: 1.94.0
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Lint & Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: rustfmt clippy
+
+      - name: Check formatting
+        run: cargo fmt -- --check
+
+      - name: Run clippy
+        run: cargo clippy --all-targets -- -D warnings
+
+      - name: Run tests
+        run: cargo test

Cargo.toml

@@ -1,10 +1,31 @@
-[workspace]
-resolver = "2"
+[package]
+name = "flt"
+version = "0.0.2"
+edition = "2021"
+description = "a 'lite' functional language"
+license = "MIT"
 
-members = [
-  "flt",
-  "flt-cli"
-]
+[dependencies]
+bigdecimal = "0.4"
+env_logger = "0.11.6"
+log = "0.4.22"
+nom = "8.0.0"
+regex = "1.11.1"
+thiserror = "2.0.9"
+clap = { version = "4.5.23", features = ["cargo", "derive"] }
+rustyline = "17.0"
+eyre = "0.6.12"
+
+[dev-dependencies]
+bigdecimal = "0.4"
+ctor = "0.6.3"
+cucumber = "0.22.1"
+tokio = { version = "1.42.0", features = ["full"] }
+futures = "0.3.31"
+
+[[test]]
+name = "features"
+harness = false
 
 [workspace.lints.clippy]
 unwrap_used = "deny"

flt-cli/src/main.rs → src/bin/flt.rs

@@ -1,8 +1,6 @@
-mod eval;
-
 use std::process::ExitCode;
 
-use eval::eval;
+use flt::eval::eval;
 use flt::parser::parse_expr;
 use rustyline::error::ReadlineError;
 use rustyline::DefaultEditor;

flt-cli/src/eval/mod.rs → src/eval/mod.rs

@@ -1,11 +1,11 @@
+use crate::ast::BinaryOp;
+use crate::ast::Expr;
+use crate::ast::Literal;
+use crate::ast::UnaryOp;
+use crate::errors::Error;
+use crate::errors::RuntimeError;
+use crate::utils::escape_string;
 use bigdecimal::BigDecimal;
-use flt::ast::BinaryOp;
-use flt::ast::Expr;
-use flt::ast::Literal;
-use flt::ast::UnaryOp;
-use flt::errors::Error;
-use flt::errors::RuntimeError;
-use flt::utils::escape_string;
 
 pub fn eval(expr: &Expr) -> Result<String, Error> {
     let lit = eval_to_literal(expr)?;
@@ -131,11 +131,11 @@ fn binary_string(l: &Literal, r: &Literal) -> Result<Literal, Error> {
 
 #[cfg(test)]
 mod tests {
-    use flt::ast::BinaryOp;
-    use flt::ast::Expr;
-    use flt::ast::UnaryOp;
-    use flt::errors::Error;
-    use flt::errors::RuntimeError;
+    use crate::ast::BinaryOp;
+    use crate::ast::Expr;
+    use crate::ast::UnaryOp;
+    use crate::errors::Error;
+    use crate::errors::RuntimeError;
 
     use super::eval;
 

flt/src/lib.rs → src/lib.rs

@@ -1,6 +1,7 @@
-#[doc = include_str!("../../README.md")]
+#[doc = include_str!("../README.md")]
 pub mod ast;
 pub mod errors;
+pub mod eval;
 pub mod parser;
 pub mod utils;