subscript 5.2.1 → 5.3.1

package/README.md

@@ -1,6 +1,6 @@
 # <img alt="subscript" src="/subscript2.svg" height=42/> <!--sub͘<em>script</em>--> <!--<sub>SUB͘<em>SCRIPT</em></sub>--> 
 <a href="https://github.com/spectjs/subscript/actions/workflows/node.js.yml"><img src="https://github.com/spectjs/subscript/actions/workflows/node.js.yml/badge.svg"/></a>
-<a href="http://npmjs.org/subscript"><img src="https://img.shields.io/npm/v/subscript?color=orangered"/></a>
+<a href="http://npmjs.org/subscript"><img src="https://img.shields.io/npm/v/subscript?color=indianred"/></a>
 <a href="http://microjs.com/#subscript"><img src="https://img.shields.io/badge/microjs-subscript-blue?color=darkslateblue"/></a>
 
 _Subscript_ is micro-language with common syntax subset of C++, JS, Java, Python, Go, Rust, Swift, Objective C, Kotlin etc.<br/>
@@ -24,13 +24,13 @@ _Subscript_ is designed to be useful for:
 
 * templates (perfect match with [template parts](https://github.com/github/template-parts))
 * expressions evaluators, calculators
-* subsets of languages (eg. [justin](#justin)) <!-- see sonr, mineural -->
+* configurable subsets of languages (eg. [justin](#justin)) <!-- see sonr, mineural -->
 * mocking language features (eg. pipe operator)
 * sandboxes, playgrounds, safe eval
 * custom DSL
 
 [_Jsep_](https://github.com/EricSmekens/jsep) is generally fine for the listed tasks, unless you need dependencies as small as possible.
-_Subscript_ has [2.5kb](https://npmfs.com/package/subscript/5.2.0/subscript.min.js) footprint vs [11.4kb](https://npmfs.com/package/jsep/1.2.0/dist/jsep.min.js) _jsep_, with _jsep_ and more test coverage and better performance.
+_Subscript_ has [2.5kb](https://npmfs.com/package/subscript/5.2.0/subscript.min.js) footprint vs [11.4kb](https://npmfs.com/package/jsep/1.2.0/dist/jsep.min.js) _jsep_, with _jsep+_ test coverage and better performance.
 
 
 ## Evaluation
@@ -285,7 +285,7 @@ Subscript shows relatively good performance within other evaluators:
 // 1 + (a * b / c % d) - 2.0 + -3e-3 * +4.4e4 / f.g[0] - i.j(+k == 1)(0)
 // parse 30k times
 
-subscript: ~220 ms
+subscript: ~230 ms
 jsep: ~280 ms
 expr-eval: ~480 ms
 jexl: ~1200 ms

package/justin.js

@@ -1,6 +1,6 @@
 // justin lang https://github.com/endojs/Jessie/issues/66
 import {evaluate} from './evaluate.js'
-import {parse, code, char, skip, expr, err} from './parse.js'
+import {parse, code, char, skip, expr, err, val} from './parse.js'
 
 const PERIOD=46, OPAREN=40, CPAREN=41, CBRACK=93, SPACE=32,
 
@@ -10,7 +10,6 @@ PREC_EXP=14, PREC_TOKEN=20
 
 
 // tokens
-const v = v => ({valueOf:()=>v})
 parse.token.push(
   // 1.2e+3, .5 - fast & small version, but consumes corrupted nums as well
   (number) => (
@@ -31,14 +30,6 @@ parse.token.push(
     return skip(), qc + str + qc
   },
 
-  // literal
-  c =>
-    c === 116 && char(4) === 'true' && skip(4) ? v(true) :
-    c === 102 && char(5) === 'false' && skip(5) ? v(false) :
-    c === 110 && char(4) === 'null' && skip(4) ? v(null) :
-    c === 117 && char(9) === 'undefined' && skip(9) ? v(undefined) :
-    null,
-
   // id
   c => skip(c =>
     (c >= 48 && c <= 57) || // 0..9
@@ -54,13 +45,14 @@ const escape = {n:'\n', r:'\r', t:'\t', b:'\b', f:'\f', v:'\v'}
 
 // /**/, //
 parse.space = cc => {
-  while (cc = code(), cc <= 32) {
-    skip()
-    if (code() === 47)
+  while (cc = code(), cc <= 32 || cc === 47) {
+    if (cc <= 32) skip()
+    else if (cc === 47)
       // /**/
       if (code(1) === 42) skip(2), skip(c => c !== 42 && code(1) !== 47), skip(2)
       // //
       else if (code(1) === 47) skip(2), skip(c => c >= 32)
+      else break
   }
   return cc
 }
@@ -119,15 +111,15 @@ addOps(parse.operator, 3, [
   '.', PREC_CALL, (node,b) => node && [skip(),node, typeof (b = expr(PREC_CALL)) === 'string' ? '"' + b + '"' : b.valueOf()],
 
   // a[b]
-  '[', PREC_CALL, (node) => (skip(), node = ['.', node, expr(0,CBRACK).valueOf()], skip(), node),
+  '[', PREC_CALL, (node) => (skip(), node = ['.', node, val(expr(0,CBRACK))], node),
   ']',,,
 
   // a(b)
-  '(', PREC_CALL, (node,b) => ( skip(), b=expr(0,CPAREN), skip(),
-    Array.isArray(b) && b[0]===',' ? (b[0]=node, b) : b ? [node, b.valueOf()] : [node]
+  '(', PREC_CALL, (node,b) => ( skip(), b=expr(0,CPAREN),
+    Array.isArray(b) && b[0]===',' ? (b[0]=node, b) : b ? [node, val(b)] : [node]
   ),
   // (a+b)
-  '(', PREC_GROUP, (node,b) => !node && (skip(), b=expr(0,CPAREN) || err(), skip(), b),
+  '(', PREC_GROUP, (node,b) => !node && (skip(), b=expr(0,CPAREN) || err(), b),
   ')',,,
 
   // justin extension
@@ -148,17 +140,25 @@ addOps(parse.operator, 3, [
   ':',,,
   'in', PREC_COMP, (node) => code(2) <= 32 && [skip(2), '"'+node+'"', expr(PREC_COMP)],
 
+  // as operator it's faster to lookup (no need to extra rule check), smaller and no conflict with word names
   // [a,b,c]
   '[', PREC_TOKEN, (node,arg) => !node && (
-    skip(), arg=expr(0,93), skip(),
+    skip(), arg=expr(0,93),
     !arg ? ['['] : arg[0] == ',' ? (arg[0]='[',arg) : ['[',arg]
   ),
 
   // {a:0, b:1}
-  '{', PREC_TOKEN, (node,arg) => !node && (skip(), arg=expr(0,125), skip(),
-    !arg ? ['{'] : arg[0] == ':' ? ['{',arg] : arg[0] == ',' ? (arg[0]='{',arg) : ['[',arg])
+  '{', PREC_TOKEN, (node,arg) => !node && (skip(), arg=expr(0,125),
+    !arg ? ['{'] : arg[0] == ':' ? ['{',arg] : arg[0] == ',' ? (arg[0]='{',arg) : ['{',arg])
   ,
+
+  // literals
+  'null', PREC_TOKEN, node=>!node&&(skip(4),v(null)),
+  'false', PREC_TOKEN, node=>!node&&(skip(5),v(false)),
+  'true', PREC_TOKEN, node=>!node&&(skip(4),v(true)),
+  'undefined', PREC_TOKEN, node=>!node&&(skip(9),v(undefined)),
 ])
+const v = v => ({valueOf:()=>v})
 
 addOps(evaluate.operator, 2, [
   // subscript
@@ -200,9 +200,7 @@ addOps(evaluate.operator, 2, [
   '?:', (a,b,c)=>a?b:c,
   'in', (a,b)=>a in b,
 
-  // []
   '[', (...args) => Array(...args),
-  // as operator it's faster to lookup (no need to call extra rule check), smaller and no conflict with word names
   '{', (...args)=>Object.fromEntries(args),
   ':', (a,b)=>[a,b]
 ])

package/justin.min.js

@@ -1 +1 @@
-var e,r,t=e=>Array.isArray(e)&&("string"==typeof e[0]||t(e[0])),a=(e,r={},o,l)=>t(e)?("string"==typeof(o=e[0])&&(l=n[o]),"function"!=typeof(o=l||a(o,r))?o:o.call(...e.map((e=>a(e,r))))):e&&"string"==typeof e?'"'===e[0]?e.slice(1,-1):"@"===e[0]?e.slice(1):e in r?r[e]:e:e,n={},o=(a.operator=(e,r)=>n[e]=2==r.length?(...e)=>e.reduce(r):r,(t,a)=>(r=t,e=0,a=p(),e<r.length?l():a.valueOf())),l=(t="Bad syntax")=>{throw Error(t+" `"+r[e]+"` at "+e)},s=(t=1,a=e)=>{if("number"==typeof t)e+=t;else for(;t(u());)e++;return r.slice(a,e)},u=(t=0)=>r.charCodeAt(e+t),f=(t=1)=>r.substr(e,t),p=(e=0,r,t,a,n=0,s,u)=>{for(;(t=o.space())&&(u=v[t]?.(a,e)||!a&&c(t));)a=u;return r&&t!==r&&l("Unclosed paren"),a},i=(o.space=r=>{for(;(r=u())<=32;)e++;return r},o.token=[]),c=(e,r=0,t)=>{for(;r<i.length;)if(t=i[r++](e))return t},v=[],d=(o.operator=(r,t=0,a=0,n,i=r.charCodeAt(0),c=r.length,d=v[i],h=r.toUpperCase()!==r,y)=>(y=c<2?h?e=>u(1)<=32:e=>1:h?e=>f(c)==r&&u(c)<=32:e=>f(c)==r,n=a?a>0?e=>e&&[s(c),e]:a<0?e=>!e&&[s(c),(p(t-1)||l()).valueOf()]:a:a=>{a=[r,a||l()];do{e+=c,a.push((p(t)||l()).valueOf())}while(o.space()==i&&y());return a},v[i]=(e,r)=>r<t&&y()&&n(e)||d&&d(e,r)),10),h=15,y=e=>({valueOf:()=>e});o.token.push((e=>(e=s((e=>e>47&&e<58||46==e)))&&((69==u()||101==u())&&(e+=s(2)+s((e=>e>=48&&e<=57))),isNaN(e=new Number(e))?l("Bad number"):e)),((e,r,t,a)=>{if(34===e||39===e){for(r=f(),s(),a="";(t=u())-e;)92===t?(s(),a+=g[f()]||f()):a+=f(),s();return s(),r+a+r}}),(e=>116===e&&"true"===f(4)&&s(4)?y(!0):102===e&&"false"===f(5)&&s(5)?y(!1):110===e&&"null"===f(4)&&s(4)?y(null):117===e&&"undefined"===f(9)&&s(9)?y(void 0):null),(e=>s((e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e))));var g={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"};o.space=e=>{for(;(e=u())<=32;)s(),47===u()&&(42===u(1)?(s(2),s((e=>42!==e&&47!==u(1))),s(2)):47===u(1)&&(s(2),s((e=>e>=32))));return e};var O=(e,r=2,t)=>{for(let a=0;a<t.length;a+=r)e(t[a],t[a+1],t[a+2])};O(o.operator,3,[",",1,,"|",6,,"||",4,,"&",8,,"&&",5,,"^",7,,"==",9,,"!=",9,,">",d,,">=",d,,">>",11,,">>>",11,,"<",d,,"<=",d,,"<<",11,,"+",12,,"+",h,-1,"++",h,-1,"++",h,1,"-",12,,"-",h,-1,"--",h,-1,"--",h,1,"!",h,-1,"*",13,,"/",13,,"%",13,,".",18,(e,r)=>e&&[s(),e,"string"==typeof(r=p(18))?'"'+r+'"':r.valueOf()],"[",18,e=>(s(),e=[".",e,p(0,93).valueOf()],s(),e),"]",,,"(",18,(e,r)=>(s(),r=p(0,41),s(),Array.isArray(r)&&","===r[0]?(r[0]=e,r):r?[e,r.valueOf()]:[e]),"(",19,(e,r)=>!e&&(s(),r=p(0,41)||l(),s(),r),")",,,";",1,,"===",9,,"!==",9,,"**",14,,"~",h,-1,"?",3,e=>{let r,t;return e||l("Expected expression"),s(),o.space(),r=p(),58!==u()&&l("Expected :"),s(),o.space(),t=p(),["?:",e,r,t]},"}",,,":",,,"in",d,e=>u(2)<=32&&[s(2),'"'+e+'"',p(d)],"[",20,(e,r)=>!e&&(s(),r=p(0,93),s(),r?","==r[0]?(r[0]="[",r):["[",r]:["["]),"{",20,(e,r)=>!e&&(s(),r=p(0,125),s(),r?":"==r[0]?["{",r]:","==r[0]?(r[0]="{",r):["[",r]:["{"])]),O(a.operator,2,["!",e=>!e,"++",e=>++e,"--",e=>--e,".",(e,r)=>e&&e[r],"%",(e,r)=>e%r,"/",(e,r)=>e/r,"*",(e,r)=>e*r,"+",(e,r)=>e+r,"-",(...e)=>e.length<2?-e:e.reduce(((e,r)=>e-r)),">>>",(e,r)=>e>>>r,">>",(e,r)=>e>>r,"<<",(e,r)=>e<<r,">=",(e,r)=>e>=r,">",(e,r)=>e>r,"<=",(e,r)=>e<=r,"<",(e,r)=>e<r,"!=",(e,r)=>e!=r,"==",(e,r)=>e==r,"&",(e,r)=>e&r,"^",(e,r)=>e^r,"|",(e,r)=>e|r,"&&",(...e)=>e.every(Boolean),"||",(...e)=>e.some(Boolean),",",(e,r)=>r,"**",(...e)=>e.reduceRight(((e,r)=>Math.pow(r,e))),"~",e=>~e,"?:",(e,r,t)=>e?r:t,"in",(e,r)=>e in r,"[",(...e)=>Array(...e),"{",(...e)=>Object.fromEntries(e),":",(e,r)=>[e,r]]);var b=e=>(e="string"==typeof e?o(e):e,r=>a(e,r));export{b as default,a as evaluate,o as parse};
+const e=r=>Array.isArray(r)&&("string"==typeof r[0]||e(r[0])),r=(n,o={},s,a)=>e(n)?("string"==typeof(s=n[0])&&(a=t[s]),"function"!=typeof(s=a||r(s,o))?s:s.call(...n.map((e=>r(e,o))))):n&&"string"==typeof n?'"'===n[0]?n.slice(1,-1):"@"===n[0]?n.slice(1):n in o?o[n]:n:n,t={};let n,o;r.operator=(e,r)=>t[e]=2==r.length?(...e)=>e.reduce(r):r;const s=(e,r)=>(o=e,n=0,r=p(),n<o.length?a():d(r)),a=(e="Bad syntax")=>{throw Error(e+" `"+o[n]+"` at "+n)},f=(e=1,r=n)=>{if("number"==typeof e)n+=e;else for(;e(i());)n++;return o.slice(r,n)},i=(e=0)=>o.charCodeAt(n+e),l=(e=1)=>o.substr(n,e),p=(e=0,r,t,o,f=0,i,l)=>{for(;(t=s.space())&&(l=y[t]?.(o,e)||!o&&u(t));)o=l;return r&&(t!=r?a("Unclosed paren"):n++),o};s.space=e=>{for(;(e=i())<=32;)n++;return e};const c=s.token=[],u=(e,r=0,t)=>{for(;r<c.length;)if(t=c[r++](e))return t},y=[];s.operator=(e,r=0,t=0,o,a=e.charCodeAt(0),c=e.length,u=y[a],h=t<=0&&e.toUpperCase()!==e)=>(o=t?t>0?e=>e&&[f(c),d(e)]:t<0?e=>!e&&[f(c),d(p(r-1))]:t:t=>{t=[e,d(t)];do{n+=c,t.push(d(p(r)))}while(s.space()==a&&(c<2||l(c)==e)&&(!h||i(c)<=32));return t},y[a]=(t,n)=>n<r&&(c<2||l(c)==e)&&(!h||i(c)<=32)&&o(t)||u&&u(t,n));const d=e=>Array.isArray(e)?e:(e||a()).valueOf();s.token.push((e=>(e=f((e=>e>47&&e<58||46==e)))&&((69==i()||101==i())&&(e+=f(2)+f((e=>e>=48&&e<=57))),isNaN(e=new Number(e))?a("Bad number"):e)),((e,r,t,n)=>{if(34===e||39===e){for(r=l(),f(),n="";(t=i())-e;)92===t?(f(),n+=h[l()]||l()):n+=l(),f();return f(),r+n+r}}),(e=>f((e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e))));const h={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"};s.space=e=>{for(;(e=i())<=32||47===e;)if(e<=32)f();else if(47===e)if(42===i(1))f(2),f((e=>42!==e&&47!==i(1))),f(2);else{if(47!==i(1))break;f(2),f((e=>e>=32))}return e};const g=(e,r=2,t)=>{for(let n=0;n<t.length;n+=r)e(t[n],t[n+1],t[n+2])};g(s.operator,3,[",",1,,"|",6,,"||",4,,"&",8,,"&&",5,,"^",7,,"==",9,,"!=",9,,">",10,,">=",10,,">>",11,,">>>",11,,"<",10,,"<=",10,,"<<",11,,"+",12,,"+",15,-1,"++",15,-1,"++",15,1,"-",12,,"-",15,-1,"--",15,-1,"--",15,1,"!",15,-1,"*",13,,"/",13,,"%",13,,".",18,(e,r)=>e&&[f(),e,"string"==typeof(r=p(18))?'"'+r+'"':r.valueOf()],"[",18,e=>(f(),[".",e,d(p(0,93))]),"]",,,"(",18,(e,r)=>(f(),r=p(0,41),Array.isArray(r)&&","===r[0]?(r[0]=e,r):r?[e,d(r)]:[e]),"(",19,(e,r)=>!e&&(f(),p(0,41)||a()),")",,,";",1,,"===",9,,"!==",9,,"**",14,,"~",15,-1,"?",3,e=>{let r,t;return e||a("Expected expression"),f(),s.space(),r=p(),58!==i()&&a("Expected :"),f(),s.space(),t=p(),["?:",e,r,t]},"}",,,":",,,"in",10,e=>i(2)<=32&&[f(2),'"'+e+'"',p(10)],"[",20,(e,r)=>!e&&(f(),(r=p(0,93))?","==r[0]?(r[0]="[",r):["[",r]:["["]),"{",20,(e,r)=>!e&&(f(),(r=p(0,125))?":"==r[0]?["{",r]:","==r[0]?(r[0]="{",r):["{",r]:["{"]),"null",20,e=>!e&&(f(4),A(null)),"false",20,e=>!e&&(f(5),A(!1)),"true",20,e=>!e&&(f(4),A(!0)),"undefined",20,e=>!e&&(f(9),A(void 0))]);const A=e=>({valueOf:()=>e});g(r.operator,2,["!",e=>!e,"++",e=>++e,"--",e=>--e,".",(e,r)=>e?e[r]:e,"%",(e,r)=>e%r,"/",(e,r)=>e/r,"*",(e,r)=>e*r,"+",(e,r)=>e+r,"-",(...e)=>e.length<2?-e:e.reduce(((e,r)=>e-r)),">>>",(e,r)=>e>>>r,">>",(e,r)=>e>>r,"<<",(e,r)=>e<<r,">=",(e,r)=>e>=r,">",(e,r)=>e>r,"<=",(e,r)=>e<=r,"<",(e,r)=>e<r,"!=",(e,r)=>e!=r,"==",(e,r)=>e==r,"&",(e,r)=>e&r,"^",(e,r)=>e^r,"|",(e,r)=>e|r,"&&",(...e)=>e.every(Boolean),"||",(...e)=>e.some(Boolean),",",(e,r)=>r,"**",(...e)=>e.reduceRight(((e,r)=>Math.pow(r,e))),"~",e=>~e,"?:",(e,r,t)=>e?r:t,"in",(e,r)=>e in r,"[",(...e)=>Array(...e),"{",(...e)=>Object.fromEntries(e),":",(e,r)=>[e,r]]);var b=e=>(e="string"==typeof e?s(e):e,t=>r(e,t));export{b as default,r as evaluate,s as parse};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subscript",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "Microlanguage with common syntax for JS/C++/Python/Rust",
   "main": "subscript.js",
   "type": "module",
@@ -18,9 +18,9 @@
     "test": "test"
   },
   "scripts": {
-    "build": "esbuild subscript.js --bundle --format=esm --minify --outfile=subscript.min.js",
+    "build": "rollup subscript.js --file subscript.min.js --format esm --name \"Subscript\"",
     "minify": "terser subscript.min.js -o subscript.min.js --module -c passes=3 -m",
-    "build-justin": "esbuild justin.js --bundle --format=esm --minify --outfile=justin.min.js",
+    "build-justin": "rollup justin.js --file justin.min.js --format esm --name \"Justin\"",
     "minify-justin": "terser justin.min.js -o justin.min.js --module -c passes=3 -m",
     "test": "node test"
   },
@@ -54,7 +54,7 @@
   },
   "homepage": "https://github.com/spectjs/subscript#readme",
   "devDependencies": {
-    "esbuild": "^0.13.14",
+    "rollup": "^2.60.2",
     "terser": "^5.10.0"
   }
 }

package/parse.js

@@ -3,7 +3,7 @@ const SPACE=32
 // current string & index
 let idx, cur
 
-export const parse = (str, tree) => (cur=str, idx=0, tree=expr(), idx<cur.length ? err() : tree.valueOf()),
+export const parse = (str, tree) => (cur=str, idx=0, tree=expr(), idx<cur.length ? err() : val(tree)),
 
 err = (msg='Bad syntax') => { throw Error(msg + ' `' + cur[idx] + '` at ' + idx) },
 
@@ -24,7 +24,8 @@ expr = (prec=0, end, cc, node, i=0, map, newNode) => {
     (cc=parse.space()) && (newNode = lookup[cc]?.(node, prec) || (!node && token(cc)) )
   ) node = newNode;
 
-  if (end && cc !== end) err('Unclosed paren')
+  // skip end character, if expected
+  if (end) cc != end ? err('Unclosed paren') : idx++
 
   return node
 },
@@ -43,22 +44,27 @@ lookup = [],
 // @param op is operator string
 // @param prec is operator precedenc to check
 // @param map is either number +1 - postfix unary, -1 prefix unary, 0 binary, else - custom mapper function
-operator = parse.operator =  (op, prec=0, type=0, map, c=op.charCodeAt(0), l=op.length, prev=lookup[c], word=op.toUpperCase()!==op, isop) => (
-  isop = l<2 ? // word operator must have space after
-    !word ? c=>1 : c=>code(1)<=SPACE :
-    !word ? c=>char(l)==op : c=>char(l)==op&&code(l)<=SPACE,
-
+operator = parse.operator = (
+  op, prec=0, type=0, map, c=op.charCodeAt(0), l=op.length,
+  prev=lookup[c],
+  spaced=type<=0&&op.toUpperCase()!==op // non-postfix word operator must have space after
+) => (
   map = !type ? node => { // binary, consume same-op group
-      node = [op, node || err()]
-      // in order to support literal tokens, we call valueOf any time we create or modify calltree node
-      do { idx+=l, node.push((expr(prec) || err()).valueOf()) } while (parse.space()==c && isop())
+      node = [op, val(node)]
+      do { idx+=l, node.push(val(expr(prec))) }
+      while (parse.space()==c && (l<2||char(l)==op) && (!spaced||code(l)<=SPACE))
       return node
     } :
-    type > 0 ? node => node && [skip(l), node] : // postfix unary
-    type < 0 ? node => !node && [skip(l), (expr(prec-1) || err()).valueOf()] : // prefix unary
+    type > 0 ? node => node && [skip(l), val(node)] : // postfix unary
+    type < 0 ? node => !node && [skip(l), val(expr(prec-1))] : // prefix unary
     type,
 
-  lookup[c] = (node, curPrec) => curPrec < prec && isop() && map(node) || (prev && prev(node, curPrec))
-)
+  lookup[c] = (node, curPrec) =>
+    curPrec < prec && (l<2||char(l)==op) && (!spaced||code(l)<=SPACE) &&
+    map(node) || (prev && prev(node, curPrec))
+),
+
+// in order to support literal tokens, we call valueOf any time we create or modify calltree node
+val = node => Array.isArray(node) ? node : (node || err()).valueOf()
 
 export default parse

package/subscript.js

@@ -1,4 +1,4 @@
-import parse, {skip, expr, code, tokens, operator as parseOp} from './parse.js'
+import parse, {skip, expr, code, tokens, val, operator as parseOp, err} from './parse.js'
 import evaluate, {operator as evalOp} from './evaluate.js'
 
 const PERIOD=46, OPAREN=40, CPAREN=41, CBRACK=93, SPACE=32,
@@ -58,11 +58,11 @@ addOps(parseOp, 3, [
   '+', PREC_SUM,,
   '+', PREC_UNARY, -1,
   '++', PREC_UNARY, -1,
-  '++', PREC_UNARY, +1,
+  '++', PREC_POSTFIX, +1,
   '-', PREC_SUM,,
   '-', PREC_UNARY, -1,
   '--', PREC_UNARY, -1,
-  '--', PREC_UNARY, +1,
+  '--', PREC_POSTFIX, +1,
 
   // ! ~
   '!', PREC_UNARY, -1,
@@ -76,15 +76,15 @@ addOps(parseOp, 3, [
   '.', PREC_CALL, (node,b) => node && [skip(),node, typeof (b = expr(PREC_CALL)) === 'string' ? '"' + b + '"' : b.valueOf()],
 
   // a[b]
-  '[', PREC_CALL, (node) => (skip(), node = ['.', node, expr(0,CBRACK).valueOf()], skip(), node),
+  '[', PREC_CALL, (node) => (skip(), node = ['.', node, val(expr(0,CBRACK))], node),
   ']',,,
 
   // a(b)
-  '(', PREC_CALL, (node,b) => ( skip(), b=expr(0,CPAREN), skip(),
-    Array.isArray(b) && b[0]===',' ? (b[0]=node, b) : b ? [node, b.valueOf()] : [node]
+  '(', PREC_CALL, (node,b) => ( skip(), b=expr(0,CPAREN),
+    Array.isArray(b) && b[0]===',' ? (b[0]=node, b) : b ? [node, val(b)] : [node]
   ),
   // (a+b)
-  '(', PREC_GROUP, (node,b) => !node && (skip(), b=expr(0,CPAREN) || err(), skip(), b),
+  '(', PREC_GROUP, (node,b) => !node && (skip(), b=expr(0,CPAREN) || err(), b),
   ')',,,
 ])
 

package/subscript.min.js

@@ -1 +1 @@
-var e,r,a=(a,o)=>(r=a,e=0,o=l(),e<r.length?t():o.valueOf()),t=(a="Bad syntax")=>{throw Error(a+" `"+r[e]+"` at "+e)},o=(a=1,t=e)=>{if("number"==typeof a)e+=a;else for(;a(n());)e++;return r.slice(t,e)},n=(a=0)=>r.charCodeAt(e+a),s=(a=1)=>r.substr(e,a),l=(e=0,r,o,n,s=0,l,f)=>{for(;(o=a.space())&&(f=p[o]?.(n,e)||!n&&u(o));)n=f;return r&&o!==r&&t("Unclosed paren"),n},f=(a.space=r=>{for(;(r=n())<=32;)e++;return r},a.token=[]),u=(e,r=0,a)=>{for(;r<f.length;)if(a=f[r++](e))return a},p=[],i=a.operator=(r,f=0,u=0,i,c=r.charCodeAt(0),y=r.length,h=p[c],g=r.toUpperCase()!==r,v)=>(v=y<2?g?e=>n(1)<=32:e=>1:g?e=>s(y)==r&&n(y)<=32:e=>s(y)==r,i=u?u>0?e=>e&&[o(y),e]:u<0?e=>!e&&[o(y),(l(f-1)||t()).valueOf()]:u:o=>{o=[r,o||t()];do{e+=y,o.push((l(f)||t()).valueOf())}while(a.space()==c&&v());return o},p[c]=(e,r)=>r<f&&v()&&i(e)||h&&h(e,r)),c=a,y=e=>Array.isArray(e)&&("string"==typeof e[0]||y(e[0])),h=(e,r={},a,t)=>y(e)?("string"==typeof(a=e[0])&&(t=g[a]),"function"!=typeof(a=t||h(a,r))?a:a.call(...e.map((e=>h(e,r))))):e&&"string"==typeof e?'"'===e[0]?e.slice(1,-1):"@"===e[0]?e.slice(1):e in r?r[e]:e:e,g={},v=h.operator=(e,r)=>g[e]=2==r.length?(...e)=>e.reduce(r):r,d=h,A=15;f.push((e=>(e=o((e=>e>47&&e<58||46==e)))&&((69==n()||101==n())&&(e+=o(2)+o((e=>e>=48&&e<=57))),isNaN(e=new Number(e))?err("Bad number"):e)),((e,r)=>34==e&&o()+o((r=>r-e))+o()),(e=>o((e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192))));var O=(e,r=2,a)=>{for(let t=0;t<a.length;t+=r)e(a[t],a[t+1],a[t+2])};O(i,3,[",",1,,"|",6,,"||",4,,"&",8,,"&&",5,,"^",7,,"==",9,,"!=",9,,">",10,,">=",10,,">>",11,,">>>",11,,"<",10,,"<=",10,,"<<",11,,"+",12,,"+",A,-1,"++",A,-1,"++",A,1,"-",12,,"-",A,-1,"--",A,-1,"--",A,1,"!",A,-1,"*",13,,"/",13,,"%",13,,".",18,(e,r)=>e&&[o(),e,"string"==typeof(r=l(18))?'"'+r+'"':r.valueOf()],"[",18,e=>(o(),e=[".",e,l(0,93).valueOf()],o(),e),"]",,,"(",18,(e,r)=>(o(),r=l(0,41),o(),Array.isArray(r)&&","===r[0]?(r[0]=e,r):r?[e,r.valueOf()]:[e]),"(",19,(e,r)=>!e&&(o(),r=l(0,41)||err(),o(),r),")",,,]),O(v,2,["!",e=>!e,"++",e=>++e,"--",e=>--e,".",(e,r)=>e&&e[r],"%",(e,r)=>e%r,"/",(e,r)=>e/r,"*",(e,r)=>e*r,"+",(e,r)=>e+r,"-",(...e)=>e.length<2?-e:e.reduce(((e,r)=>e-r)),">>>",(e,r)=>e>>>r,">>",(e,r)=>e>>r,"<<",(e,r)=>e<<r,">=",(e,r)=>e>=r,">",(e,r)=>e>r,"<=",(e,r)=>e<=r,"<",(e,r)=>e<r,"!=",(e,r)=>e!=r,"==",(e,r)=>e==r,"&",(e,r)=>e&r,"^",(e,r)=>e^r,"|",(e,r)=>e|r,"&&",(...e)=>e.every(Boolean),"||",(...e)=>e.some(Boolean),",",(e,r)=>r]);var m=e=>(e="string"==typeof e?c(e):e,r=>d(e,r));export{m as default,d as evaluate,c as parse};
+let e,r;const t=(t,n)=>(r=t,e=0,n=l(),e<r.length?o():c(n)),o=(t="Bad syntax")=>{throw Error(t+" `"+r[e]+"` at "+e)},n=(t=1,o=e)=>{if("number"==typeof t)e+=t;else for(;t(a());)e++;return r.slice(o,e)},a=(t=0)=>r.charCodeAt(e+t),s=(t=1)=>r.substr(e,t),l=(r=0,n,a,s,l=0,p,u)=>{for(;(a=t.space())&&(u=i[a]?.(s,r)||!s&&f(a));)s=u;return n&&(a!=n?o("Unclosed paren"):e++),s};t.space=r=>{for(;(r=a())<=32;)e++;return r};const p=t.token=[],f=(e,r=0,t)=>{for(;r<p.length;)if(t=p[r++](e))return t},i=[],u=t.operator=(r,o=0,p=0,f,u=r.charCodeAt(0),y=r.length,h=i[u],g=p<=0&&r.toUpperCase()!==r)=>(f=p?p>0?e=>e&&[n(y),c(e)]:p<0?e=>!e&&[n(y),c(l(o-1))]:p:n=>{n=[r,c(n)];do{e+=y,n.push(c(l(o)))}while(t.space()==u&&(y<2||s(y)==r)&&(!g||a(y)<=32));return n},i[u]=(e,t)=>t<o&&(y<2||s(y)==r)&&(!g||a(y)<=32)&&f(e)||h&&h(e,t)),c=e=>Array.isArray(e)?e:(e||o()).valueOf(),y=e=>Array.isArray(e)&&("string"==typeof e[0]||y(e[0])),h=(e,r={},t,o)=>y(e)?("string"==typeof(t=e[0])&&(o=g[t]),"function"!=typeof(t=o||h(t,r))?t:t.call(...e.map((e=>h(e,r))))):e&&"string"==typeof e?'"'===e[0]?e.slice(1,-1):"@"===e[0]?e.slice(1):e in r?r[e]:e:e,g={},d=h.operator=(e,r)=>g[e]=2==r.length?(...e)=>e.reduce(r):r;p.push((e=>(e=n((e=>e>47&&e<58||46==e)))&&((69==a()||101==a())&&(e+=n(2)+n((e=>e>=48&&e<=57))),isNaN(e=new Number(e))?o("Bad number"):e)),((e,r)=>34==e&&n()+n((r=>r-e))+n()),(e=>n((e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192))));const A=(e,r=2,t)=>{for(let o=0;o<t.length;o+=r)e(t[o],t[o+1],t[o+2])};A(u,3,[",",1,,"|",6,,"||",4,,"&",8,,"&&",5,,"^",7,,"==",9,,"!=",9,,">",10,,">=",10,,">>",11,,">>>",11,,"<",10,,"<=",10,,"<<",11,,"+",12,,"+",15,-1,"++",15,-1,"++",16,1,"-",12,,"-",15,-1,"--",15,-1,"--",16,1,"!",15,-1,"*",13,,"/",13,,"%",13,,".",18,(e,r)=>e&&[n(),e,"string"==typeof(r=l(18))?'"'+r+'"':r.valueOf()],"[",18,e=>(n(),[".",e,c(l(0,93))]),"]",,,"(",18,(e,r)=>(n(),r=l(0,41),Array.isArray(r)&&","===r[0]?(r[0]=e,r):r?[e,c(r)]:[e]),"(",19,(e,r)=>!e&&(n(),l(0,41)||o()),")",,,]),A(d,2,["!",e=>!e,"++",e=>++e,"--",e=>--e,".",(e,r)=>e?e[r]:e,"%",(e,r)=>e%r,"/",(e,r)=>e/r,"*",(e,r)=>e*r,"+",(e,r)=>e+r,"-",(...e)=>e.length<2?-e:e.reduce(((e,r)=>e-r)),">>>",(e,r)=>e>>>r,">>",(e,r)=>e>>r,"<<",(e,r)=>e<<r,">=",(e,r)=>e>=r,">",(e,r)=>e>r,"<=",(e,r)=>e<=r,"<",(e,r)=>e<r,"!=",(e,r)=>e!=r,"==",(e,r)=>e==r,"&",(e,r)=>e&r,"^",(e,r)=>e^r,"|",(e,r)=>e|r,"&&",(...e)=>e.every(Boolean),"||",(...e)=>e.some(Boolean),",",(e,r)=>r]);var m=e=>(e="string"==typeof e?t(e):e,r=>h(e,r));export{m as default,h as evaluate,t as parse};