subscript 7.3.0 → 7.4.0

package/compile.js

@@ -1,8 +1,8 @@
-// build optimized evaluator for the tree
-export const compile = (node) => !Array.isArray(node) ? ctx => ctx?.[node] : operators[node[0]](...node.slice(1)),
-
-operators = {},
-
-operator = (op, fn, prev=operators[op]) => operators[op] = (...args) => fn(...args) || prev && prev(...args)
-
-export default compile
+// build optimized evaluator for the tree
+export const compile = (node) => !Array.isArray(node) ? ctx => ctx?.[node] : operators[node[0]](...node.slice(1)),
+
+operators = {},
+
+operator = (op, fn, prev=operators[op]) => operators[op] = (...args) => fn(...args) || prev && prev(...args)
+
+export default compile

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 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
-
-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
-      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, [a => expr()||['']],
-
-  // 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))
-
-export default subscript
-export * from './subscript.js'
+// justin lang https://github.com/endojs/Jessie/issues/66
+import { skip, cur, idx, err, expr } from './parse.js'
+import compile 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
+
+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
+      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) => args.findLast(i => i != null),
+
+  // 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))
+
+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}\` at ${n.length}:${a.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(),p=n.length+":"+a.length;throw SyntaxError(`${r} at ${p} \`${s+l+i}\`\n${" ".repeat(18+r.length+p.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,p)=>{for(;(a=r.space())&&(i=((p=h[a])&&p(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,p=r.space=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},o=r.id=e=>a(i),h=[],c=(r,l=32,n,a=r.charCodeAt(0),s=r.length,p=h[a],o=r.toUpperCase()!==r)=>h[a]=(a,h,c=e)=>h<l&&(s<2||t.substr(e,s)==r)&&(!o||!i(t.charCodeAt(e+s)))&&(e+=s,n(a,h))||(e=c,p?.(a,h)),f=(e,t,r)=>c(e,t,((l,n)=>l&&(n=s(t-!!r))&&[e,l,n])),d=(e,t,r)=>c(e,t,(l=>r?l&&[e,l]:!l&&(l=s(t-1))&&[e,l])),g=(e,t,r)=>c(e,t,((l,n)=>l&&((n=s(t))||r)&&(l[0]===e&&l[2]?(n&&l.push(n),l):[e,l,n])));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),y=e=>(e=r(e),t=>(e.call?e:e=u(e))(t)),b=(e,t,r)=>r[0]||r[1]?(t?c(e,t,r[0]):h[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))))):(d(e,t),A(e,((e,t)=>!t&&((e=u(e)).length?t=>r(e(t)):(e=r(e()),()=>e))))):(g(e,t),A(e,((...e)=>(e=e.map(u),t=>r(...e.map((e=>e(t)))))))),C=e=>e?l():["",(e=+a((e=>46===e||e>=48&&e<=57||(69===e||101===e?2:0))))!=e?l():e],$=(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&&C()],...Array(10).fill(0).flatMap(((e,t)=>[""+t,0,[C]])),",",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,...$("++",15,((e,t)=>++e[t])),...$("--",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=>e&&["(",e,s(0,41)||""],(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];)b(...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=>s()||[""]],"**",-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];)b(...B.splice(0,3));export{f as binary,u as compile,t as cur,y as default,l as err,s as expr,o as id,e as idx,i as isId,n as longErr,h as lookup,g as nary,A as operator,m as operators,r as parse,b as set,a as skip,p as space,c as token,d 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(),p=n.length+":"+a.length;throw EvalError(`${r} at ${p} \`${s+l+i}\`\n${" ".repeat(18+r.length+p.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,p)=>{for(;(a=r.space())&&(i=((p=o[a])&&p(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,p=r.space=r=>{for(;(r=t.charCodeAt(e))<=32;)e++;return r},h=r.id=e=>a(i),o=[],c=(r,l=32,n,a=r.charCodeAt(0),s=r.length,p=o[a],h=r.toUpperCase()!==r)=>o[a]=(a,o,c=e)=>o<l&&(s<2||t.substr(e,s)==r)&&(!h||!i(t.charCodeAt(e+s)))&&(e+=s,n(a,o))||(e=c,p?.(a,o)),f=(e,t,r)=>c(e,t,((l,n)=>l&&(n=s(t-!!r))&&[e,l,n])),d=(e,t,r)=>c(e,t,(l=>r?l&&[e,l]:!l&&(l=s(t-1))&&[e,l])),g=(e,t,r)=>c(e,t,((l,n)=>(l||r&&(l=[e]))&&((n=s(t))||r)&&(l[0]===e&&l[2]?(n&&l.push(n),l):[e,l,n])));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))))):(d(e,t),A(e,((e,t)=>!t&&((e=u(e)).length?t=>r(e(t)):(e=r(e()),()=>e))))):(g(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)=>e.findLast((e=>null!=e)),"**",-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,h as id,e as idx,i as isId,n as longErr,o as lookup,g as nary,A as operator,m as operators,r as parse,y as set,a as skip,p as space,c as token,d as unary};

package/package.json

@@ -1,83 +1,83 @@
-{
-  "name": "subscript",
-  "version": "7.3.0",
-  "description": "Fast and tiny expression evaluator with common syntax microlanguage.",
-  "main": "subscript.js",
-  "module": "subscript.js",
-  "browser": "subscript.js",
-  "exports": {
-    ".": "./subscript.js",
-    "./parse.js": "./parse.js",
-    "./compile.js": "./compile.js",
-    "./subscript.js": "./subscript.js",
-    "./justin.js": "./justin.js"
-  },
-  "type": "module",
-  "files": [
-    "parse.js",
-    "compile.js",
-    "subscript.js",
-    "subscript.min.js",
-    "justin.js",
-    "justin.min.js"
-  ],
-  "directories": {
-    "lib": "lib",
-    "src": "src",
-    "test": "test"
-  },
-  "scripts": {
-    "build": "npm run build-subscript && npm run build-justin",
-    "min": "npm run min-subscript && npm run min-justin",
-    "build-subscript": "rollup subscript.js --file subscript.min.js --format esm --name \"Subscript\"",
-    "min-subscript": "terser subscript.min.js -o subscript.min.js --module -c passes=3 -m",
-    "build-justin": "rollup justin.js --file justin.min.js --format esm --name \"Justin\"",
-    "min-justin": "terser justin.min.js -o justin.min.js --module -c passes=3 -m",
-    "test": "node test && node test/jsep && node test/perf"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/spectjs/subscript.git"
-  },
-  "keywords": [
-    "jexl",
-    "jsep",
-    "expression",
-    "evaluator",
-    "parser",
-    "evaluation",
-    "math",
-    "arithmetic",
-    "justin",
-    "eval",
-    "math-eval",
-    "math-evaluator",
-    "math-expression-evaluator",
-    "calculation",
-    "jessie",
-    "jessica",
-    "eval",
-    "dsl",
-    "json",
-    "calculator",
-    "calc",
-    "math.js",
-    "mathjs",
-    "math-codegen",
-    "math-parser",
-    "formula",
-    "operator",
-    "overload"
-  ],
-  "author": "Dmitry Iv.",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/spectjs/subscript/issues"
-  },
-  "homepage": "https://github.com/spectjs/subscript#readme",
-  "devDependencies": {
-    "rollup": "^2.60.2",
-    "terser": "^5.10.0",
-    "tst": "^7.1.1"
-  }
-}
+{
+  "name": "subscript",
+  "version": "7.4.0",
+  "description": "Fast and tiny expression evaluator with common syntax microlanguage.",
+  "main": "subscript.js",
+  "module": "subscript.js",
+  "browser": "subscript.js",
+  "exports": {
+    ".": "./subscript.js",
+    "./parse.js": "./parse.js",
+    "./compile.js": "./compile.js",
+    "./subscript.js": "./subscript.js",
+    "./justin.js": "./justin.js"
+  },
+  "type": "module",
+  "files": [
+    "parse.js",
+    "compile.js",
+    "subscript.js",
+    "subscript.min.js",
+    "justin.js",
+    "justin.min.js"
+  ],
+  "directories": {
+    "lib": "lib",
+    "src": "src",
+    "test": "test"
+  },
+  "scripts": {
+    "build": "npm run build-subscript && npm run build-justin",
+    "min": "npm run min-subscript && npm run min-justin",
+    "build-subscript": "rollup subscript.js --file subscript.min.js --format esm --name \"Subscript\"",
+    "min-subscript": "terser subscript.min.js -o subscript.min.js --module -c passes=3 -m",
+    "build-justin": "rollup justin.js --file justin.min.js --format esm --name \"Justin\"",
+    "min-justin": "terser justin.min.js -o justin.min.js --module -c passes=3 -m",
+    "test": "node test && node test/jsep && node test/perf"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/spectjs/subscript.git"
+  },
+  "keywords": [
+    "jexl",
+    "jsep",
+    "expression",
+    "evaluator",
+    "parser",
+    "evaluation",
+    "math",
+    "arithmetic",
+    "justin",
+    "eval",
+    "math-eval",
+    "math-evaluator",
+    "math-expression-evaluator",
+    "calculation",
+    "jessie",
+    "jessica",
+    "eval",
+    "dsl",
+    "json",
+    "calculator",
+    "calc",
+    "math.js",
+    "mathjs",
+    "math-codegen",
+    "math-parser",
+    "formula",
+    "operator",
+    "overload"
+  ],
+  "author": "Dmitry Iv.",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/spectjs/subscript/issues"
+  },
+  "homepage": "https://github.com/spectjs/subscript#readme",
+  "devDependencies": {
+    "rollup": "^2.60.2",
+    "terser": "^5.10.0",
+    "tst": "^7.1.1"
+  }
+}

package/parse.js

@@ -1,85 +1,85 @@
-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}\` at ${prev.length}:${last.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 SyntaxError(`${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 "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) => token(op, prec, (a, b) => a && (b=expr(prec-!!right)) && [op,a,b] ),
-unary = (op, prec, post) => token(op, prec, a => post ? (a && [op, a]) : (!a && (a=expr(prec-1)) && [op, a])),
-nary = (op, prec, skips) => token(op, prec, (a, b) => a && (b=expr(prec),b||skips) && (a[0] === op && a[2] ? (b&&a.push(b), a) : [op,a,b]))
-
-export default parse
+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`
+    )
+  ) 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) => token(op, prec, (a, b) => a && (b=expr(prec-!!right)) && [op,a,b] ),
+unary = (op, prec, post) => token(op, prec, a => post ? (a && [op, a]) : (!a && (a=expr(prec-1)) && [op, a])),
+nary = (op, prec, skips) => token(op, prec, (a, b) => (a || (skips && (a=[op]))) && (b=expr(prec),b||skips) && (a[0] === op && a[2] ? (b && a.push(b), a) : [op,a,b]))
+
+export default parse