From 7847c20022b4f84507e5603a16374a09196e8972 Mon Sep 17 00:00:00 2001 From: SheetJS Date: Mon, 30 Aug 2021 17:46:24 -0400 Subject: [PATCH] version bump 1.3.0: memoization --- bits/01_version.js | 2 +- bits/10_tokenize.js | 7 +++++-- bits/50_doit.js | 21 +++++++++++---------- bits/54_convmisc.js | 3 ++- ctest/printj.js | 33 +++++++++++++++++++-------------- dist/printj.js | 33 +++++++++++++++++++-------------- dist/printj.min.js | 2 +- dist/printj.min.map | 2 +- lib/loop_code.mjs | 33 +++++++++++++++++++-------------- package.json | 15 +++++++++------ printj.flow.js | 33 +++++++++++++++++++-------------- printj.js | 33 +++++++++++++++++++-------------- printj.mjs | 33 +++++++++++++++++++-------------- 13 files changed, 144 insertions(+), 106 deletions(-) diff --git a/bits/01_version.js b/bits/01_version.js index 692e487..dac9450 100644 --- a/bits/01_version.js +++ b/bits/01_version.js @@ -1 +1 @@ -PRINTJ.version = '1.2.3'; +PRINTJ.version = '1.3.0'; diff --git a/bits/10_tokenize.js b/bits/10_tokenize.js index 0a5277b..2a4ca74 100644 --- a/bits/10_tokenize.js +++ b/bits/10_tokenize.js @@ -4,8 +4,11 @@ #define GETCHAR c = fmt.charCodeAt(i); #endif +var tcache = {}; + #define DRAIN(idx) if(start < idx) out.push(["L", fmt.substring(start, idx)]); function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { + if(tcache[fmt]) return tcache[fmt]; var out/*:ParsedFmt*/ = []; var start/*:number*/ = 0; @@ -16,7 +19,7 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { DRAIN(m.index) start = m.index + m[0].length; if(m[0] === "%%") out.push(["%","%"]); - else out.push([m[6], m[0], m[1], m[2], m[3], m[4], m[5]]); + else out.push([m[6], m[0]||"", m[1]||"", m[2]||"", m[3]||"", m[4]||"", m[5]||""]); } #else /* NOT USE_REGEX */ @@ -74,5 +77,5 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { #endif /* USE_REGEX */ if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } diff --git a/bits/50_doit.js b/bits/50_doit.js index 408cd03..229355b 100644 --- a/bits/50_doit.js +++ b/bits/50_doit.js @@ -10,7 +10,8 @@ var u_inspect/*:(o:any)=>string*/ = (typeof util != 'undefined') ? util.inspect #endif function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { - var o/*:Array*/ = []; + //var o/*:Array*/ = []; + var o = ""; var argidx/*:number*/ = 0, idx/*:number*/ = 0; var Vnum/*:number*/ = 0; var pad/*:string*/ = ""; @@ -18,24 +19,24 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var m/*:ParsedEntry*/ = t[i], c/*:number*/ = (m[0]/*:string*/).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O/*:string*/ = ""; var isnum/*:number*/ = 0, radix/*:number*/ = 10, bytes/*:number*/ = SIZEOF_INT, sign/*:boolean*/ = false; /* flags */ - var flags/*:string*/ = m[IDX_FLAGS]||""; + var flags/*:string*/ = m[IDX_FLAGS]/*||""*/; var alt/*:boolean*/ = flags.indexOf("#") > -1; /* position */ - if(m[IDX_POS]) argidx = parseInt(m[IDX_POS])-1; + if(m[IDX_POS]) argidx = parseInt(m[IDX_POS], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } #define GRAB_INT(NAME, IDX, DFL) \ var NAME/*:number*/ = DFL; \ - if(m[IDX] != null && m[IDX].length > 0) { \ + if(/*m[IDX] != null &&*/ m[IDX].length > 0) { \ if(m[IDX].charAt(0) !== '*') NAME = parseInt(m[IDX], 10); \ else if(m[IDX].length === 1) NAME = args[idx++]; \ else NAME = args[parseInt(m[IDX].substr(1), 10)-1]; \ @@ -54,7 +55,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var arg/*:any*/ = args[argidx]; /* grab length */ - var len/*:string*/ = m[IDX_LEN] || ""; + var len/*:string*/ = m[IDX_LEN]/* || ""*/; #define INT isnum = -1 #define SGN(s) sign = s @@ -81,7 +82,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { #include "70_float.js" } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } diff --git a/bits/54_convmisc.js b/bits/54_convmisc.js index a2fa44a..b77498d 100644 --- a/bits/54_convmisc.js +++ b/bits/54_convmisc.js @@ -11,7 +11,8 @@ /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ diff --git a/ctest/printj.js b/ctest/printj.js index a7de1cc..09bd070 100644 --- a/ctest/printj.js +++ b/ctest/printj.js @@ -25,9 +25,12 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.2.2'; +PRINTJ.version = '1.3.0'; + +var tcache = {}; function tokenize(fmt) { + if(tcache[fmt]) return tcache[fmt]; var out = []; var start = 0; @@ -146,7 +149,7 @@ function tokenize(fmt) { } if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } /*global process:true, util:true, require:true */ @@ -154,7 +157,8 @@ if(typeof process !== 'undefined' && !!process.versions && !!process.versions.no var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; function doit(t, args) { - var o = []; + //var o = []; + var o = ""; var argidx = 0, idx = 0; var Vnum = 0; var pad = ""; @@ -162,26 +166,26 @@ function doit(t, args) { var m = t[i], c = (m[0]).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O = ""; var isnum = 0, radix = 10, bytes = 4, sign = false; /* flags */ - var flags = m[3]||""; + var flags = m[3]/*||""*/; var alt = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -190,7 +194,7 @@ function doit(t, args) { var arg = args[argidx]; /* grab length */ - var len = m[6] || ""; + var len = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -276,7 +280,8 @@ function doit(t, args) { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -575,9 +580,9 @@ function doit(t, args) { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt, args) { return doit(tokenize(fmt), args); } diff --git a/dist/printj.js b/dist/printj.js index 778d0bb..09bd070 100644 --- a/dist/printj.js +++ b/dist/printj.js @@ -25,9 +25,12 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.2.3'; +PRINTJ.version = '1.3.0'; + +var tcache = {}; function tokenize(fmt) { + if(tcache[fmt]) return tcache[fmt]; var out = []; var start = 0; @@ -146,7 +149,7 @@ function tokenize(fmt) { } if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } /*global process:true, util:true, require:true */ @@ -154,7 +157,8 @@ if(typeof process !== 'undefined' && !!process.versions && !!process.versions.no var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; function doit(t, args) { - var o = []; + //var o = []; + var o = ""; var argidx = 0, idx = 0; var Vnum = 0; var pad = ""; @@ -162,26 +166,26 @@ function doit(t, args) { var m = t[i], c = (m[0]).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O = ""; var isnum = 0, radix = 10, bytes = 4, sign = false; /* flags */ - var flags = m[3]||""; + var flags = m[3]/*||""*/; var alt = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -190,7 +194,7 @@ function doit(t, args) { var arg = args[argidx]; /* grab length */ - var len = m[6] || ""; + var len = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -276,7 +280,8 @@ function doit(t, args) { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -575,9 +580,9 @@ function doit(t, args) { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt, args) { return doit(tokenize(fmt), args); } diff --git a/dist/printj.min.js b/dist/printj.min.js index 00e7cfd..43d92ba 100644 --- a/dist/printj.min.js +++ b/dist/printj.min.js @@ -1,2 +1,2 @@ /* printj.js (C) 2016-present SheetJS -- http://sheetjs.com */ -var PRINTJ;(function(factory){if(typeof DO_NOT_EXPORT_PRINTJ==="undefined"){if("object"===typeof exports){factory(exports)}else if("function"===typeof define&&define.amd){define(function(){var module={};factory(module);return module})}else{factory(PRINTJ={})}}else{factory(PRINTJ={})}})(function(PRINTJ){PRINTJ.version="1.2.3";function tokenize(fmt){var out=[];var start=0;var i=0;var infmt=false;var fmtparam="",fmtflags="",fmtwidth="",fmtprec="",fmtlen="";var c=0;var L=fmt.length;for(;i=48&&c<58){if(fmtprec.length)fmtprec+=String.fromCharCode(c);else if(c==48&&!fmtwidth.length)fmtflags+=String.fromCharCode(c);else fmtwidth+=String.fromCharCode(c)}else switch(c){case 36:if(fmtprec.length)fmtprec+="$";else if(fmtwidth.charAt(0)=="*")fmtwidth+="$";else{fmtparam=fmtwidth+"$";fmtwidth=""}break;case 39:fmtflags+="'";break;case 45:fmtflags+="-";break;case 43:fmtflags+="+";break;case 32:fmtflags+=" ";break;case 35:fmtflags+="#";break;case 46:fmtprec=".";break;case 42:if(fmtprec.charAt(0)==".")fmtprec+="*";else fmtwidth+="*";break;case 104:;case 108:if(fmtlen.length>1)throw"bad length "+fmtlen+String(c);fmtlen+=String.fromCharCode(c);break;case 76:;case 106:;case 122:;case 116:;case 113:;case 90:;case 119:if(fmtlen!=="")throw"bad length "+fmtlen+String.fromCharCode(c);fmtlen=String.fromCharCode(c);break;case 73:if(fmtlen!=="")throw"bad length "+fmtlen+"I";fmtlen="I";break;case 100:;case 105:;case 111:;case 117:;case 120:;case 88:;case 102:;case 70:;case 101:;case 69:;case 103:;case 71:;case 97:;case 65:;case 99:;case 67:;case 115:;case 83:;case 112:;case 110:;case 68:;case 85:;case 79:;case 109:;case 98:;case 66:;case 121:;case 89:;case 74:;case 86:;case 84:;case 37:infmt=false;if(fmtprec.length>1)fmtprec=fmtprec.substr(1);out.push([String.fromCharCode(c),fmt.substring(start,i+1),fmtparam,fmtflags,fmtwidth,fmtprec,fmtlen]);start=i+1;fmtlen=fmtprec=fmtwidth=fmtflags=fmtparam="";break;default:throw new Error("Invalid format string starting with |"+fmt.substring(start,i+1)+"|");}}if(start-1;if(m[2])argidx=parseInt(m[2])-1;else if(c===109&&!alt){o.push("Success");continue}var width=0;if(m[4]!=null&&m[4].length>0){if(m[4].charAt(0)!=="*")width=parseInt(m[4],10);else if(m[4].length===1)width=args[idx++];else width=args[parseInt(m[4].substr(1),10)-1]}var prec=-1;if(m[5]!=null&&m[5].length>0){if(m[5].charAt(0)!=="*")prec=parseInt(m[5],10);else if(m[5].length===1)prec=args[idx++];else prec=args[parseInt(m[5].substr(1),10)-1]}if(!m[2])argidx=idx++;var arg=args[argidx];var len=m[6]||"";switch(c){case 83:;case 115:O=String(arg);if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 67:;case 99:switch(typeof arg){case"number":var cc=arg;if(c==67||len.charCodeAt(0)===108){cc&=4294967295;O=String.fromCharCode(cc)}else{cc&=255;O=String.fromCharCode(cc)}break;case"string":O=arg.charAt(0);break;default:O=String(arg).charAt(0);}if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 68:bytes=8;case 100:;case 105:isnum=-1;sign=true;break;case 85:bytes=8;case 117:isnum=-1;break;case 79:bytes=8;case 111:isnum=-1;radix=8;break;case 120:isnum=-1;radix=-16;break;case 88:isnum=-1;radix=16;break;case 66:bytes=8;case 98:isnum=-1;radix=2;break;case 70:;case 102:isnum=1;break;case 69:;case 101:isnum=2;break;case 71:;case 103:isnum=3;break;case 65:;case 97:isnum=4;break;case 112:Vnum=typeof arg=="number"?arg:arg?Number(arg.l):-1;if(isNaN(Vnum))Vnum=-1;if(alt)O=Vnum.toString(10);else{Vnum=Math.abs(Vnum);O="0x"+Vnum.toString(16).toLowerCase()}break;case 110:if(arg){arg.len=0;for(var oo=0;oo=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;}if(width<0){width=-width;flags+="-"}if(isnum==-1){Vnum=Number(arg);switch(len){case"hh":{bytes=1}break;case"h":{bytes=2}break;case"l":{if(bytes==4)bytes=8}break;case"L":;case"q":;case"ll":{if(bytes==4)bytes=8}break;case"j":{if(bytes==4)bytes=8}break;case"t":{if(bytes==4)bytes=8}break;case"z":;case"Z":{if(bytes==4)bytes=8}break;case"I":{if(bytes==4)bytes=8}break;case"w":break;}switch(bytes){case 1:Vnum=Vnum&255;if(sign&&Vnum>127)Vnum-=255+1;break;case 2:Vnum=Vnum&65535;if(sign&&Vnum>32767)Vnum-=65535+1;break;case 4:Vnum=sign?Vnum|0:Vnum>>>0;break;default:Vnum=isNaN(Vnum)?0:Math.round(Vnum);break;}if(bytes>4&&Vnum<0&&!sign){if(radix==16||radix==-16){O=(Vnum>>>0).toString(16);Vnum=Math.floor((Vnum-(Vnum>>>0))/Math.pow(2,32));O=(Vnum>>>0).toString(16)+(8-O.length>=0?"0".repeat(8-O.length):"")+O;O=(16-O.length>=0?"f".repeat(16-O.length):"")+O;if(radix==16)O=O.toUpperCase()}else if(radix==8){O=(Vnum>>>0).toString(8);O=(10-O.length>=0?"0".repeat(10-O.length):"")+O;Vnum=Math.floor((Vnum-(Vnum>>>0&1073741823))/Math.pow(2,30));O=(Vnum>>>0).toString(8)+O.substr(O.length-10);O=O.substr(O.length-20);O="1"+(21-O.length>=0?"7".repeat(21-O.length):"")+O}else{Vnum=-Vnum%1e16;var d1=[1,8,4,4,6,7,4,4,0,7,3,7,0,9,5,5,1,6,1,6];var di=d1.length-1;while(Vnum>0){if((d1[di]-=Vnum%10)<0){d1[di]+=10;d1[di-1]--}--di;Vnum=Math.floor(Vnum/10)}O=d1.join("")}}else{if(radix===-16)O=Vnum.toString(16).toLowerCase();else if(radix===16)O=Vnum.toString(16).toUpperCase();else O=Vnum.toString(radix)}if(prec===0&&O=="0"&&!(radix==8&&alt))O="";else{if(O.length=0?"0".repeat(prec-O.length):"")+O;else O=O.substr(0,1)+(prec+1-O.length>=0?"0".repeat(prec+1-O.length):"")+O.substr(1)}if(!sign&&alt&&Vnum!==0)switch(radix){case-16:O="0x"+O;break;case 16:O="0X"+O;break;case 8:if(O.charAt(0)!="0")O="0"+O;break;case 2:O="0b"+O;break;}}if(sign&&O.charAt(0)!="-"){if(flags.indexOf("+")>-1)O="+"+O;else if(flags.indexOf(" ")>-1)O=" "+O}if(width>0){if(O.length-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&prec<0&&O.length>0){if(prec>O.length)O=(prec-O.length>=0?"0".repeat(prec-O.length):"")+O;pad=width-O.length>=0?(prec>0?" ":"0").repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}}}else if(isnum>0){Vnum=Number(arg);if(arg===null)Vnum=0/0;if(len=="L")bytes=12;var isf=isFinite(Vnum);if(!isf){if(Vnum<0)O="-";else if(flags.indexOf("+")>-1)O="+";else if(flags.indexOf(" ")>-1)O=" ";O+=isNaN(Vnum)?"nan":"inf"}else{var E=0;if(prec==-1&&isnum!=4)prec=6;if(isnum==3){O=Vnum.toExponential(1);E=+O.substr(O.indexOf("e")+1);if(prec===0)prec=1;if(prec>E&&E>=-4){isnum=11;prec=prec-(E+1)}else{isnum=12;prec=prec-1}}var sg=Vnum<0||1/Vnum==-Infinity?"-":"";if(Vnum<0)Vnum=-Vnum;switch(isnum){case 1:;case 11:if(Vnum<1e21){O=Vnum.toFixed(prec);if(isnum==1){if(prec===0&&alt&&O.indexOf(".")==-1)O+="."}else if(!alt)O=O.replace(/(\.\d*[1-9])0*$/,"$1").replace(/\.0*$/,"");else if(O.indexOf(".")==-1)O+=".";break}O=Vnum.toExponential(20);E=+O.substr(O.indexOf("e")+1);O=O.charAt(0)+O.substr(2,O.indexOf("e")-2);O=O+(E-O.length+1>=0?"0".repeat(E-O.length+1):"");if(alt||prec>0&&isnum!==11)O=O+"."+(prec>=0?"0".repeat(prec):"");break;case 2:;case 12:O=Vnum.toExponential(prec);E=O.indexOf("e");if(O.length-E===3)O=O.substr(0,E+2)+"0"+O.substr(E+2);if(alt&&O.indexOf(".")==-1)O=O.substr(0,E)+"."+O.substr(E);else if(!alt&&isnum==12)O=O.replace(/\.0*e/,"e").replace(/\.(\d*[1-9])0*e/,".$1e");break;case 4:if(Vnum===0){O="0x0"+(alt||prec>0?"."+(prec>=0?"0".repeat(prec):""):"")+"p+0";break}O=Vnum.toString(16);var ac=O.charCodeAt(0);if(ac==48){ac=2;E=-4;Vnum*=16;while(O.charCodeAt(ac++)==48){E-=4;Vnum*=16}O=Vnum.toString(16);ac=O.charCodeAt(0)}var ai=O.indexOf(".");if(O.indexOf("(")>-1){var am=O.match(/\(e(.*)\)/);var ae=am?+am[1]:0;E+=4*ae;Vnum/=Math.pow(16,ae)}else if(ai>1){E+=4*(ai-1);Vnum/=Math.pow(16,ai-1)}else if(ai==-1){E+=4*(O.length-1);Vnum/=Math.pow(16,O.length-1)}if(bytes>8){if(ac<50){E-=3;Vnum*=8}else if(ac<52){E-=2;Vnum*=4}else if(ac<56){E-=1;Vnum*=2}}else{if(ac>=56){E+=3;Vnum/=8}else if(ac>=52){E+=2;Vnum/=4}else if(ac>=50){E+=1;Vnum/=2}}O=Vnum.toString(16);if(O.length>1){if(O.length>prec+2&&O.charCodeAt(prec+2)>=56){var _f=O.charCodeAt(0)==102;O=(Vnum+8*Math.pow(16,-prec-1)).toString(16);if(_f&&O.charCodeAt(0)==49)E+=4}if(prec>0){O=O.substr(0,prec+2);if(O.length=0?"0".repeat(prec+2-O.length):"")+O.substr(1);else O+=prec+2-O.length>=0?"0".repeat(prec+2-O.length):""}}else if(prec===0)O=O.charAt(0)+(alt?".":"")}else if(prec>0)O=O+"."+(prec>=0?"0".repeat(prec):"");else if(alt)O=O+".";O="0x"+O+"p"+(E>=0?"+"+E:E);break;}if(sg===""){if(flags.indexOf("+")>-1)sg="+";else if(flags.indexOf(" ")>-1)sg=" "}O=sg+O}if(width>O.length){if(flags.indexOf("-")>-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&O.length>0&&isf){pad=width-O.length>=0?"0".repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}if(c<96)O=O.toUpperCase()}o.push(O)}return o.join("")}function vsprintf(fmt,args){return doit(tokenize(fmt),args)}function sprintf(){var args=new Array(arguments.length-1);for(var i=0;i=48&&c<58){if(fmtprec.length)fmtprec+=String.fromCharCode(c);else if(c==48&&!fmtwidth.length)fmtflags+=String.fromCharCode(c);else fmtwidth+=String.fromCharCode(c)}else switch(c){case 36:if(fmtprec.length)fmtprec+="$";else if(fmtwidth.charAt(0)=="*")fmtwidth+="$";else{fmtparam=fmtwidth+"$";fmtwidth=""}break;case 39:fmtflags+="'";break;case 45:fmtflags+="-";break;case 43:fmtflags+="+";break;case 32:fmtflags+=" ";break;case 35:fmtflags+="#";break;case 46:fmtprec=".";break;case 42:if(fmtprec.charAt(0)==".")fmtprec+="*";else fmtwidth+="*";break;case 104:;case 108:if(fmtlen.length>1)throw"bad length "+fmtlen+String(c);fmtlen+=String.fromCharCode(c);break;case 76:;case 106:;case 122:;case 116:;case 113:;case 90:;case 119:if(fmtlen!=="")throw"bad length "+fmtlen+String.fromCharCode(c);fmtlen=String.fromCharCode(c);break;case 73:if(fmtlen!=="")throw"bad length "+fmtlen+"I";fmtlen="I";break;case 100:;case 105:;case 111:;case 117:;case 120:;case 88:;case 102:;case 70:;case 101:;case 69:;case 103:;case 71:;case 97:;case 65:;case 99:;case 67:;case 115:;case 83:;case 112:;case 110:;case 68:;case 85:;case 79:;case 109:;case 98:;case 66:;case 121:;case 89:;case 74:;case 86:;case 84:;case 37:infmt=false;if(fmtprec.length>1)fmtprec=fmtprec.substr(1);out.push([String.fromCharCode(c),fmt.substring(start,i+1),fmtparam,fmtflags,fmtwidth,fmtprec,fmtlen]);start=i+1;fmtlen=fmtprec=fmtwidth=fmtflags=fmtparam="";break;default:throw new Error("Invalid format string starting with |"+fmt.substring(start,i+1)+"|");}}if(start-1;if(m[2])argidx=parseInt(m[2],10)-1;else if(c===109&&!alt){o+="Success";continue}var width=0;if(m[4].length>0){if(m[4].charAt(0)!=="*")width=parseInt(m[4],10);else if(m[4].length===1)width=args[idx++];else width=args[parseInt(m[4].substr(1),10)-1]}var prec=-1;if(m[5].length>0){if(m[5].charAt(0)!=="*")prec=parseInt(m[5],10);else if(m[5].length===1)prec=args[idx++];else prec=args[parseInt(m[5].substr(1),10)-1]}if(!m[2])argidx=idx++;var arg=args[argidx];var len=m[6];switch(c){case 83:;case 115:O=String(arg);if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 67:;case 99:switch(typeof arg){case"number":var cc=arg;if(c==67||len.charCodeAt(0)===108){cc&=4294967295;O=String.fromCharCode(cc)}else{cc&=255;O=String.fromCharCode(cc)}break;case"string":O=arg.charAt(0);break;default:O=String(arg).charAt(0);}if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 68:bytes=8;case 100:;case 105:isnum=-1;sign=true;break;case 85:bytes=8;case 117:isnum=-1;break;case 79:bytes=8;case 111:isnum=-1;radix=8;break;case 120:isnum=-1;radix=-16;break;case 88:isnum=-1;radix=16;break;case 66:bytes=8;case 98:isnum=-1;radix=2;break;case 70:;case 102:isnum=1;break;case 69:;case 101:isnum=2;break;case 71:;case 103:isnum=3;break;case 65:;case 97:isnum=4;break;case 112:Vnum=typeof arg=="number"?arg:arg?Number(arg.l):-1;if(isNaN(Vnum))Vnum=-1;if(alt)O=Vnum.toString(10);else{Vnum=Math.abs(Vnum);O="0x"+Vnum.toString(16).toLowerCase()}break;case 110:if(arg){arg.len=o.length}continue;case 109:if(!(arg instanceof Error))O="Success";else if(arg.message)O=arg.message;else if(arg.errno)O="Error number "+arg.errno;else O="Error "+String(arg);break;case 74:O=(alt?u_inspect:JSON.stringify)(arg);break;case 86:O=arg==null?"null":String(arg.valueOf());break;case 84:if(alt){O=Object.prototype.toString.call(arg).substr(8);O=O.substr(0,O.length-1)}else O=typeof arg;break;case 89:;case 121:O=arg?alt?"yes":"true":alt?"no":"false";if(c==89)O=O.toUpperCase();if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;}if(width<0){width=-width;flags+="-"}if(isnum==-1){Vnum=Number(arg);switch(len){case"hh":{bytes=1}break;case"h":{bytes=2}break;case"l":{if(bytes==4)bytes=8}break;case"L":;case"q":;case"ll":{if(bytes==4)bytes=8}break;case"j":{if(bytes==4)bytes=8}break;case"t":{if(bytes==4)bytes=8}break;case"z":;case"Z":{if(bytes==4)bytes=8}break;case"I":{if(bytes==4)bytes=8}break;case"w":break;}switch(bytes){case 1:Vnum=Vnum&255;if(sign&&Vnum>127)Vnum-=255+1;break;case 2:Vnum=Vnum&65535;if(sign&&Vnum>32767)Vnum-=65535+1;break;case 4:Vnum=sign?Vnum|0:Vnum>>>0;break;default:Vnum=isNaN(Vnum)?0:Math.round(Vnum);break;}if(bytes>4&&Vnum<0&&!sign){if(radix==16||radix==-16){O=(Vnum>>>0).toString(16);Vnum=Math.floor((Vnum-(Vnum>>>0))/Math.pow(2,32));O=(Vnum>>>0).toString(16)+(8-O.length>=0?"0".repeat(8-O.length):"")+O;O=(16-O.length>=0?"f".repeat(16-O.length):"")+O;if(radix==16)O=O.toUpperCase()}else if(radix==8){O=(Vnum>>>0).toString(8);O=(10-O.length>=0?"0".repeat(10-O.length):"")+O;Vnum=Math.floor((Vnum-(Vnum>>>0&1073741823))/Math.pow(2,30));O=(Vnum>>>0).toString(8)+O.substr(O.length-10);O=O.substr(O.length-20);O="1"+(21-O.length>=0?"7".repeat(21-O.length):"")+O}else{Vnum=-Vnum%1e16;var d1=[1,8,4,4,6,7,4,4,0,7,3,7,0,9,5,5,1,6,1,6];var di=d1.length-1;while(Vnum>0){if((d1[di]-=Vnum%10)<0){d1[di]+=10;d1[di-1]--}--di;Vnum=Math.floor(Vnum/10)}O=d1.join("")}}else{if(radix===-16)O=Vnum.toString(16).toLowerCase();else if(radix===16)O=Vnum.toString(16).toUpperCase();else O=Vnum.toString(radix)}if(prec===0&&O=="0"&&!(radix==8&&alt))O="";else{if(O.length=0?"0".repeat(prec-O.length):"")+O;else O=O.substr(0,1)+(prec+1-O.length>=0?"0".repeat(prec+1-O.length):"")+O.substr(1)}if(!sign&&alt&&Vnum!==0)switch(radix){case-16:O="0x"+O;break;case 16:O="0X"+O;break;case 8:if(O.charAt(0)!="0")O="0"+O;break;case 2:O="0b"+O;break;}}if(sign&&O.charAt(0)!="-"){if(flags.indexOf("+")>-1)O="+"+O;else if(flags.indexOf(" ")>-1)O=" "+O}if(width>0){if(O.length-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&prec<0&&O.length>0){if(prec>O.length)O=(prec-O.length>=0?"0".repeat(prec-O.length):"")+O;pad=width-O.length>=0?(prec>0?" ":"0").repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}}}else if(isnum>0){Vnum=Number(arg);if(arg===null)Vnum=0/0;if(len=="L")bytes=12;var isf=isFinite(Vnum);if(!isf){if(Vnum<0)O="-";else if(flags.indexOf("+")>-1)O="+";else if(flags.indexOf(" ")>-1)O=" ";O+=isNaN(Vnum)?"nan":"inf"}else{var E=0;if(prec==-1&&isnum!=4)prec=6;if(isnum==3){O=Vnum.toExponential(1);E=+O.substr(O.indexOf("e")+1);if(prec===0)prec=1;if(prec>E&&E>=-4){isnum=11;prec=prec-(E+1)}else{isnum=12;prec=prec-1}}var sg=Vnum<0||1/Vnum==-Infinity?"-":"";if(Vnum<0)Vnum=-Vnum;switch(isnum){case 1:;case 11:if(Vnum<1e21){O=Vnum.toFixed(prec);if(isnum==1){if(prec===0&&alt&&O.indexOf(".")==-1)O+="."}else if(!alt)O=O.replace(/(\.\d*[1-9])0*$/,"$1").replace(/\.0*$/,"");else if(O.indexOf(".")==-1)O+=".";break}O=Vnum.toExponential(20);E=+O.substr(O.indexOf("e")+1);O=O.charAt(0)+O.substr(2,O.indexOf("e")-2);O=O+(E-O.length+1>=0?"0".repeat(E-O.length+1):"");if(alt||prec>0&&isnum!==11)O=O+"."+(prec>=0?"0".repeat(prec):"");break;case 2:;case 12:O=Vnum.toExponential(prec);E=O.indexOf("e");if(O.length-E===3)O=O.substr(0,E+2)+"0"+O.substr(E+2);if(alt&&O.indexOf(".")==-1)O=O.substr(0,E)+"."+O.substr(E);else if(!alt&&isnum==12)O=O.replace(/\.0*e/,"e").replace(/\.(\d*[1-9])0*e/,".$1e");break;case 4:if(Vnum===0){O="0x0"+(alt||prec>0?"."+(prec>=0?"0".repeat(prec):""):"")+"p+0";break}O=Vnum.toString(16);var ac=O.charCodeAt(0);if(ac==48){ac=2;E=-4;Vnum*=16;while(O.charCodeAt(ac++)==48){E-=4;Vnum*=16}O=Vnum.toString(16);ac=O.charCodeAt(0)}var ai=O.indexOf(".");if(O.indexOf("(")>-1){var am=O.match(/\(e(.*)\)/);var ae=am?+am[1]:0;E+=4*ae;Vnum/=Math.pow(16,ae)}else if(ai>1){E+=4*(ai-1);Vnum/=Math.pow(16,ai-1)}else if(ai==-1){E+=4*(O.length-1);Vnum/=Math.pow(16,O.length-1)}if(bytes>8){if(ac<50){E-=3;Vnum*=8}else if(ac<52){E-=2;Vnum*=4}else if(ac<56){E-=1;Vnum*=2}}else{if(ac>=56){E+=3;Vnum/=8}else if(ac>=52){E+=2;Vnum/=4}else if(ac>=50){E+=1;Vnum/=2}}O=Vnum.toString(16);if(O.length>1){if(O.length>prec+2&&O.charCodeAt(prec+2)>=56){var _f=O.charCodeAt(0)==102;O=(Vnum+8*Math.pow(16,-prec-1)).toString(16);if(_f&&O.charCodeAt(0)==49)E+=4}if(prec>0){O=O.substr(0,prec+2);if(O.length=0?"0".repeat(prec+2-O.length):"")+O.substr(1);else O+=prec+2-O.length>=0?"0".repeat(prec+2-O.length):""}}else if(prec===0)O=O.charAt(0)+(alt?".":"")}else if(prec>0)O=O+"."+(prec>=0?"0".repeat(prec):"");else if(alt)O=O+".";O="0x"+O+"p"+(E>=0?"+"+E:E);break;}if(sg===""){if(flags.indexOf("+")>-1)sg="+";else if(flags.indexOf(" ")>-1)sg=" "}O=sg+O}if(width>O.length){if(flags.indexOf("-")>-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&O.length>0&&isf){pad=width-O.length>=0?"0".repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}if(c<96)O=O.toUpperCase()}o+=O}return o}function vsprintf(fmt,args){return doit(tokenize(fmt),args)}function sprintf(){var args=new Array(arguments.length-1);for(var i=0;istring*/ = JSON.stringify; function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { - var o/*:Array*/ = []; + //var o/*:Array*/ = []; + var o = ""; var argidx/*:number*/ = 0, idx/*:number*/ = 0; var Vnum/*:number*/ = 0; var pad/*:string*/ = ""; @@ -144,26 +148,26 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var m/*:ParsedEntry*/ = t[i], c/*:number*/ = (m[0]/*:string*/).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O/*:string*/ = ""; var isnum/*:number*/ = 0, radix/*:number*/ = 10, bytes/*:number*/ = 4, sign/*:boolean*/ = false; /* flags */ - var flags/*:string*/ = m[3]||""; + var flags/*:string*/ = m[3]/*||""*/; var alt/*:boolean*/ = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -172,7 +176,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var arg/*:any*/ = args[argidx]; /* grab length */ - var len/*:string*/ = m[6] || ""; + var len/*:string*/ = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -258,7 +262,8 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -557,9 +562,9 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt/*:string*/, args/*:Args*/)/*:string*/ { return doit(tokenize(fmt), args); } diff --git a/package.json b/package.json index fa02946..cc2a481 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "printj", - "version": "1.2.3", + "version": "1.3.0", "author": "sheetjs", "description": "Pure-JS printf", "keywords": [ @@ -22,11 +22,11 @@ "dependencies": { }, "devDependencies": { - "mocha": "~2.5.3", - "blanket": "~1.2.3", "@sheetjs/uglify-js": "~2.7.3", "@types/node": "^8.0.7", + "blanket": "~1.2.3", "dtslint": "^0.1.2", + "mocha": "~2.5.3", "typescript": "2.2.0" }, "repository": { @@ -46,11 +46,14 @@ }, "alex": { "allow": [ - "period", "just", "special", "invalid" + "special", + "period", + "just", + "invalid" ] }, - "homepage": "http://sheetjs.com/opensource", - "files": ["printj.js", "printj.mjs", "bin/printj.njs", "LICENSE", "README.md", "dist/*.js", "dist/*.map", "dist/LICENSE", "types/index.d.ts", "types/*.json"], + "homepage": "https://sheetjs.com/", + "files": ["printj.js", "printj.mjs", "bin/printj.njs", "LICENSE", "README.md", "shim.js", "dist/*.js", "dist/*.map", "dist/LICENSE", "types/index.d.ts", "types/*.json"], "bugs": { "url": "https://github.com/SheetJS/printj/issues" }, diff --git a/printj.flow.js b/printj.flow.js index 72b367c..68358d2 100644 --- a/printj.flow.js +++ b/printj.flow.js @@ -28,9 +28,12 @@ var PRINTJ/*:PRINTJModule*/; /*jshint ignore:end */ }(function(PRINTJ/*:PRINTJModule*/) { -PRINTJ.version = '1.2.3'; +PRINTJ.version = '1.3.0'; + +var tcache = {}; function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { + if(tcache[fmt]) return tcache[fmt]; var out/*:ParsedFmt*/ = []; var start/*:number*/ = 0; @@ -149,7 +152,7 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { } if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } /*:: var util = require('util'); */ @@ -158,7 +161,8 @@ if(typeof process !== 'undefined' && !!process.versions && !!process.versions.no var u_inspect/*:(o:any)=>string*/ = (typeof util != 'undefined') ? util.inspect : JSON.stringify; function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { - var o/*:Array*/ = []; + //var o/*:Array*/ = []; + var o = ""; var argidx/*:number*/ = 0, idx/*:number*/ = 0; var Vnum/*:number*/ = 0; var pad/*:string*/ = ""; @@ -166,26 +170,26 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var m/*:ParsedEntry*/ = t[i], c/*:number*/ = (m[0]/*:string*/).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O/*:string*/ = ""; var isnum/*:number*/ = 0, radix/*:number*/ = 10, bytes/*:number*/ = 4, sign/*:boolean*/ = false; /* flags */ - var flags/*:string*/ = m[3]||""; + var flags/*:string*/ = m[3]/*||""*/; var alt/*:boolean*/ = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -194,7 +198,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var arg/*:any*/ = args[argidx]; /* grab length */ - var len/*:string*/ = m[6] || ""; + var len/*:string*/ = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -280,7 +284,8 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -579,9 +584,9 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt/*:string*/, args/*:Args*/)/*:string*/ { return doit(tokenize(fmt), args); } diff --git a/printj.js b/printj.js index 778d0bb..09bd070 100644 --- a/printj.js +++ b/printj.js @@ -25,9 +25,12 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.2.3'; +PRINTJ.version = '1.3.0'; + +var tcache = {}; function tokenize(fmt) { + if(tcache[fmt]) return tcache[fmt]; var out = []; var start = 0; @@ -146,7 +149,7 @@ function tokenize(fmt) { } if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } /*global process:true, util:true, require:true */ @@ -154,7 +157,8 @@ if(typeof process !== 'undefined' && !!process.versions && !!process.versions.no var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; function doit(t, args) { - var o = []; + //var o = []; + var o = ""; var argidx = 0, idx = 0; var Vnum = 0; var pad = ""; @@ -162,26 +166,26 @@ function doit(t, args) { var m = t[i], c = (m[0]).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O = ""; var isnum = 0, radix = 10, bytes = 4, sign = false; /* flags */ - var flags = m[3]||""; + var flags = m[3]/*||""*/; var alt = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -190,7 +194,7 @@ function doit(t, args) { var arg = args[argidx]; /* grab length */ - var len = m[6] || ""; + var len = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -276,7 +280,8 @@ function doit(t, args) { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -575,9 +580,9 @@ function doit(t, args) { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt, args) { return doit(tokenize(fmt), args); } diff --git a/printj.mjs b/printj.mjs index 12d1c62..109cd30 100644 --- a/printj.mjs +++ b/printj.mjs @@ -7,11 +7,14 @@ var PRINTJ/*:PRINTJModule*/ = /*::(*/{}/*:: :any)*/; -PRINTJ.version = '1.2.3'; +PRINTJ.version = '1.3.0'; export const version = PRINTJ.version; +var tcache = {}; + function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { + if(tcache[fmt]) return tcache[fmt]; var out/*:ParsedFmt*/ = []; var start/*:number*/ = 0; @@ -130,13 +133,14 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { } if(start < fmt.length) out.push(["L", fmt.substring(start)]); - return out; + return (tcache[fmt] = out); } var u_inspect/*:(o:any)=>string*/ = JSON.stringify; function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { - var o/*:Array*/ = []; + //var o/*:Array*/ = []; + var o = ""; var argidx/*:number*/ = 0, idx/*:number*/ = 0; var Vnum/*:number*/ = 0; var pad/*:string*/ = ""; @@ -144,26 +148,26 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var m/*:ParsedEntry*/ = t[i], c/*:number*/ = (m[0]/*:string*/).charCodeAt(0); /* m order: conv full param flags width prec length */ - if(c === /*L*/ 76) { o.push(m[1]); continue; } - if(c === /*%*/ 37) { o.push("%"); continue; } + if(c === /*L*/ 76) { o += /*o.push*/(m[1]); continue; } + if(c === /*%*/ 37) { o += /*o.push*/("%"); continue; } var O/*:string*/ = ""; var isnum/*:number*/ = 0, radix/*:number*/ = 10, bytes/*:number*/ = 4, sign/*:boolean*/ = false; /* flags */ - var flags/*:string*/ = m[3]||""; + var flags/*:string*/ = m[3]/*||""*/; var alt/*:boolean*/ = flags.indexOf("#") > -1; /* position */ - if(m[2]) argidx = parseInt(m[2])-1; + if(m[2]) argidx = parseInt(m[2], 10)-1; /* %m special case */ - else if(c === /*m*/ 109 && !alt) { o.push("Success"); continue; } + else if(c === /*m*/ 109 && !alt) { o += /*.push*/("Success"); continue; } /* grab width */ - var width = 0; if(m[ 4] != null && m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } + var width = 0; if( m[ 4].length > 0) { if(m[ 4].charAt(0) !== '*') width = parseInt(m[ 4], 10); else if(m[ 4].length === 1) width = args[idx++]; else width = args[parseInt(m[ 4].substr(1), 10)-1]; } /* grab precision */ - var prec = -1; if(m[ 5] != null && m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } + var prec = -1; if( m[ 5].length > 0) { if(m[ 5].charAt(0) !== '*') prec = parseInt(m[ 5], 10); else if(m[ 5].length === 1) prec = args[idx++]; else prec = args[parseInt(m[ 5].substr(1), 10)-1]; } /* position not specified */ if(!m[2]) argidx = idx++; @@ -172,7 +176,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { var arg/*:any*/ = args[argidx]; /* grab length */ - var len/*:string*/ = m[6] || ""; + var len/*:string*/ = m[6]/* || ""*/; switch(c) { /* str cCsS */ @@ -258,7 +262,8 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { /* store length in the `len` key */ case /*n*/ 110: - if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } + if(arg) { arg.len = o.length; } + //if(arg) { arg.len=0; for(var oo/*:number*/ = 0; oo < o.length; ++oo) arg.len += o[oo].length; } continue; /* process error */ @@ -557,9 +562,9 @@ function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { } - o.push(O); + o += /*.push*/(O); } - return o.join(""); + return o/*.join("")*/; } function vsprintf(fmt/*:string*/, args/*:Args*/)/*:string*/ { return doit(tokenize(fmt), args); }