✨ Added percentNum

dist/index.es.js

@@ -4372,15 +4372,29 @@ const parser = {};
 const innerChilds = (node = {}) => {
   return node.child(1).child(0).children;
 };
-parse$1.literal = (literal = {}) => {
-  const { ctorName, sourceString } = literal.child(0);
+const round = (n, decimals = 14) => {
+  if (n == null)
+    return n;
+  const k = Math.pow(10, decimals);
+  const res = Math.round(n * k) / k;
+  return res === 0 ? 0 : res;
+};
+parse$1.numericLiteral = (sourceString) => {
+  if (sourceString.endsWith("%")) {
+    const n = Number(sourceString.replace("%", ""));
+    return round(n * 0.01);
+  }
+  return Number(sourceString);
+};
+parse$1.literal = (node = {}) => {
+  const { ctorName, sourceString } = node.child(0);
   switch (ctorName) {
     case "nullLiteral":
       return null;
     case "booleanLiteral":
       return sourceString === "true";
     case "numericLiteral":
-      return Number(sourceString);
+      return parse$1.numericLiteral(sourceString);
     case "stringLiteral":
       return sourceString.slice(1, -1);
   }
@@ -4598,14 +4612,15 @@ var grammar = `mationGrammar {
   // Note that the ordering of hexNum and decimalNum is reversed w.r.t. the spec
   // This is intentional: the order decimalNum | hexNum will parse
   // "0x..." as a decimal literal "0" followed by "x..."
-  numericLiteral = "-"? (octalNum | hexNum | decimalNum)
+  numericLiteral = "-"? (percentNum | octalNum | hexNum | decimalNum)
   decimalNum = integer "." decimalDigit* exponentPart -- bothParts
              |         "." decimalDigit+ exponentPart -- decimalsOnly
              | integer                   exponentPart -- integerOnly
   integer = nonZeroDigit decimalDigit*  -- nonZero
           | "0"                         -- zero
   hexNum = "0x" hexDigit+
          | "0X" hexDigit+
+  percentNum = decimalNum "%"
   // hexDigit defined in Ohm's built-in rules (otherwise: hexDigit = "0".."9" | "a".."f" | "A".."F")
   octalNum = "0" octalDigit+
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mation-spec",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Readable Configuration Specification Format for Automation and Task Runners",
   "packageManager": "[email protected]",
   "main": "./dist/index.umd.js",

src/mationGrammar.ohm

@@ -114,14 +114,15 @@ mationGrammar {
   // Note that the ordering of hexNum and decimalNum is reversed w.r.t. the spec
   // This is intentional: the order decimalNum | hexNum will parse
   // "0x..." as a decimal literal "0" followed by "x..."
-  numericLiteral = "-"? (octalNum | hexNum | decimalNum)
+  numericLiteral = "-"? (percentNum | octalNum | hexNum | decimalNum)
   decimalNum = integer "." decimalDigit* exponentPart -- bothParts
              |         "." decimalDigit+ exponentPart -- decimalsOnly
              | integer                   exponentPart -- integerOnly
   integer = nonZeroDigit decimalDigit*  -- nonZero
           | "0"                         -- zero
   hexNum = "0x" hexDigit+
          | "0X" hexDigit+
+  percentNum = decimalNum "%"
   // hexDigit defined in Ohm's built-in rules (otherwise: hexDigit = "0".."9" | "a".."f" | "A".."F")
   octalNum = "0" octalDigit+
 

src/parser.js

@@ -9,15 +9,31 @@ const innerChilds = (node={}) => {
   return node.child(1).child(0).children // child(1) left-terminal, eg. [, {, <, (
 }
 
-parse.literal = (literal={}) => {
-  const { ctorName, sourceString } = literal.child(0)
+export const round = (n, decimals=14) => {
+  if (n == null)
+    return n
+  const k = Math.pow(10, decimals)
+  const res = Math.round(n * k) / k
+  return res === 0 ? 0 : res // no -0
+}
+
+parse.numericLiteral = (sourceString) => {
+  if (sourceString.endsWith('%')) {
+    const n = Number(sourceString.replace('%', ''))
+    return round(n * .01)
+  }
+  return Number(sourceString)
+}
+
+parse.literal = (node={}) => {
+  const { ctorName, sourceString } = node.child(0)
   switch (ctorName) {
     case 'nullLiteral':
       return null
     case 'booleanLiteral':
       return sourceString === 'true'
     case 'numericLiteral':
-      return Number(sourceString)
+      return parse.numericLiteral(sourceString)
     case 'stringLiteral':
       return sourceString.slice(1, -1)
   }

test/commands.test.js

@@ -70,11 +70,13 @@ test(`Commands - Variations of Multiple keyvalues map args`, () => {
   ]})
 })
 
-test(`Commands - Mixed strings and values args`, () => {
+test.only(`Commands - Mixed strings and values args`, () => {
   expect(parse(`do: [
-    turn left 1 right 2;
+    turn left -1.23 right 2;
+    move [1] 12.3% [2] -.5% beyond:[1 2];
   ]`).result)
   .toStrictEqual({ do: [
-    ['turn', 'left', 1, 'right', 2],
+    ['turn', 'left', -1.23, 'right', 2],
+    ['move', [1], .123, [2], -.005, { beyond: [1, 2] }],
   ]})
 })

test/util.test.js

@@ -0,0 +1,8 @@
+import { test, expect } from 'vitest'
+import { round } from '../src/parser'
+
+test(`round`, () => {
+  const eg1 = 12.3 / 100
+  expect(eg1).toBe(0.12300000000000001)
+  expect(round(eg1)).toBe(0.123)
+})