Adds support for %% and its derivatives

I'm assuming this handles operator overloading automatically. Nothin much else to say, outside that I needed to roll my own operation for this one, since float remainder is kinda hard to find (and I couldn't after cursory reading)
SpaceManiac · Oct 5, 2023 · 0a10a78 · 0a10a78
1 parent 6df1be0
commit 0a10a78
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/crates/dreammaker/src/ast.rs b/crates/dreammaker/src/ast.rs
@@ -113,6 +113,7 @@ pub enum BinaryOp {
     Div,
     Pow,
     Mod,
+    FloatMod,
     Eq,
     NotEq,
     Less,
@@ -142,6 +143,7 @@ impl fmt::Display for BinaryOp {
             Div => "/",
             Pow => "**",
             Mod => "%",
+            FloatMod => "%%",
             Eq => "==",
             NotEq => "!=",
             Less => "<",
@@ -172,6 +174,7 @@ pub enum AssignOp {
     MulAssign,
     DivAssign,
     ModAssign,
+    FloatModAssign,
     AssignInto,
     BitAndAssign,
     AndAssign,
@@ -192,6 +195,7 @@ impl fmt::Display for AssignOp {
             MulAssign => "*=",
             DivAssign => "/=",
             ModAssign => "%=",
+            FloatModAssign => "%%=",
             AssignInto => ":=",
             BitAndAssign => "&=",
             AndAssign => "&&=",
@@ -233,6 +237,7 @@ augmented! {
     Mul = MulAssign;
     Div = DivAssign;
     Mod = ModAssign;
+    FloatMod = FloatModAssign;
     BitAnd = BitAndAssign;
     BitOr = BitOrAssign;
     BitXor = BitXorAssign;

diff --git a/crates/dreammaker/src/constants.rs b/crates/dreammaker/src/constants.rs
@@ -684,6 +684,14 @@ impl<'a> ConstantFolder<'a> {
         numeric!(LessEq <=);
         numeric!(Greater >);
         numeric!(GreaterEq >=);
+        match (op, lhs, rhs) {
+            (BinaryOp::FloatMod, Float(lhs), Float(rhs)) => return Ok(Constant::from(lhs - ((lhs / rhs).floor() * rhs))),
+            (_, lhs_, rhs_) => {
+                lhs = lhs_;
+                rhs = rhs_;
+            }
+        }
+
         match (op, lhs, rhs) {
             (BinaryOp::Pow, Float(lhs), Float(rhs)) => return Ok(Constant::from(lhs.powf(rhs))),
             (_, lhs_, rhs_) => {

diff --git a/crates/dreammaker/src/lexer.rs b/crates/dreammaker/src/lexer.rs
@@ -75,6 +75,8 @@ table! {
     "##",  TokenPaste;
     "%",   Mod;
     "%=",  ModAssign;
+    "%%",  FloatMod;
+    "%%=", FloatModAssign;
     "&",   BitAnd;
     "&&",  And;
     "&&=", AndAssign;
@@ -278,6 +280,7 @@ impl Token {
                 Eq |
                 NotEq |
                 Mod |
+                FloatMod |
                 And |
                 BitAndAssign |
                 AndAssign |

diff --git a/crates/dreammaker/src/parser.rs b/crates/dreammaker/src/parser.rs
@@ -150,11 +150,12 @@ oper_table! { BINARY_OPS;
     Pow {
         (BinaryOp, Pow),
     }
-    // * / %
+    // * / % %%
     Mul {
         (BinaryOp, Mul), //
         (BinaryOp, Div = Slash), //
         (BinaryOp, Mod),
+        (BinaryOp, FloatMod),
     }
     // + -
     Add {
@@ -205,14 +206,15 @@ oper_table! { BINARY_OPS;
     Conditional {
         (TernaryOp, Conditional = QuestionMark),
     }
-    // = += -= -= *= /= %= &= |= ^= <<= >>=
+    // = += -= -= *= /= %= %%= &= |= ^= <<= >>=
     Assign {
         (AssignOp, Assign),
         (AssignOp, AddAssign),
         (AssignOp, SubAssign),
         (AssignOp, MulAssign),
         (AssignOp, DivAssign),
         (AssignOp, ModAssign),
+        (AssignOp, FloatModAssign),
         (AssignOp, BitAndAssign),
         (AssignOp, BitOrAssign),
         (AssignOp, BitXorAssign),
@@ -887,6 +889,10 @@ impl<'ctx, 'an, 'inp> Parser<'ctx, 'an, 'inp> {
             last_part.push('%');
         } else if self.exact(Punct(ModAssign))?.is_some() {
             last_part.push_str("%=");
+        } else if self.exact(Punct(FloatMod))?.is_some() {
+            last_part.push_str("%%");
+        } else if self.exact(Punct(FloatModAssign))?.is_some() {
+            last_part.push_str("%%=");
         } else if self.exact(Punct(BitAnd))?.is_some() {
             last_part.push('&');
         } else if self.exact(Punct(BitAndAssign))?.is_some() {