divide money by int

bcpeinhardt · Nov 29, 2024 · 624b088 · 624b088
1 parent cc8e12c
commit 624b088
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/priv/static/squared_away.mjs b/priv/static/squared_away.mjs
@@ -5458,7 +5458,7 @@ function value_to_string(fv) {
     return "Test Passing";
   } else {
     let dollars = fv.cents;
-    let str = "$" + to_string9(dollars, 100, true);
+    let str = "$" + to_string9(dollars, 2, true);
     let $ = split_once2(str, ".");
     if (!$.isOk() && !$[0]) {
       return str + ".00";
@@ -5756,6 +5756,12 @@ function interpret(loop$env, loop$expr) {
                 let d = lhs2.cents;
                 let p2 = rhs2.percent;
                 return new Ok(new Usd(divide2(d, p2)));
+              } else if (lhs2 instanceof Usd && op instanceof Divide && rhs2 instanceof Integer) {
+                let d = lhs2.cents;
+                let p2 = rhs2.n;
+                return new Ok(
+                  new Usd(divide2(d, from_int(p2)))
+                );
               } else if (lhs2 instanceof Usd && op instanceof Minimum && rhs2 instanceof Usd) {
                 let d = lhs2.cents;
                 let p2 = rhs2.cents;
@@ -5828,7 +5834,7 @@ function interpret(loop$env, loop$expr) {
               throw makeError(
                 "let_assert",
                 "squared_away/squared_away_lang/interpreter",
-                225,
+                228,
                 "",
                 "Pattern match failed, no pattern matched the value.",
                 { value: v }
@@ -5849,7 +5855,7 @@ function interpret(loop$env, loop$expr) {
               throw makeError(
                 "let_assert",
                 "squared_away/squared_away_lang/interpreter",
-                233,
+                236,
                 "",
                 "Pattern match failed, no pattern matched the value.",
                 { value: v }
@@ -5870,7 +5876,7 @@ function interpret(loop$env, loop$expr) {
               throw makeError(
                 "let_assert",
                 "squared_away/squared_away_lang/interpreter",
-                241,
+                244,
                 "",
                 "Pattern match failed, no pattern matched the value.",
                 { value: v }
@@ -5940,7 +5946,7 @@ function interpret(loop$env, loop$expr) {
                 throw makeError(
                   "let_assert",
                   "squared_away/squared_away_lang/interpreter",
-                  282,
+                  285,
                   "",
                   "Pattern match failed, no pattern matched the value.",
                   { value: v }
@@ -5966,7 +5972,7 @@ function interpret(loop$env, loop$expr) {
                 throw makeError(
                   "let_assert",
                   "squared_away/squared_away_lang/interpreter",
-                  293,
+                  296,
                   "",
                   "Pattern match failed, no pattern matched the value.",
                   { value: v }
@@ -5987,7 +5993,7 @@ function interpret(loop$env, loop$expr) {
               throw makeError(
                 "let_assert",
                 "squared_away/squared_away_lang/interpreter",
-                303,
+                306,
                 "",
                 "Pattern match failed, no pattern matched the value.",
                 { value: v }

diff --git a/src/squared_away/squared_away_lang/interpreter.gleam b/src/squared_away/squared_away_lang/interpreter.gleam
@@ -177,6 +177,9 @@ pub fn interpret(
         value.Usd(d), expr.Divide, value.Percent(p) -> {
           Ok(value.Usd(rational.divide(d, p)))
         }
+        value.Usd(d), expr.Divide, value.Integer(p) -> {
+          Ok(value.Usd(rational.divide(d, rational.from_int(p))))
+        }
         value.Usd(d), expr.Minimum, value.Usd(p) -> {
           Ok(value.Usd(rational.min(d, p)))
         }

diff --git a/src/squared_away/squared_away_lang/interpreter/value.gleam b/src/squared_away/squared_away_lang/interpreter/value.gleam
@@ -33,7 +33,7 @@ pub fn value_to_string(fv: Value) -> String {
     TestFail -> "Test Failure"
     TestPass -> "Test Passing"
     Usd(dollars) -> {
-      let str = "$" <> rational.to_string(dollars, 100, True)
+      let str = "$" <> rational.to_string(dollars, 2, True)
       case string.split_once(str, ".") {
         Error(Nil) -> str <> ".00"
         Ok(#(_, cents)) -> {