Merge pull request #1 from vic1707/pemdas/pejmdas

Pemdas/pejmdas

.github/workflows/fmt&lint.yml

@@ -22,5 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install Rust
         uses: IronCoreLabs/rust-toolchain@v1
-      - name: Rust clippy
-        run: cargo clippy --all --all-targets
+      - name: Rust clippy (default features, currently `pemdas`)
+        run: cargo clippy
+      - name: Rust clippy (`pejmdas` feature)
+        run: cargo clippy --no-default-features --features pejmdas

.github/workflows/tests.yml

@@ -13,5 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install Rust
         uses: IronCoreLabs/rust-toolchain@v1
-      - name: Run tests
-        run: cargo test --workspace
+      - name: Run tests (default features, currently `pemdas`)
+        run: cargo test
+      - name: Run tests (`pejmdas` feature)
+        run: cargo test --no-default-features --features pejmdas

Cargo.toml

@@ -12,3 +12,8 @@ thiserror = "1.0.48"
 [[bin]]
 name = "repl"
 path = "src/bin/repl.rs"
+
+[features]
+default = ["pemdas"]
+pemdas = []
+pejmdas = []

src/element/binop.rs

@@ -16,11 +16,18 @@ impl<'a> BinOp<'a> {
         Self { op, lhs, rhs }
     }
 
+    #[cfg(feature = "pejmdas")]
+    pub const IMPLICIT_MULTIPLICATION_PRECEDENCE: usize = 3;
+    #[cfg(feature = "pemdas")]
+    pub const IMPLICIT_MULTIPLICATION_PRECEDENCE: usize =
+        Self::precedence(&Operator::Times);
+
     pub const fn precedence(op: &Operator) -> usize {
         match *op {
             Operator::Plus | Operator::Minus => 1,
             Operator::Times | Operator::Divide | Operator::Modulo => 2,
-            Operator::Power => 3,
+            // uses `4` because `pejmdas` feature uses `3`
+            Operator::Power => 4,
         }
     }
 }

src/lib.rs

@@ -11,3 +11,11 @@ mod token;
 mod tests;
 /* Exports */
 pub use parser::{Error, ErrorKind, Parser};
+
+/* Feature safety */
+#[cfg(all(feature = "pemdas", feature = "pejmdas"))]
+compile_error!(
+    "You can't enable both features `pemdas` and `pejmdas` at the same time."
+);
+#[cfg(not(any(feature = "pemdas", feature = "pejmdas")))]
+compile_error!("You must enable either feature `pemdas` or `pejmdas`.");

src/parser.rs

@@ -207,7 +207,7 @@ impl ParserImpl<'_> {
 
         #[allow(clippy::items_after_statements)]
         const TIMES_INFOS: (Operator, usize) =
-            (Operator::Times, BinOp::precedence(&Operator::Times));
+            (Operator::Times, BinOp::IMPLICIT_MULTIPLICATION_PRECEDENCE);
         match current_byte {
             // if multiplication precedence is lower than current precedence
             // we now we don't need implicit multiplication

src/tests/parser/implicit_multiplication.rs

@@ -1,15 +1,32 @@
 /* Crate imports */
 use crate::Parser;
 
-const IMPLICIT_MULTIPLICATIONS: [(&str, &str); 8] = [
+#[cfg(feature = "pemdas")]
+const IMPLICIT_MULTIPLICATIONS: [(&str, &str); 9] = [
     ("2(3)", "2*(3)"),
     ("2(3+4)", "2*(3+4)"),
     ("2 (3+4)5", "2*(3+4)*5"),
     ("2 (3+4) 5", "2*(3+4)*5"),
+    ("2(3+4)(5+6)", "2*(3+4)*(5+6)"),
+    ("2x + 3 x y", "2*x + 3*x*y"),
+    ("12 + 3-1x+3y x", "12 + 3-1*x+3*y*x"),
+    // These ones are different for the `pejmdas` feature
     ("6/2(2+1)", "6/2*(2+1)"),
+    ("1/2x", "(1/2)*x"),
+];
+
+#[cfg(feature = "pejmdas")]
+const IMPLICIT_MULTIPLICATIONS: [(&str, &str); 9] = [
+    ("2(3)", "2*(3)"),
+    ("2(3+4)", "2*(3+4)"),
+    ("2 (3+4)5", "2*(3+4)*5"),
+    ("2 (3+4) 5", "2*(3+4)*5"),
     ("2(3+4)(5+6)", "2*(3+4)*(5+6)"),
     ("2x + 3 x y", "2*x + 3*x*y"),
     ("12 + 3-1x+3y x", "12 + 3-1*x+3*y*x"),
+    // These ones are different for the `pemdas` feature
+    ("6/2(2+1)", "6/(2*(2+1))"),
+    ("1/2x", "1/(2*x)"),
 ];
 
 #[test]