subscript 7.4.6 → 7.5.1

package/README.md

@@ -11,10 +11,10 @@ _Subscript_ is expression evaluator / microlanguage with [common syntax](https:/
 import subscript, { parse, compile } from './subscript.js'
 
 // create expression evaluator
-let fn = subscript('a.b + c(d - 1)')
-fn({ a: { b:1 }, c: x => x * 2, d: 3 }) // 5
+let fn = subscript('a.b + Math.sqrt(c - 1)')
+fn({ a: { b:1 }, c: 5, Math }) // 3
 
-// or
+// --- or ---
 // parse expression
 let tree = parse('a.b + c')
 tree // ['+', ['.', 'a', 'b'], 'c']
@@ -28,12 +28,12 @@ fn({a:{b:1}, c:2}) // 3
 
 _Subscript_ is designed to be useful for:
 
-* templates (perfect match with [template parts](https://github.com/github/template-parts), see [templize](https://github.com/spectjs/templize))
+* templates (eg. [sprae](https://github.com/dy/sprae), [templize](https://github.com/dy/templize))
 * expressions evaluators, calculators
-* configurable subsets of languages (eg. [justin](#justin))
-* pluggable/mock language features (eg. pipe operator)
+* subsets of languages (eg. [justin](#justin))
+* pluggable/configurable/mock language features (eg. pipe operator)
 * sandboxes, playgrounds, safe eval
-* custom DSL (see [lino](https://github.com/dy/lino)) <!-- uneural -->
+* custom DSL (see [mell](https://github.com/dy/lino)) <!-- uneural -->
 * preprocessors (see [prepr](https://github.com/dy/prepr))
 
 _Subscript_ has [3.5kb](https://npmfs.com/package/subscript/7.4.3/subscript.min.js) footprint, compared to [11.4kb](https://npmfs.com/package/jsep/1.2.0/dist/jsep.min.js) _jsep_ + [4.5kb](https://npmfs.com/package/expression-eval/5.0.0/dist/expression-eval.module.js) _expression-eval_, with better test coverage and better performance.
@@ -105,16 +105,16 @@ import script, { operator, unary, binary, token } from './subscript.js'
 
 // add ~ unary operator with precedence 15
 unary('~', 15)
-operator('~', a => ~a)
+operator('~', a => ctx => ~a)
 
 // add === binary operator with precedence 9
 binary('===', 9)
-operator('===', (a, b) => a===b)
+operator('===', (a, b) => ctx => ctx[a]===ctx[b])
 
 // add boolean literals
 token('true', 20, prev => ['',true])
 token('false', 20, prev => ['',false])
-operator('', boolNode => ctx => boolNode[1]])
+operator('', boolNode => ctx => boolNode[1])
 ```
 
 See [subscript.js](subscript.js) or [justin.js](./justin.js) for examples.
@@ -331,5 +331,6 @@ math-parser: -
 * [math-parser](https://www.npmjs.com/package/math-parser)
 * [math.js](https://mathjs.org/docs/expressions/parsing.html)
 * [nx-compile](https://github.com/nx-js/compiler-util)
+* [built-in-math-eval](https://github.com/mauriciopoppe/built-in-math-eval)
 
 <p align=center><a href="https://github.com/krsnzd/license/">🕉</a></p>

package/justin.js

@@ -1,94 +1,94 @@
 // justin lang https://github.com/endojs/Jessie/issues/66
-import { skip, cur, idx, err, expr } from './parse.js'
-import compile from './compile.js'
+import { skip, cur, idx, err, expr, lookup, token } from './parse.js'
+import compile, { operator } from './compile.js'
 import subscript, { set } from './subscript.js'
 
-const PERIOD=46, OPAREN=40, CPAREN=41, OBRACK=91, CBRACK=93, SPACE=32, DQUOTE=34, QUOTE=39, _0=48, _9=57, BSLASH=92,
-PREC_SEQ=1, PREC_COND=3, PREC_SOME=4, PREC_EVERY=5, PREC_OR=6, PREC_XOR=7, PREC_AND=8,
-PREC_EQ=9, PREC_COMP=10, PREC_SHIFT=11, PREC_SUM=12, PREC_MULT=13, PREC_EXP=14, PREC_UNARY=15, PREC_POSTFIX=16, PREC_CALL=18, PREC_GROUP=19
+const PERIOD = 46, OPAREN = 40, CPAREN = 41, OBRACK = 91, CBRACK = 93, SPACE = 32, DQUOTE = 34, QUOTE = 39, _0 = 48, _9 = 57, BSLASH = 92,
+  PREC_SEQ = 1, PREC_COND = 3, PREC_SOME = 4, PREC_EVERY = 5, PREC_OR = 6, PREC_XOR = 7, PREC_AND = 8,
+  PREC_EQ = 9, PREC_COMP = 10, PREC_SHIFT = 11, PREC_SUM = 12, PREC_MULT = 13, PREC_EXP = 14, PREC_UNARY = 15, PREC_POSTFIX = 16, PREC_CALL = 18, PREC_GROUP = 19
 
-let escape = {n:'\n', r:'\r', t:'\t', b:'\b', f:'\f', v:'\v'},
-  string = q => (qc, c, str='') => {
-    qc&&err('Unexpected string') // must not follow another token
+let escape = { n: '\n', r: '\r', t: '\t', b: '\b', f: '\f', v: '\v' },
+  string = q => (qc, c, str = '') => {
+    qc && err('Unexpected string') // must not follow another token
     skip()
-    while (c=cur.charCodeAt(idx), c-q) {
-      if (c === BSLASH) skip(), c=skip(), str += escape[c] || c
+    while (c = cur.charCodeAt(idx), c - q) {
+      if (c === BSLASH) skip(), c = skip(), str += escape[c] || c
       else str += skip()
     }
     skip()
     return ['', str]
-  },
-
-list = [
-  // operators
-  '===',  PREC_EQ, (a,b) => a===b,
-  '!==',  PREC_EQ, (a,b) => a!==b,
-  '~',  PREC_UNARY, (a) => ~a,
-
-  // ?:
-  '?', PREC_COND, [
-    (a, b, c) => a && (b=expr(2,58)) && (c=expr(3), ['?', a, b, c]),
-    (a, b, c) => (a=compile(a),b=compile(b),c=compile(c), ctx => a(ctx) ? b(ctx) : c(ctx))
-  ],
-
-  '??', PREC_OR, (a,b) => a ?? b,
-
-  // a?.[, a?.( - postfix operator
-  '?.', PREC_CALL, [a => a && ['?.', a], a => (a=compile(a), ctx => a(ctx)||(()=>{})) ],
-  // a?.b - optional chain operator
-  '?.', PREC_CALL, [
-    (a,b) => a && (b=expr(PREC_CALL),!b?.map) && ['?.',a,b],
-    (a,b) => b && (a=compile(a), ctx => a(ctx)?.[b])
-  ],
-
-  'in', PREC_COMP , (a,b) => a in b,
-
-  // "' with /
-  '"', , [string(DQUOTE)],
-  "'", , [string(QUOTE)],
-
-  // /**/, //
-  '/*', 20, [(a, prec) => (skip(c => c !== 42 && cur.charCodeAt(idx+1) !== 47), skip(2), a||expr(prec))],
-  '//', 20, [(a, prec) => (skip(c => c >= 32), a||expr(prec))],
-
-  // literals
-  'null', 20, [a => a ? err() : ['',null]],
-  'true', 20, [a => a ? err() : ['',true]],
-  'false', 20, [a => a ? err() : ['',false]],
-  'undefined', 20, [a => a ? err() : ['',undefined]],
-
-  // FIXME: make sure that is right
-  ';', -20, (...args) => { for (let i = args.length; i--; ) if (args[i] != null) return args[i] },
-
-  // right order
-  // '**', (a,prec,b=expr(PREC_EXP-1)) => ctx=>a(ctx)**b(ctx), PREC_EXP,
-  '**', -PREC_EXP, (a,b)=>a**b,
-
-  // [a,b,c]
-  '[', 20, [
-    (a) => !a && ['[', expr(0,93)||''],
-    (a,b) => !b && (
-      !a ? () => [] : // []
-        a[0] === ',' ? (a=a.slice(1).map(compile), ctx => a.map(a=>a(ctx))) : // [a,b,c]
-        (a=compile(a), ctx => [a(ctx)]) // [a]
-    )],
-
-  // {a:1, b:2, c:3}
-  '{', 20, [
-    a => !a && (['{', expr(0,125)||'']),
-    (a,b) => (
-      !a ? ctx => ({}) : // {}
-      a[0] === ',' ? (a=a.slice(1).map(compile), ctx=>Object.fromEntries(a.map(a=>a(ctx)))) : // {a:1,b:2}
-      a[0] === ':' ? (a=compile(a), ctx => Object.fromEntries([a(ctx)])) : // {a:1}
-      (b=compile(a), ctx=>({[a]:b(ctx)}))
-    )
-  ],
-  ':', 1.1, [
-    (a, b) => (b=expr(1.1)||err(), [':',a,b]),
-    (a,b) => (b=compile(b),a=Array.isArray(a)?compile(a):(a=>a).bind(0,a), ctx=>[a(ctx),b(ctx)])
-  ]
-]
-for (;list[2];) set(...list.splice(0,3))
+  }
+
+// operators
+set('===', PREC_EQ, (a, b) => a === b)
+set('!==', PREC_EQ, (a, b) => a !== b)
+set('~', PREC_UNARY, (a) => ~a)
+
+// ?:
+token('?', PREC_COND, (a, b, c) => a && (b = expr(2, 58)) && (c = expr(3), ['?', a, b, c]))
+operator('?', (a, b, c) => (a = compile(a), b = compile(b), c = compile(c), ctx => a(ctx) ? b(ctx) : c(ctx)))
+
+set('??', PREC_OR, (a, b) => a ?? b)
+
+// a?.[, a?.( - postfix operator
+token('?.', PREC_CALL, a => a && ['?.', a])
+operator('?.', a => (a = compile(a), ctx => a(ctx) || (() => { })))
+
+// a?.b - optional chain operator
+token('?.', PREC_CALL, (a, b) => a && (b = expr(PREC_CALL), !b?.map) && ['?.', a, b])
+operator('?.', (a, b) => b && (a = compile(a), ctx => a(ctx)?.[b]))
+
+// a?.x() - keep context
+operator('(', (a, b, path, args) => b != null && a[0] === '?.' && (
+  args = b == '' ? () => [] : // a()
+    b[0] === ',' ? (b = b.slice(1).map(compile), ctx => b.map(a => a(ctx))) : // a(b,c)
+      (b = compile(b), ctx => [b(ctx)]), // a(b)
+  path = a[2], a = compile(a[1]), ctx => a(ctx)?.[path](...args(ctx))
+))
+
+// a in b
+set('in', PREC_COMP, (a, b) => a in b)
+
+// "' with /
+lookup[DQUOTE] = string(DQUOTE)
+lookup[QUOTE] = string(QUOTE)
+
+// /**/, //
+token('/*', 20, (a, prec) => (skip(c => c !== 42 && cur.charCodeAt(idx + 1) !== 47), skip(2), a || expr(prec) || ['']))
+token('//', 20, (a, prec) => (skip(c => c >= 32), a || expr(prec) || ['']))
+
+// literals
+token('null', 20, a => a ? err() : ['', null])
+token('true', 20, a => a ? err() : ['', true])
+token('false', 20, a => a ? err() : ['', false])
+token('undefined', 20, a => a ? err() : ['', undefined])
+
+// FIXME: make sure that is right
+set(';', -20, (...args) => { for (let i = args.length; i--;) if (args[i] != null) return args[i] })
+
+// right order
+// '**', (a,prec,b=expr(PREC_EXP-1)) => ctx=>a(ctx)**b(ctx), PREC_EXP,
+set('**', -PREC_EXP, (a, b) => a ** b)
+
+// [a,b,c]
+token('[', 20, (a) => !a && ['[', expr(0, 93) || ''])
+operator('[', (a, b) => !b && (
+  !a ? () => [] : // []
+    a[0] === ',' ? (a = a.slice(1).map(compile), ctx => a.map(a => a(ctx))) : // [a,b,c]
+      (a = compile(a), ctx => [a(ctx)]) // [a]
+))
+
+// {a:1, b:2, c:3}
+token('{', 20, a => !a && (['{', expr(0, 125) || '']))
+operator('{', (a, b) => (
+  !a ? ctx => ({}) : // {}
+    a[0] === ',' ? (a = a.slice(1).map(compile), ctx => Object.fromEntries(a.map(a => a(ctx)))) : // {a:1,b:2}
+      a[0] === ':' ? (a = compile(a), ctx => Object.fromEntries([a(ctx)])) : // {a:1}
+        (b = compile(a), ctx => ({ [a]: b(ctx) }))
+))
+
+token(':', 1.1, (a, b) => (b = expr(1.1) || err(), [':', a, b]))
+operator(':', (a, b) => (b = compile(b), a = Array.isArray(a) ? compile(a) : (a => a).bind(0, a), ctx => [a(ctx), b(ctx)]))
 
 export default subscript
 export * from './subscript.js'

package/justin.min.js

@@ -1 +1 @@
-let e,t,r=r=>(e=0,t=r,r=s(),t[e]?l():r||""),l=(r="Bad syntax",l=t[e],n=t.slice(0,e).split("\n"),a=n.pop())=>{throw SyntaxError(`${r} ${l?`\`${l}\` `:""}at ${n.length}:${a.length}`,n.length)},n=(r="Bad syntax",l=t[e],n=t.slice(0,e).split("\n"),a=n.pop())=>{let s=t.slice(e-10,e).split("\n").pop(),i=t.slice(e+1,e+10).split("\n").shift(),h=n.length+":"+a.length;throw EvalError(`${r} at ${h} \`${s+l+i}\`\n${" ".repeat(18+r.length+h.length+s.length+1)}^`)},a=(r=1,l=e,n)=>{if("number"==typeof r)e+=r;else for(;n=r(t.charCodeAt(e));)e+=n;return t.slice(l,e)},s=(t=0,n,a,s,i,h)=>{for(;(a=r.space())&&(i=((h=o[a])&&h(s,t))??(!s&&r.id()));)s=i;return n&&(a==n?e++:l()),s},i=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,h=r.space=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},p=r.id=e=>a(i),o=[],c=(r,l=32,n,a=r.charCodeAt(0),s=r.length,h=o[a],p=r.toUpperCase()!==r)=>o[a]=(a,o,c=e)=>o<l&&(s<2||t.substr(e,s)==r)&&(!p||!i(t.charCodeAt(e+s)))&&(e+=s,n(a,o))||(e=c,h?.(a,o)),f=(e,t,r=0)=>c(e,t,((l,n)=>l&&(n=s(t-r/2))&&[e,l,n])),g=(e,t,r)=>c(e,t,(l=>r?l&&[e,l]:!l&&(l=s(t-.5))&&[e,l])),d=(e,t,r)=>{c(e,t,((l,n)=>(l||r)&&((n=s(t))||r)&&((!l||l[0]!==e)&&(l=[e,l]),(n||r)&&l.push(n),l)))};const u=e=>Array.isArray(e)?m[e[0]](...e.slice(1)):t=>t?.[e],m={},A=(e,t,r=m[e])=>m[e]=(...e)=>t(...e)||r&&r(...e),b=e=>(e=r(e),t=>(e.call?e:e=u(e))(t)),y=(e,t,r)=>r[0]||r[1]?(t?c(e,t,r[0]):o[e.charCodeAt(0)||1]=r[0],A(e,r[1])):r.length?r.length>1?(f(e,Math.abs(t),t<0),A(e,((e,t)=>t&&(e=u(e),t=u(t),e.length||t.length?l=>r(e(l),t(l)):(e=r(e(),t()),()=>e))))):(g(e,t),A(e,((e,t)=>!t&&((e=u(e)).length?t=>r(e(t)):(e=r(e()),()=>e))))):(d(e,Math.abs(t),t<0),A(e,((...e)=>(e=e.map(u),t=>r(...e.map((e=>e(t)))))))),$=e=>e?l():["",(e=+a((e=>46===e||e>=48&&e<=57||(69===e||101===e?2:0))))!=e?l():e],C=(e,t,r,l)=>[e,t,[r=>r?["++"===e?"-":"+",[e,r],["",1]]:[e,s(t-1)],l=(e,t)=>"("===e[0]?l(e[1]):"."===e[0]?(t=e[2],e=u(e[1]),l=>r(e(l),t)):"["===e[0]?([,e,t]=e,e=u(e),t=u(t),l=>r(e(l),t(l))):t=>r(t,e)]],x=["",,[,e=>()=>e],'"',,[e=>e?l():["",(a()+a((e=>e-34?1:0))+(a()||l("Bad string"))).slice(1,-1)]],".",,[e=>!e&&$()],...Array(10).fill(0).flatMap(((e,t)=>[""+t,0,[$]])),",",1,(...e)=>e[e.length-1],"||",4,(...e)=>{let t,r=0;for(;!t&&r<e.length;)t=e[r++];return t},"&&",5,(...e)=>{let t=0,r=!0;for(;r&&t<e.length;)r=e[t++];return r},"+",12,(e,t)=>e+t,"-",12,(e,t)=>e-t,"*",13,(e,t)=>e*t,"/",13,(e,t)=>e/t,"%",13,(e,t)=>e%t,"|",6,(e,t)=>e|t,"&",8,(e,t)=>e&t,"^",7,(e,t)=>e^t,"==",9,(e,t)=>e==t,"!=",9,(e,t)=>e!=t,">",10,(e,t)=>e>t,">=",10,(e,t)=>e>=t,"<",10,(e,t)=>e<t,"<=",10,(e,t)=>e<=t,">>",11,(e,t)=>e>>t,">>>",11,(e,t)=>e>>>t,"<<",11,(e,t)=>e<<t,"+",15,e=>+e,"-",15,e=>-e,"!",15,e=>!e,...C("++",15,((e,t)=>++e[t])),...C("--",15,((e,t)=>--e[t])),"[",18,[e=>e&&["[",e,s(0,93)||l()],(e,t)=>t&&(e=u(e),t=u(t),r=>e(r)[t(r)])],".",18,[(e,t)=>e&&(t=s(18))&&[".",e,t],(e,t)=>(e=u(e),t=t[0]?t:t[1],r=>e(r)[t])],"(",18,[e=>!e&&["(",s(0,41)||l()],u],"(",18,[(e,t)=>e&&((t=s(0,41))?["(",e,t]:["(",e,""]),(e,t,r,l)=>null!=t&&(l=""==t?()=>[]:","===t[0]?(t=t.slice(1).map(u),e=>t.map((t=>t(e)))):(t=u(t),e=>[t(e)]),"."===e[0]?(r=e[2],e=u(e[1]),t=>e(t)[r](...l(t))):"["===e[0]?(r=u(e[2]),e=u(e[1]),t=>e(t)[r(t)](...l(t))):(e=u(e),t=>e(t)(...l(t))))]];for(;x[2];)y(...x.splice(0,3));let E={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},v=r=>(n,s,i="")=>{for(n&&l("Unexpected string"),a();(s=t.charCodeAt(e))-r;)92===s?(a(),s=a(),i+=E[s]||s):i+=a();return a(),["",i]},B=["===",9,(e,t)=>e===t,"!==",9,(e,t)=>e!==t,"~",15,e=>~e,"?",3,[(e,t,r)=>e&&(t=s(2,58))&&["?",e,t,s(3)],(e,t,r)=>(e=u(e),t=u(t),r=u(r),l=>e(l)?t(l):r(l))],"??",6,(e,t)=>e??t,"?.",18,[e=>e&&["?.",e],e=>(e=u(e),t=>e(t)||(()=>{}))],"?.",18,[(e,t)=>e&&!(t=s(18))?.map&&["?.",e,t],(e,t)=>t&&(e=u(e),r=>e(r)?.[t])],"in",10,(e,t)=>e in t,'"',,[v(34)],"'",,[v(39)],"/*",20,[(r,l)=>(a((r=>42!==r&&47!==t.charCodeAt(e+1))),a(2),r||s(l))],"//",20,[(e,t)=>(a((e=>e>=32)),e||s(t))],"null",20,[e=>e?l():["",null]],"true",20,[e=>e?l():["",!0]],"false",20,[e=>e?l():["",!1]],"undefined",20,[e=>e?l():["",void 0]],";",-20,(...e)=>{for(let t=e.length;t--;)if(null!=e[t])return e[t]},"**",-14,(e,t)=>e**t,"[",20,[e=>!e&&["[",s(0,93)||""],(e,t)=>!t&&(e?","===e[0]?(e=e.slice(1).map(u),t=>e.map((e=>e(t)))):(e=u(e),t=>[e(t)]):()=>[])],"{",20,[e=>!e&&["{",s(0,125)||""],(e,t)=>e?","===e[0]?(e=e.slice(1).map(u),t=>Object.fromEntries(e.map((e=>e(t))))):":"===e[0]?(e=u(e),t=>Object.fromEntries([e(t)])):(t=u(e),r=>({[e]:t(r)})):e=>({})],":",1.1,[(e,t)=>[":",e,s(1.1)||l()],(e,t)=>(t=u(t),e=Array.isArray(e)?u(e):(e=>e).bind(0,e),r=>[e(r),t(r)])]];for(;B[2];)y(...B.splice(0,3));export{f as binary,u as compile,t as cur,b as default,l as err,s as expr,p as id,e as idx,i as isId,n as longErr,o as lookup,d as nary,A as operator,m as operators,r as parse,y as set,a as skip,h as space,c as token,g as unary};
+let e,t,r=r=>(e=0,t=r,r=s(),t[e]?l():r||""),l=(r="Bad syntax",l=t[e],n=t.slice(0,e).split("\n"),a=n.pop())=>{throw SyntaxError(`${r} ${l?`\`${l}\` `:""}at ${n.length}:${a.length}`,n.length)},n=(r="Bad syntax",l=t[e],n=t.slice(0,e).split("\n"),a=n.pop())=>{let s=t.slice(e-10,e).split("\n").pop(),i=t.slice(e+1,e+10).split("\n").shift(),h=n.length+":"+a.length;throw EvalError(`${r} at ${h} \`${s+l+i}\`\n${" ".repeat(18+r.length+h.length+s.length+1)}^`)},a=(r=1,l=e,n)=>{if("number"==typeof r)e+=r;else for(;n=r(t.charCodeAt(e));)e+=n;return t.slice(l,e)},s=(t=0,n,a,s,i,h)=>{for(;(a=r.space())&&(i=((h=o[a])&&h(s,t))??(!s&&r.id()));)s=i;return n&&(a==n?e++:l()),s},i=e=>e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122||36==e||95==e||e>=192&&215!=e&&247!=e,h=r.space=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},p=r.id=e=>a(i),o=[],c=(r,l=32,n,a=r.charCodeAt(0),s=r.length,h=o[a],p=r.toUpperCase()!==r)=>o[a]=(a,o,c=e)=>o<l&&(s<2||t.substr(e,s)==r)&&(!p||!i(t.charCodeAt(e+s)))&&(e+=s,n(a,o))||(e=c,h?.(a,o)),g=(e,t,r=0)=>c(e,t,((l,n)=>l&&(n=s(t-r/2))&&[e,l,n])),f=(e,t,r)=>c(e,t,(l=>r?l&&[e,l]:!l&&(l=s(t-.5))&&[e,l])),u=(e,t,r)=>{c(e,t,((l,n)=>(l||r)&&((n=s(t))||r)&&((!l||l[0]!==e)&&(l=[e,l]),(n||r)&&l.push(n),l)))};const d=e=>Array.isArray(e)?m[e[0]](...e.slice(1)):t=>t?.[e],m={},A=(e,t,r=m[e])=>m[e]=(...e)=>t(...e)||r&&r(...e),b=e=>(e=r(e),t=>(e.call?e:e=d(e))(t)),$=(e,t,r)=>r.length?r.length>1?(g(e,Math.abs(t),t<0),A(e,((e,t)=>t&&(e=d(e),t=d(t),e.length||t.length?l=>r(e(l),t(l)):(e=r(e(),t()),()=>e))))):(f(e,t),A(e,((e,t)=>!t&&((e=d(e)).length?t=>r(e(t)):(e=r(e()),()=>e))))):(u(e,Math.abs(t),t<0),A(e,((...e)=>(e=e.map(d),t=>r(...e.map((e=>e(t)))))))),y=e=>e?l():["",(e=+a((e=>46===e||e>=48&&e<=57||(69===e||101===e?2:0))))!=e?l():e],C=(e,t,r,l)=>(c(e,t,(r=>r?["++"===e?"-":"+",[e,r],["",1]]:[e,s(t-1)])),A(e,l=(e,t)=>"("===e[0]?l(e[1]):"."===e[0]?(t=e[2],e=d(e[1]),l=>r(e(l),t)):"["===e[0]?([,e,t]=e,e=d(e),t=d(t),l=>r(e(l),t(l))):t=>r(t,e)));A("",(e=>()=>e)),o[34]=e=>e?l():["",(a()+a((e=>e-34?1:0))+(a()||l("Bad string"))).slice(1,-1)],o[46]=e=>!e&&y();for(let e=0;e<9;e++)o[48+e]=y;$(",",1,((...e)=>e[e.length-1])),$("||",4,((...e)=>{let t,r=0;for(;!t&&r<e.length;)t=e[r++];return t})),$("&&",5,((...e)=>{let t=0,r=!0;for(;r&&t<e.length;)r=e[t++];return r})),$("+",12,((e,t)=>e+t)),$("-",12,((e,t)=>e-t)),$("*",13,((e,t)=>e*t)),$("/",13,((e,t)=>e/t)),$("%",13,((e,t)=>e%t)),$("|",6,((e,t)=>e|t)),$("&",8,((e,t)=>e&t)),$("^",7,((e,t)=>e^t)),$("==",9,((e,t)=>e==t)),$("!=",9,((e,t)=>e!=t)),$(">",10,((e,t)=>e>t)),$(">=",10,((e,t)=>e>=t)),$("<",10,((e,t)=>e<t)),$("<=",10,((e,t)=>e<=t)),$(">>",11,((e,t)=>e>>t)),$(">>>",11,((e,t)=>e>>>t)),$("<<",11,((e,t)=>e<<t)),$("+",15,(e=>+e)),$("-",15,(e=>-e)),$("!",15,(e=>!e)),C("++",15,((e,t)=>++e[t])),C("--",15,((e,t)=>--e[t])),c("[",18,(e=>e&&["[",e,s(0,93)||l()])),A("[",((e,t)=>t&&(e=d(e),t=d(t),r=>e(r)[t(r)]))),c(".",18,((e,t)=>e&&(t=s(18))&&[".",e,t])),A(".",((e,t)=>(e=d(e),t=t[0]?t:t[1],r=>e(r)[t]))),c("(",18,(e=>!e&&["(",s(0,41)||l()])),c("(",18,((e,t)=>e&&((t=s(0,41))?["(",e,t]:["(",e,""]))),A("(",((e,t,r,l)=>null==t?d(e):(l=""==t?()=>[]:","===t[0]?(t=t.slice(1).map(d),e=>t.map((t=>t(e)))):(t=d(t),e=>[t(e)]),"."===e[0]?(r=e[2],e=d(e[1]),t=>e(t)[r](...l(t))):"["===e[0]?(r=d(e[2]),e=d(e[1]),t=>e(t)[r(t)](...l(t))):(e=d(e),t=>e(t)(...l(t))))));let x={n:"\n",r:"\r",t:"\t",b:"\b",f:"\f",v:"\v"},E=r=>(n,s,i="")=>{for(n&&l("Unexpected string"),a();(s=t.charCodeAt(e))-r;)92===s?(a(),s=a(),i+=x[s]||s):i+=a();return a(),["",i]};$("===",9,((e,t)=>e===t)),$("!==",9,((e,t)=>e!==t)),$("~",15,(e=>~e)),c("?",3,((e,t,r)=>e&&(t=s(2,58))&&["?",e,t,s(3)])),A("?",((e,t,r)=>(e=d(e),t=d(t),r=d(r),l=>e(l)?t(l):r(l)))),$("??",6,((e,t)=>e??t)),c("?.",18,(e=>e&&["?.",e])),A("?.",(e=>(e=d(e),t=>e(t)||(()=>{})))),c("?.",18,((e,t)=>e&&!(t=s(18))?.map&&["?.",e,t])),A("?.",((e,t)=>t&&(e=d(e),r=>e(r)?.[t]))),A("(",((e,t,r,l)=>null!=t&&"?."===e[0]&&(l=""==t?()=>[]:","===t[0]?(t=t.slice(1).map(d),e=>t.map((t=>t(e)))):(t=d(t),e=>[t(e)]),r=e[2],e=d(e[1]),t=>e(t)?.[r](...l(t))))),$("in",10,((e,t)=>e in t)),o[34]=E(34),o[39]=E(39),c("/*",20,((r,l)=>(a((r=>42!==r&&47!==t.charCodeAt(e+1))),a(2),r||s(l)||[""]))),c("//",20,((e,t)=>(a((e=>e>=32)),e||s(t)||[""]))),c("null",20,(e=>e?l():["",null])),c("true",20,(e=>e?l():["",!0])),c("false",20,(e=>e?l():["",!1])),c("undefined",20,(e=>e?l():["",void 0])),$(";",-20,((...e)=>{for(let t=e.length;t--;)if(null!=e[t])return e[t]})),$("**",-14,((e,t)=>e**t)),c("[",20,(e=>!e&&["[",s(0,93)||""])),A("[",((e,t)=>!t&&(e?","===e[0]?(e=e.slice(1).map(d),t=>e.map((e=>e(t)))):(e=d(e),t=>[e(t)]):()=>[]))),c("{",20,(e=>!e&&["{",s(0,125)||""])),A("{",((e,t)=>e?","===e[0]?(e=e.slice(1).map(d),t=>Object.fromEntries(e.map((e=>e(t))))):":"===e[0]?(e=d(e),t=>Object.fromEntries([e(t)])):(t=d(e),r=>({[e]:t(r)})):e=>({}))),c(":",1.1,((e,t)=>[":",e,s(1.1)||l()])),A(":",((e,t)=>(t=d(t),e=Array.isArray(e)?d(e):(e=>e).bind(0,e),r=>[e(r),t(r)])));export{g as binary,d as compile,t as cur,b as default,l as err,s as expr,p as id,e as idx,i as isId,n as longErr,o as lookup,u as nary,A as operator,m as operators,r as parse,$ as set,a as skip,h as space,c as token,f as unary};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subscript",
-  "version": "7.4.6",
+  "version": "7.5.1",
   "description": "Fast and tiny expression evaluator with minimal syntax.",
   "main": "subscript.js",
   "module": "subscript.js",

package/parse.js

@@ -1,95 +1,95 @@
-const SPACE=32
+const SPACE = 32
 
 // current string, index and collected ids
 export let idx, cur,
 
-// no handling tagged literals since easily done on user side with cache, if needed
-parse = s => (idx=0, cur=s, s = expr(), cur[idx] ? err() : s || ''),
-
-err = (msg='Bad syntax', frag=cur[idx], prev=cur.slice(0,idx).split('\n'), last=prev.pop()) => {
-  throw SyntaxError(`${msg} ${frag ? `\`${frag}\` ` : ''}at ${prev.length}:${last.length}`, prev.length)
-},
-
-longErr = (msg='Bad syntax',
-  frag=cur[idx],
-  lines=cur.slice(0,idx).split('\n'),
-  last=lines.pop()
-) => {
-  let before = cur.slice(idx-10,idx).split('\n').pop()
-  let after = cur.slice(idx+1, idx+10).split('\n').shift()
-  let location = lines.length + ':' + last.length
-  throw EvalError(`${msg} at ${location} \`${before+frag+after}\`\n${' '.repeat(18 + msg.length + location.length + before.length + 1)}^`)
-},
-
-skip = (is=1, from=idx, l) => {
-  if (typeof is == 'number') idx += is
-  else while (l=is(cur.charCodeAt(idx))) idx+=l
-  return cur.slice(from, idx)
-},
-
-// a + b - c
-expr = (prec=0, end, cc, token, newNode, fn) => {
-  // chunk/token parser
-  while (
-    ( cc=parse.space() ) && // till not end
-    // FIXME: extra work is happening here, when lookup bails out due to lower precedence -
-    // it makes extra `space` call for parent exprs on the same character to check precedence again
-    (newNode =
-      ((fn=lookup[cc]) && fn(token, prec)) ?? // if operator with higher precedence isn't found
-      (!token && parse.id()) // parse literal or quit. token seqs are forbidden: `a b`, `a "b"`, `1.32 a`
+  // no handling tagged literals since easily done on user side with cache, if needed
+  parse = s => (idx = 0, cur = s, s = expr(), cur[idx] ? err() : s || ''),
+
+  err = (msg = 'Bad syntax', frag = cur[idx], prev = cur.slice(0, idx).split('\n'), last = prev.pop()) => {
+    throw SyntaxError(`${msg} ${frag ? `\`${frag}\` ` : ''}at ${prev.length}:${last.length}`, prev.length)
+  },
+
+  longErr = (msg = 'Bad syntax',
+    frag = cur[idx],
+    lines = cur.slice(0, idx).split('\n'),
+    last = lines.pop()
+  ) => {
+    let before = cur.slice(idx - 10, idx).split('\n').pop()
+    let after = cur.slice(idx + 1, idx + 10).split('\n').shift()
+    let location = lines.length + ':' + last.length
+    throw EvalError(`${msg} at ${location} \`${before + frag + after}\`\n${' '.repeat(18 + msg.length + location.length + before.length + 1)}^`)
+  },
+
+  skip = (is = 1, from = idx, l) => {
+    if (typeof is == 'number') idx += is
+    else while (l = is(cur.charCodeAt(idx))) idx += l
+    return cur.slice(from, idx)
+  },
+
+  // a + b - c
+  expr = (prec = 0, end, cc, token, newNode, fn) => {
+    // chunk/token parser
+    while (
+      (cc = parse.space()) && // till not end
+      // FIXME: extra work is happening here, when lookup bails out due to lower precedence -
+      // it makes extra `space` call for parent exprs on the same character to check precedence again
+      (newNode =
+        ((fn = lookup[cc]) && fn(token, prec)) ?? // if operator with higher precedence isn't found
+        (!token && parse.id()) // parse literal or quit. token seqs are forbidden: `a b`, `a "b"`, `1.32 a`
+      )
+    ) token = newNode;
+
+    // check end character
+    // FIXME: can't show "Unclosed paren", because can be unknown operator within group as well
+    if (end) cc == end ? idx++ : err()
+
+    return token
+  },
+
+  isId = c =>
+    (c >= 48 && c <= 57) || // 0..9
+    (c >= 65 && c <= 90) || // A...Z
+    (c >= 97 && c <= 122) || // a...z
+    c == 36 || c == 95 || // $, _,
+    (c >= 192 && c != 215 && c != 247), // any non-ASCII
+
+  // skip space chars, return first non-space character
+  space = parse.space = cc => { while ((cc = cur.charCodeAt(idx)) <= SPACE) idx++; return cc },
+
+  id = parse.id = n => skip(isId),
+
+  // operator/token lookup table
+  // lookup[0] is id parser to let configs redefine it
+  lookup = [],
+
+
+  // create operator checker/mapper (see examples)
+  token = (
+    op,
+    prec = SPACE,
+    map,
+    c = op.charCodeAt(0),
+    l = op.length,
+    prev = lookup[c],
+    word = op.toUpperCase() !== op // make sure word boundary comes after word operator
+  ) => lookup[c] = (a, curPrec, from = idx) =>
+    (curPrec < prec && (l < 2 || cur.substr(idx, l) == op) && (!word || !isId(cur.charCodeAt(idx + l))) && (idx += l, map(a, curPrec))) ||
+    (idx = from, prev?.(a, curPrec)),
+
+  // right assoc is indicated by negative precedence (meaning go from right to left)
+  binary = (op, prec, right = 0) => token(op, prec, (a, b) => a && (b = expr(prec - right / 2)) && [op, a, b]),
+  unary = (op, prec, post) => token(op, prec, a => post ? (a && [op, a]) : (!a && (a = expr(prec - .5)) && [op, a])),
+  nary = (op, prec, skips) => {
+    token(op, prec, (a, b) => (
+      (a || skips) && // if lhs exists or we're ok to skip
+      (b = expr(prec), b || skips) && // either rhs exists or we're ok to skip rhs
+      (
+        (!a || a[0] !== op) && (a = [op, a]), // if beginning of sequence - init node
+        (b || skips) && a.push(b),
+        a
+      ))
     )
-  ) token = newNode;
-
-  // check end character
-  // FIXME: can't show "Unclose paren", because can be unknown operator within group as well
-  if (end) cc==end?idx++:err()
-
-  return token
-},
-
-isId = c =>
-  (c >= 48 && c <= 57) || // 0..9
-  (c >= 65 && c <= 90) || // A...Z
-  (c >= 97 && c <= 122) || // a...z
-  c == 36 || c == 95 || // $, _,
-  (c >= 192 && c != 215 && c != 247), // any non-ASCII
-
-// skip space chars, return first non-space character
-space = parse.space = cc => { while ((cc = cur.charCodeAt(idx)) <= SPACE) idx++; return cc },
-
-id = parse.id = n => skip(isId),
-
-// operator/token lookup table
-// lookup[0] is id parser to let configs redefine it
-lookup = [],
-
-
-// create operator checker/mapper (see examples)
-token = (
-  op,
-  prec=SPACE,
-  map,
-  c=op.charCodeAt(0),
-  l=op.length,
-  prev=lookup[c],
-  word=op.toUpperCase()!==op // make sure word boundary comes after word operator
-) => lookup[c] = (a, curPrec, from=idx) =>
-  (curPrec<prec && (l<2||cur.substr(idx,l)==op) && (!word||!isId(cur.charCodeAt(idx+l))) && (idx+=l, map(a, curPrec))) ||
-  (idx=from, prev?.(a, curPrec)),
-
-// right assoc is indicated by negative precedence (meaning go from right to left)
-binary = (op, prec, right=0) => token(op, prec, (a, b) => a && (b=expr(prec-right/2)) && [op,a,b] ),
-unary = (op, prec, post) => token(op, prec, a => post ? (a && [op, a]) : (!a && (a=expr(prec-.5)) && [op, a])),
-nary = (op, prec, skips) => {
-  token(op, prec, (a, b) => (
-    (a || skips) && // if lhs exists or we're ok to skip
-    (b=expr(prec), b||skips) && // either rhs exists or we're ok to skip rhs
-    (
-      (!a || a[0] !== op) && (a = [op,a]), // if beginning of sequence - init node
-      (b || skips) && a.push(b),
-      a
-    ))
-  )
-}
+  }
 
 export default parse

package/subscript.js

@@ -1,128 +1,116 @@
 import parse, { lookup, nary, binary, unary, token, skip, err, expr } from './parse.js'
 import compile, { operator } from './compile.js'
 
-const OPAREN=40, CPAREN=41, OBRACK=91, CBRACK=93, SPACE=32, DQUOTE=34, PERIOD=46, _0=48, _9=57,
-PREC_SEQ=1, PREC_SOME=4, PREC_EVERY=5, PREC_OR=6, PREC_XOR=7, PREC_AND=8,
-PREC_EQ=9, PREC_COMP=10, PREC_SHIFT=11, PREC_SUM=12, PREC_MULT=13, PREC_UNARY=15, PREC_POSTFIX=16, PREC_CALL=18
-
-const subscript = s => (s=parse(s),ctx => (s.call?s:(s=compile(s)))(ctx)),
-
-// set any operator
-// right assoc is indicated by negative precedence (meaning go from right to left)
-set = (op, prec, fn) =>
-  (fn[0]||fn[1]) ? (prec ? token(op,prec,fn[0]) : (lookup[op.charCodeAt(0)||1]=fn[0]), operator(op, fn[1])) : (
-  !fn.length ? (
-    nary(op, Math.abs(prec), prec<0),
-    operator(op, (...args) => (args=args.map(compile), ctx => fn(...args.map(arg=>arg(ctx)))))
-  ) :
-  fn.length > 1 ? (
-    binary(op, Math.abs(prec), prec<0),
-    operator(op,
-      (a,b) => b && (a=compile(a),b=compile(b), !a.length&&!b.length ? (a=fn(a(),b()),()=>a) : ctx => fn(a(ctx),b(ctx)))
-    )
-  ) :
-  (
-    unary(op, prec),
-    operator(op, (a,b) => !b && (a=compile(a), !a.length ? (a=fn(a()),()=>a) : ctx => fn(a(ctx))))
+const OPAREN = 40, CPAREN = 41, OBRACK = 91, CBRACK = 93, SPACE = 32, DQUOTE = 34, PERIOD = 46, _0 = 48, _9 = 57,
+  PREC_SEQ = 1, PREC_SOME = 4, PREC_EVERY = 5, PREC_OR = 6, PREC_XOR = 7, PREC_AND = 8,
+  PREC_EQ = 9, PREC_COMP = 10, PREC_SHIFT = 11, PREC_SUM = 12, PREC_MULT = 13, PREC_UNARY = 15, PREC_POSTFIX = 16, PREC_CALL = 18
+
+const subscript = s => (s = parse(s), ctx => (s.call ? s : (s = compile(s)))(ctx)),
+
+  // set any operator
+  // right assoc is indicated by negative precedence (meaning go from right to left)
+  set = (op, prec, fn) => (
+    !fn.length ? (
+      nary(op, Math.abs(prec), prec < 0),
+      operator(op, (...args) => (args = args.map(compile), ctx => fn(...args.map(arg => arg(ctx)))))
+    ) :
+      fn.length > 1 ? (
+        binary(op, Math.abs(prec), prec < 0),
+        operator(op,
+          (a, b) => b && (a = compile(a), b = compile(b), !a.length && !b.length ? (a = fn(a(), b()), () => a) : ctx => fn(a(ctx), b(ctx)))
+        )
+      ) :
+        (
+          unary(op, prec),
+          operator(op, (a, b) => !b && (a = compile(a), !a.length ? (a = fn(a()), () => a) : ctx => fn(a(ctx))))
+        )
+  ),
+
+  num = a => a ? err() : ['', (a = +skip(c => c === PERIOD || (c >= _0 && c <= _9) || (c === 69 || c === 101 ? 2 : 0))) != a ? err() : a],
+
+  // create increment-assign pair from fn
+  inc = (op, prec, fn, ev) => (
+    token(op, prec, a => a ? [op === '++' ? '-' : '+', [op, a], ['', 1]] : [op, expr(prec - 1)]), // ++a → [++, a], a++ → [-,[++,a],1]
+    operator(op, ev = (a, b) => (
+      a[0] === '(' ? ev(a[1]) : // ++(((a)))
+        a[0] === '.' ? (b = a[2], a = compile(a[1]), ctx => fn(a(ctx), b)) : // ++a.b
+          a[0] === '[' ? ([, a, b] = a, a = compile(a), b = compile(b), ctx => fn(a(ctx), b(ctx))) : // ++a[b]
+            (ctx => fn(ctx, a)) // ++a
+    ))
   )
-),
-
-num = a => a ? err() : ['', (a=+skip(c => c === PERIOD || (c>=_0 && c<=_9) || (c===69||c===101?2:0)))!=a?err():a],
-// create increment-assign pair from fn
-inc = (op, prec, fn, ev) => [op, prec, [
-  a => a ? [op==='++'?'-':'+',[op,a],['',1]] : [op,expr(prec-1)], // ++a → [++, a], a++ → [-,[++,a],1]
-  ev = (a,b) => (
-    a[0] === '(' ? ev(a[1]) : // ++(((a)))
-    a[0] === '.' ? (b=a[2], a=compile(a[1]), ctx => fn(a(ctx), b)) : // ++a.b
-    a[0] === '[' ? ([,a,b]=a, a=compile(a),b=compile(b), ctx => fn(a(ctx),b(ctx))) : // ++a[b]
-    (ctx => fn(ctx,a)) // ++a
-  )
-]],
-
-list = [
-  // literals
-  // null operator returns first value (needed for direct literals)
-  '',, [,v => () => v],
-
-  '"',, [
-    (a) => a ? err() : ['', (skip() + skip(c => c - DQUOTE ? 1 : 0) + (skip()||err('Bad string'))).slice(1,-1)],
-  ],
-
-  // .1
-  '.',, [a=>!a && num()],
-
-  // 0-9
-  ...Array(10).fill(0).flatMap((_,i)=>[''+i,0,[num]]),
-
-  // sequences
-  ',', PREC_SEQ, (...args) => args[args.length-1],
-  '||', PREC_SOME, (...args) => { let i=0, v; for (; !v && i < args.length; ) v = args[i++]; return v },
-  '&&', PREC_EVERY, (...args) => { let i=0, v=true; for (; v && i < args.length; ) v = args[i++]; return v },
-
-  // binaries
-  '+', PREC_SUM, (a,b)=>a+b,
-  '-', PREC_SUM, (a,b)=>a-b,
-  '*', PREC_MULT, (a,b)=>a*b,
-  '/', PREC_MULT, (a,b)=>a/b,
-  '%', PREC_MULT, (a,b)=>a%b,
-  '|', PREC_OR, (a,b)=>a|b,
-  '&', PREC_AND, (a,b)=>a&b,
-  '^', PREC_XOR, (a,b)=>a^b,
-  '==', PREC_EQ, (a,b)=>a==b,
-  '!=', PREC_EQ, (a,b)=>a!=b,
-  '>', PREC_COMP, (a,b)=>a>b,
-  '>=', PREC_COMP, (a,b)=>a>=b,
-  '<', PREC_COMP, (a,b)=>a<b,
-  '<=', PREC_COMP, (a,b)=>a<=b,
-  '>>', PREC_SHIFT, (a,b)=>a>>b,
-  '>>>', PREC_SHIFT, (a,b)=>a>>>b,
-  '<<', PREC_SHIFT, (a,b)=>a<<b,
-
-  // unaries
-  '+', PREC_UNARY, a => +a,
-  '-', PREC_UNARY, a => -a,
-  '!', PREC_UNARY, a => !a,
-
-  // increments
-  ...inc('++', PREC_UNARY, (a,b) => ++a[b]),
-  ...inc('--', PREC_UNARY, (a,b) => --a[b]),
-
-  // a[b]
-  '[', PREC_CALL, [
-    a => a && ['[', a, expr(0,CBRACK)||err()],
-    (a,b) => b && (a=compile(a), b=compile(b), ctx => a(ctx)[b(ctx)])
-  ],
-
-  // a.b
-  '.', PREC_CALL, [
-    (a,b) => a && (b=expr(PREC_CALL)) && ['.',a,b],
-    (a,b) => (a=compile(a),b=!b[0]?b[1]:b, ctx => a(ctx)[b]) // a.true, a.1 → needs to work fine
-  ],
-
-  // (a,b,c), (a)
-  '(', PREC_CALL, [
-    a => !a && ['(', expr(0,CPAREN)||err()],
-    compile
-  ],
-
-  // a(b,c,d), a()
-  '(', PREC_CALL, [
-    (a,b) => a && (b = expr(0,CPAREN), b ? ['(', a, b] : ['(', a, '']),
-    (a,b,path,args) => b!=null && (
-      args = b=='' ? () => [] : // a()
-      b[0] === ',' ? (b=b.slice(1).map(compile), ctx => b.map(a=>a(ctx))) : // a(b,c)
-      (b=compile(b), ctx => [b(ctx)]), // a(b)
-
-      a[0] === '.' ? (path=a[2], a=compile(a[1]), ctx => a(ctx)[path](...args(ctx))) : // a.b(...args)
-      a[0] === '[' ? (path=compile(a[2]), a=compile(a[1]), ctx => a(ctx)[path(ctx)](...args(ctx))) : // a[b](...args)
-      (a=compile(a), ctx => a(ctx)(...args(ctx))) // a(...args)
-    )
-  ]
-]
-
-for (;list[2];) set(...list.splice(0,3))
+
+
+// literals
+// null operator returns first value (needed for direct literals)
+operator('', v => () => v)
+
+// "a"
+lookup[DQUOTE] = (a) => a ? err() : ['', (skip() + skip(c => c - DQUOTE ? 1 : 0) + (skip() || err('Bad string'))).slice(1, -1)]
+
+// .1
+lookup[PERIOD] = a => !a && num()
+
+// 0-9
+for (let i = 0; i < 9; i++) lookup[_0 + i] = num
+
+// sequences
+set(',', PREC_SEQ, (...args) => args[args.length - 1])
+set('||', PREC_SOME, (...args) => { let i = 0, v; for (; !v && i < args.length;) v = args[i++]; return v })
+set('&&', PREC_EVERY, (...args) => { let i = 0, v = true; for (; v && i < args.length;) v = args[i++]; return v })
+
+// binaries
+set('+', PREC_SUM, (a, b) => a + b)
+set('-', PREC_SUM, (a, b) => a - b)
+set('*', PREC_MULT, (a, b) => a * b)
+set('/', PREC_MULT, (a, b) => a / b)
+set('%', PREC_MULT, (a, b) => a % b)
+set('|', PREC_OR, (a, b) => a | b)
+set('&', PREC_AND, (a, b) => a & b)
+set('^', PREC_XOR, (a, b) => a ^ b)
+set('==', PREC_EQ, (a, b) => a == b)
+set('!=', PREC_EQ, (a, b) => a != b)
+set('>', PREC_COMP, (a, b) => a > b)
+set('>=', PREC_COMP, (a, b) => a >= b)
+set('<', PREC_COMP, (a, b) => a < b)
+set('<=', PREC_COMP, (a, b) => a <= b)
+set('>>', PREC_SHIFT, (a, b) => a >> b)
+set('>>>', PREC_SHIFT, (a, b) => a >>> b)
+set('<<', PREC_SHIFT, (a, b) => a << b)
+
+// unaries
+set('+', PREC_UNARY, a => +a)
+set('-', PREC_UNARY, a => -a)
+set('!', PREC_UNARY, a => !a)
+
+// increments
+inc('++', PREC_UNARY, (a, b) => ++a[b])
+inc('--', PREC_UNARY, (a, b) => --a[b])
+
+// a[b]
+token('[', PREC_CALL, a => a && ['[', a, expr(0, CBRACK) || err()])
+operator('[', (a, b) => b && (a = compile(a), b = compile(b), ctx => a(ctx)[b(ctx)]))
+
+// a.b
+token('.', PREC_CALL, (a, b) => a && (b = expr(PREC_CALL)) && ['.', a, b])
+operator('.', (a, b) => (a = compile(a), b = !b[0] ? b[1] : b, ctx => a(ctx)[b])) // a.true, a.1 → needs to work fine
+
+// (a,b,c), (a)
+token('(', PREC_CALL, a => !a && ['(', expr(0, CPAREN) || err()])
+
+// a(b,c,d), a()
+token('(', PREC_CALL, (a, b) => a && (b = expr(0, CPAREN), b ? ['(', a, b] : ['(', a, '']))
+operator('(', (a, b, path, args) => b == null ? compile(a, b) : (
+  args = b == '' ? () => [] : // a()
+    b[0] === ',' ? (b = b.slice(1).map(compile), ctx => b.map(a => a(ctx))) : // a(b,c)
+      (b = compile(b), ctx => [b(ctx)]), // a(b)
+
+  a[0] === '.' ? (path = a[2], a = compile(a[1]), ctx => a(ctx)[path](...args(ctx))) : // a.b(...args)
+    a[0] === '[' ? (path = compile(a[2]), a = compile(a[1]), ctx => a(ctx)[path(ctx)](...args(ctx))) : // a[b](...args)
+      (a = compile(a), ctx => a(ctx)(...args(ctx))) // a(...args)
+)
+)
 
 export default subscript
-export {set}
+export { set }
 export * from './parse.js'
 export * from './compile.js'

package/subscript.min.js

@@ -1 +1 @@
-let t,e,l=l=>(t=0,e=l,l=s(),e[t]?r():l||""),r=(l="Bad syntax",r=e[t],a=e.slice(0,t).split("\n"),n=a.pop())=>{throw SyntaxError(`${l} ${r?`\`${r}\` `:""}at ${a.length}:${n.length}`,a.length)},a=(l="Bad syntax",r=e[t],a=e.slice(0,t).split("\n"),n=a.pop())=>{let s=e.slice(t-10,t).split("\n").pop(),h=e.slice(t+1,t+10).split("\n").shift(),p=a.length+":"+n.length;throw EvalError(`${l} at ${p} \`${s+r+h}\`\n${" ".repeat(18+l.length+p.length+s.length+1)}^`)},n=(l=1,r=t,a)=>{if("number"==typeof l)t+=l;else for(;a=l(e.charCodeAt(t));)t+=a;return e.slice(r,t)},s=(e=0,a,n,s,h,p)=>{for(;(n=l.space())&&(h=((p=i[n])&&p(s,e))??(!s&&l.id()));)s=h;return a&&(n==a?t++:r()),s},h=t=>t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122||36==t||95==t||t>=192&&215!=t&&247!=t,p=l.space=l=>{for(;(l=e.charCodeAt(t))<=32;)t++;return l},o=l.id=t=>n(h),i=[],c=(l,r=32,a,n=l.charCodeAt(0),s=l.length,p=i[n],o=l.toUpperCase()!==l)=>i[n]=(n,i,c=t)=>i<r&&(s<2||e.substr(t,s)==l)&&(!o||!h(e.charCodeAt(t+s)))&&(t+=s,a(n,i))||(t=c,p?.(n,i)),g=(t,e,l=0)=>c(t,e,((r,a)=>r&&(a=s(e-l/2))&&[t,r,a])),f=(t,e,l)=>c(t,e,(r=>l?r&&[t,r]:!r&&(r=s(e-.5))&&[t,r])),d=(t,e,l)=>{c(t,e,((r,a)=>(r||l)&&((a=s(e))||l)&&((!r||r[0]!==t)&&(r=[t,r]),(a||l)&&r.push(a),r)))};const u=t=>Array.isArray(t)?$[t[0]](...t.slice(1)):e=>e?.[t],$={},A=(t,e,l=$[t])=>$[t]=(...t)=>e(...t)||l&&l(...t),y=t=>(t=l(t),e=>(t.call?t:t=u(t))(e)),C=(t,e,l)=>l[0]||l[1]?(e?c(t,e,l[0]):i[t.charCodeAt(0)||1]=l[0],A(t,l[1])):l.length?l.length>1?(g(t,Math.abs(e),e<0),A(t,((t,e)=>e&&(t=u(t),e=u(e),t.length||e.length?r=>l(t(r),e(r)):(t=l(t(),e()),()=>t))))):(f(t,e),A(t,((t,e)=>!e&&((t=u(t)).length?e=>l(t(e)):(t=l(t()),()=>t))))):(d(t,Math.abs(e),e<0),A(t,((...t)=>(t=t.map(u),e=>l(...t.map((t=>t(e)))))))),m=t=>t?r():["",(t=+n((t=>46===t||t>=48&&t<=57||(69===t||101===t?2:0))))!=t?r():t],b=(t,e,l,r)=>[t,e,[l=>l?["++"===t?"-":"+",[t,l],["",1]]:[t,s(e-1)],r=(t,e)=>"("===t[0]?r(t[1]):"."===t[0]?(e=t[2],t=u(t[1]),r=>l(t(r),e)):"["===t[0]?([,t,e]=t,t=u(t),e=u(e),r=>l(t(r),e(r))):e=>l(e,t)]],x=["",,[,t=>()=>t],'"',,[t=>t?r():["",(n()+n((t=>t-34?1:0))+(n()||r("Bad string"))).slice(1,-1)]],".",,[t=>!t&&m()],...Array(10).fill(0).flatMap(((t,e)=>[""+e,0,[m]])),",",1,(...t)=>t[t.length-1],"||",4,(...t)=>{let e,l=0;for(;!e&&l<t.length;)e=t[l++];return e},"&&",5,(...t)=>{let e=0,l=!0;for(;l&&e<t.length;)l=t[e++];return l},"+",12,(t,e)=>t+e,"-",12,(t,e)=>t-e,"*",13,(t,e)=>t*e,"/",13,(t,e)=>t/e,"%",13,(t,e)=>t%e,"|",6,(t,e)=>t|e,"&",8,(t,e)=>t&e,"^",7,(t,e)=>t^e,"==",9,(t,e)=>t==e,"!=",9,(t,e)=>t!=e,">",10,(t,e)=>t>e,">=",10,(t,e)=>t>=e,"<",10,(t,e)=>t<e,"<=",10,(t,e)=>t<=e,">>",11,(t,e)=>t>>e,">>>",11,(t,e)=>t>>>e,"<<",11,(t,e)=>t<<e,"+",15,t=>+t,"-",15,t=>-t,"!",15,t=>!t,...b("++",15,((t,e)=>++t[e])),...b("--",15,((t,e)=>--t[e])),"[",18,[t=>t&&["[",t,s(0,93)||r()],(t,e)=>e&&(t=u(t),e=u(e),l=>t(l)[e(l)])],".",18,[(t,e)=>t&&(e=s(18))&&[".",t,e],(t,e)=>(t=u(t),e=e[0]?e:e[1],l=>t(l)[e])],"(",18,[t=>!t&&["(",s(0,41)||r()],u],"(",18,[(t,e)=>t&&((e=s(0,41))?["(",t,e]:["(",t,""]),(t,e,l,r)=>null!=e&&(r=""==e?()=>[]:","===e[0]?(e=e.slice(1).map(u),t=>e.map((e=>e(t)))):(e=u(e),t=>[e(t)]),"."===t[0]?(l=t[2],t=u(t[1]),e=>t(e)[l](...r(e))):"["===t[0]?(l=u(t[2]),t=u(t[1]),e=>t(e)[l(e)](...r(e))):(t=u(t),e=>t(e)(...r(e))))]];for(;x[2];)C(...x.splice(0,3));export{g as binary,u as compile,e as cur,y as default,r as err,s as expr,o as id,t as idx,h as isId,a as longErr,i as lookup,d as nary,A as operator,$ as operators,l as parse,C as set,n as skip,p as space,c as token,f as unary};
+let t,e,l=l=>(t=0,e=l,l=s(),e[t]?r():l||""),r=(l="Bad syntax",r=e[t],n=e.slice(0,t).split("\n"),a=n.pop())=>{throw SyntaxError(`${l} ${r?`\`${r}\` `:""}at ${n.length}:${a.length}`,n.length)},n=(l="Bad syntax",r=e[t],n=e.slice(0,t).split("\n"),a=n.pop())=>{let s=e.slice(t-10,t).split("\n").pop(),h=e.slice(t+1,t+10).split("\n").shift(),p=n.length+":"+a.length;throw EvalError(`${l} at ${p} \`${s+r+h}\`\n${" ".repeat(18+l.length+p.length+s.length+1)}^`)},a=(l=1,r=t,n)=>{if("number"==typeof l)t+=l;else for(;n=l(e.charCodeAt(t));)t+=n;return e.slice(r,t)},s=(e=0,n,a,s,h,p)=>{for(;(a=l.space())&&(h=((p=g[a])&&p(s,e))??(!s&&l.id()));)s=h;return n&&(a==n?t++:r()),s},h=t=>t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122||36==t||95==t||t>=192&&215!=t&&247!=t,p=l.space=l=>{for(;(l=e.charCodeAt(t))<=32;)t++;return l},o=l.id=t=>a(h),g=[],i=(l,r=32,n,a=l.charCodeAt(0),s=l.length,p=g[a],o=l.toUpperCase()!==l)=>g[a]=(a,g,i=t)=>g<r&&(s<2||e.substr(t,s)==l)&&(!o||!h(e.charCodeAt(t+s)))&&(t+=s,n(a,g))||(t=i,p?.(a,g)),c=(t,e,l=0)=>i(t,e,((r,n)=>r&&(n=s(e-l/2))&&[t,r,n])),d=(t,e,l)=>i(t,e,(r=>l?r&&[t,r]:!r&&(r=s(e-.5))&&[t,r])),f=(t,e,l)=>{i(t,e,((r,n)=>(r||l)&&((n=s(e))||l)&&((!r||r[0]!==t)&&(r=[t,r]),(n||l)&&r.push(n),r)))};const u=t=>Array.isArray(t)?$[t[0]](...t.slice(1)):e=>e?.[t],$={},y=(t,e,l=$[t])=>$[t]=(...t)=>e(...t)||l&&l(...t),A=t=>(t=l(t),e=>(t.call?t:t=u(t))(e)),m=(t,e,l)=>l.length?l.length>1?(c(t,Math.abs(e),e<0),y(t,((t,e)=>e&&(t=u(t),e=u(e),t.length||e.length?r=>l(t(r),e(r)):(t=l(t(),e()),()=>t))))):(d(t,e),y(t,((t,e)=>!e&&((t=u(t)).length?e=>l(t(e)):(t=l(t()),()=>t))))):(f(t,Math.abs(e),e<0),y(t,((...t)=>(t=t.map(u),e=>l(...t.map((t=>t(e)))))))),C=t=>t?r():["",(t=+a((t=>46===t||t>=48&&t<=57||(69===t||101===t?2:0))))!=t?r():t],b=(t,e,l,r)=>(i(t,e,(l=>l?["++"===t?"-":"+",[t,l],["",1]]:[t,s(e-1)])),y(t,r=(t,e)=>"("===t[0]?r(t[1]):"."===t[0]?(e=t[2],t=u(t[1]),r=>l(t(r),e)):"["===t[0]?([,t,e]=t,t=u(t),e=u(e),r=>l(t(r),e(r))):e=>l(e,t)));y("",(t=>()=>t)),g[34]=t=>t?r():["",(a()+a((t=>t-34?1:0))+(a()||r("Bad string"))).slice(1,-1)],g[46]=t=>!t&&C();for(let t=0;t<9;t++)g[48+t]=C;m(",",1,((...t)=>t[t.length-1])),m("||",4,((...t)=>{let e,l=0;for(;!e&&l<t.length;)e=t[l++];return e})),m("&&",5,((...t)=>{let e=0,l=!0;for(;l&&e<t.length;)l=t[e++];return l})),m("+",12,((t,e)=>t+e)),m("-",12,((t,e)=>t-e)),m("*",13,((t,e)=>t*e)),m("/",13,((t,e)=>t/e)),m("%",13,((t,e)=>t%e)),m("|",6,((t,e)=>t|e)),m("&",8,((t,e)=>t&e)),m("^",7,((t,e)=>t^e)),m("==",9,((t,e)=>t==e)),m("!=",9,((t,e)=>t!=e)),m(">",10,((t,e)=>t>e)),m(">=",10,((t,e)=>t>=e)),m("<",10,((t,e)=>t<e)),m("<=",10,((t,e)=>t<=e)),m(">>",11,((t,e)=>t>>e)),m(">>>",11,((t,e)=>t>>>e)),m("<<",11,((t,e)=>t<<e)),m("+",15,(t=>+t)),m("-",15,(t=>-t)),m("!",15,(t=>!t)),b("++",15,((t,e)=>++t[e])),b("--",15,((t,e)=>--t[e])),i("[",18,(t=>t&&["[",t,s(0,93)||r()])),y("[",((t,e)=>e&&(t=u(t),e=u(e),l=>t(l)[e(l)]))),i(".",18,((t,e)=>t&&(e=s(18))&&[".",t,e])),y(".",((t,e)=>(t=u(t),e=e[0]?e:e[1],l=>t(l)[e]))),i("(",18,(t=>!t&&["(",s(0,41)||r()])),i("(",18,((t,e)=>t&&((e=s(0,41))?["(",t,e]:["(",t,""]))),y("(",((t,e,l,r)=>null==e?u(t):(r=""==e?()=>[]:","===e[0]?(e=e.slice(1).map(u),t=>e.map((e=>e(t)))):(e=u(e),t=>[e(t)]),"."===t[0]?(l=t[2],t=u(t[1]),e=>t(e)[l](...r(e))):"["===t[0]?(l=u(t[2]),t=u(t[1]),e=>t(e)[l(e)](...r(e))):(t=u(t),e=>t(e)(...r(e))))));export{c as binary,u as compile,e as cur,A as default,r as err,s as expr,o as id,t as idx,h as isId,n as longErr,g as lookup,f as nary,y as operator,$ as operators,l as parse,m as set,a as skip,p as space,i as token,d as unary};