Merge pull request #2759 from quantified-uncertainty/percentage-tagging

Tag percentages with certain format
quantified-uncertainty · Dec 18, 2023 · 3df0469 · 3df0469 · vercel · Dec 18, 2023
2 parents e681c2e + 24079c2
commit 3df0469
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.changeset/few-panthers-wonder.md b/.changeset/few-panthers-wonder.md
@@ -0,0 +1,5 @@
+---
+"@quri/squiggle-lang": patch
+---
+
+Tag percentates with percentage format
diff --git a/packages/squiggle-lang/__tests__/ast/parse_test.ts b/packages/squiggle-lang/__tests__/ast/parse_test.ts
@@ -48,7 +48,7 @@ describe("Peggy parse", () => {
   });
 
   describe("units", () => {
-    testEvalToBe("100%", "1");
+    testEvalToBe("100%", '1, with params numberFormat: ".2~p"');
     testEvalToBe("1-0%", "1");
   });
 

diff --git a/packages/squiggle-lang/src/fr/units.ts b/packages/squiggle-lang/src/fr/units.ts
@@ -1,6 +1,7 @@
 import { makeDefinition } from "../library/registry/fnDefinition.js";
-import { frNumber } from "../library/registry/frTypes.js";
+import { frForceBoxed, frNumber } from "../library/registry/frTypes.js";
 import { FnFactory } from "../library/registry/helpers.js";
+import { BoxedArgs } from "../value/boxed.js";
 
 const maker = new FnFactory({
   nameSpace: "",
@@ -10,24 +11,32 @@ const maker = new FnFactory({
 const makeUnitFn = (
   shortName: string,
   fullName: string,
-  multiplier: number
+  multiplier: number,
+  format?: string
 ) => {
   return maker.make({
-    output: "Number",
+    output: format ? "Boxed" : "Number",
     name: "fromUnit_" + shortName,
     description: `Unit conversion from ${fullName}.`,
     examples: [`3${shortName} // ${3 * multiplier}`],
     isUnit: true,
     definitions: [
-      makeDefinition([frNumber], frNumber, ([x]) => x * multiplier),
+      format
+        ? makeDefinition([frNumber], frForceBoxed(frNumber), ([x]) => {
+            return {
+              value: x * multiplier,
+              args: new BoxedArgs({ numberFormat: format }),
+            };
+          })
+        : makeDefinition([frNumber], frNumber, ([x]) => x * multiplier),
     ],
   });
 };
 
 export const library = [
   makeUnitFn("n", "nano", 1e-9),
   makeUnitFn("m", "mili", 1e-3),
-  makeUnitFn("%", "percent", 1e-2),
+  makeUnitFn("%", "percent", 1e-2, ".2~p"),
   makeUnitFn("k", "kilo", 1e3),
   makeUnitFn("M", "mega", 1e6),
   makeUnitFn("B", "billion", 1e9),