dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error messages in the qjs repl ##js

This commit is contained in:
pancake 2022-12-29 23:15:11 +01:00
parent f663fb0298
commit 739b297a5d
3 changed files with 192 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/lang/p/qjs.c
View File

@ -460,7 +460,7 @@ static void register_helpers(JSContext *ctx) {
JS_SetPropertyStr (ctx, global_obj, "print", JS_NewCFunction (ctx, js_print, "print", 1));
eval (ctx, "setTimeout = (x,y) => x();");
eval (ctx, "function dump(x) {"
"console.log(JSON.stringify(x, null, 2));"
"console.log((typeof x==='string')?x:JSON.stringify(x, null, 2));"
"}");
eval (ctx, "var console = { log:print, error:print, debug:print };");
eval (ctx, "r2.cmdj = (x) => JSON.parse(r2.cmd(x));");

375
shlr/qjs/js_repl.c
View File

@ -26,45 +26,45 @@ static const char *const js_repl_qjs = "" \
",term_cursor_x=0;function termInit(){for(term_fd=0,(term_widt"\
"h=+r2cmd(\"?vi $c\"))<1&&(term_width=80),term_read_buf=new Uint"\
"8Array(64),cmd_start(),running=!0;running;)try{term_read_hand"\
"ler(),flush()}catch(r){console.error(r)}}function term_read_h"\
"andler(){var r=os.read(term_fd,term_read_buf.buffer,0,term_re"\
"ad_buf.length);for(let e=0;e<r;e++)handle_byte(term_read_buf["\
"e])}function handle_byte(r){utf8?0!==utf8_state&&128<=r&&r<19"\
"2?(utf8_val=utf8_val<<6|63&r,0==--utf8_state&&handle_char(utf"\
"8_val)):192<=r&&r<248?(utf8_state=1+(224<=r)+(240<=r),utf8_va"\
"l=r&(1<<6-utf8_state)-1):(utf8_state=0,handle_char(r)):handle"\
"_char(r)}function is_alpha(r){return\"string\"==typeof r&&(\"A\"<"\
"=r&&r<=\"Z\"||\"a\"<=r&&r<=\"z\")}function is_digit(r){return\"strin"\
"g\"==typeof r&&\"0\"<=r&&r<=\"9\"}function is_word(r){return\"strin"\
"g\"==typeof r&&(is_alpha(r)||is_digit(r)||\"_\"===r||\"$\"===r)}fu"\
"nction ucs_length(r){let e,t,n;var o=r.length;for(e=0,n=0;n<o"\
";n++)((t=r.charCodeAt(n))<56320||57344<=t)&&e++;return e}func"\
"tion is_trailing_surrogate(r){if(\"string\"==typeof r)return 56"\
"320<=(r=r.codePointAt(0))&&r<57344}function is_balanced(r,e){"\
"switch(r+e){case\"()\":case\"[]\":case\"{}\":return 1}}function pri"\
"nt_color_text(r,e,t){let n,o;for(o=e;o<r.length;){const e=t[n"\
"=o];for(;++o<r.length&&t[o]===e;);write(colors[styles[e]||\"de"\
"fault\"]),write(r.substring(n,o)),write(colors.none)}}function"\
" print_csi(r,e){write(\"""\x1b""[\"+(1!==r?r:\"\")+e)}function move_c"\
"ursor(r){let e;if(0<r)for(;0<r;)term_cursor_x===term_width-1?"\
"(write(\"\\n\"),term_cursor_x=0,r--):(print_csi(e=Math.min(term_"\
"width-1-term_cursor_x,r),\"C\"),r-=e,term_cursor_x+=e);else for"\
"(r=-r;0<r;)0===term_cursor_x?(print_csi(1,\"A\"),print_csi(term"\
"_width-1,\"C\"),r--,term_cursor_x=term_width-1):(print_csi(e=Ma"\
"th.min(r,term_cursor_x),\"D\"),r-=e,term_cursor_x-=e)}function "\
"update(){var r;cmd!==last_cmd&&(show_colors||last_cmd.substri"\
"ler(),flush()}catch(e){console.error(e)}}function term_read_h"\
"andler(){var e=os.read(term_fd,term_read_buf.buffer,0,term_re"\
"ad_buf.length);for(let r=0;r<e;r++)handle_byte(term_read_buf["\
"r])}function handle_byte(e){utf8?0!==utf8_state&&128<=e&&e<19"\
"2?(utf8_val=utf8_val<<6|63&e,0==--utf8_state&&handle_char(utf"\
"8_val)):192<=e&&e<248?(utf8_state=1+(224<=e)+(240<=e),utf8_va"\
"l=e&(1<<6-utf8_state)-1):(utf8_state=0,handle_char(e)):handle"\
"_char(e)}function is_alpha(e){return\"string\"==typeof e&&(\"A\"<"\
"=e&&e<=\"Z\"||\"a\"<=e&&e<=\"z\")}function is_digit(e){return\"strin"\
"g\"==typeof e&&\"0\"<=e&&e<=\"9\"}function is_word(e){return\"strin"\
"g\"==typeof e&&(is_alpha(e)||is_digit(e)||\"_\"===e||\"$\"===e)}fu"\
"nction ucs_length(e){let r,t,n;var o=e.length;for(r=0,n=0;n<o"\
";n++)((t=e.charCodeAt(n))<56320||57344<=t)&&r++;return r}func"\
"tion is_trailing_surrogate(e){if(\"string\"==typeof e)return 56"\
"320<=(e=e.codePointAt(0))&&e<57344}function is_balanced(e,r){"\
"switch(e+r){case\"()\":case\"[]\":case\"{}\":return 1}}function pri"\
"nt_color_text(e,r,t){let n,o;for(o=r;o<e.length;){const r=t[n"\
"=o];for(;++o<e.length&&t[o]===r;);write(colors[styles[r]||\"de"\
"fault\"]),write(e.substring(n,o)),write(colors.none)}}function"\
" print_csi(e,r){write(\"""\x1b""[\"+(1!==e?e:\"\")+r)}function move_c"\
"ursor(e){let r;if(0<e)for(;0<e;)term_cursor_x===term_width-1?"\
"(write(\"\\n\"),term_cursor_x=0,e--):(print_csi(r=Math.min(term_"\
"width-1-term_cursor_x,e),\"C\"),e-=r,term_cursor_x+=r);else for"\
"(e=-e;0<e;)0===term_cursor_x?(print_csi(1,\"A\"),print_csi(term"\
"_width-1,\"C\"),e--,term_cursor_x=term_width-1):(print_csi(r=Ma"\
"th.min(e,term_cursor_x),\"D\"),e-=r,term_cursor_x-=r)}function "\
"update(){var e;cmd!==last_cmd&&(show_colors||last_cmd.substri"\
"ng(0,last_cursor_pos)!==cmd.substring(0,last_cursor_pos)?(mov"\
"e_cursor(-ucs_length(last_cmd.substring(0,last_cursor_pos))),"\
"show_colors?print_color_text(r=mexpr?mexpr+\"\\n\"+cmd:cmd,r.len"\
"gth-cmd.length,colorize_js(r)[2]):write(cmd)):write(cmd.subst"\
"show_colors?print_color_text(e=mexpr?mexpr+\"\\n\"+cmd:cmd,e.len"\
"gth-cmd.length,colorize_js(e)[2]):write(cmd)):write(cmd.subst"\
"ring(last_cursor_pos)),0==(term_cursor_x=(term_cursor_x+ucs_l"\
"ength(cmd))%term_width)&&write(\" \\b\"),write(\"""\x1b""[J\"),last_cm"\
"d=cmd,last_cursor_pos=cmd.length),cursor_pos>last_cursor_pos?"\
"move_cursor(ucs_length(cmd.substring(last_cursor_pos,cursor_p"\
"os))):cursor_pos<last_cursor_pos&&move_cursor(-ucs_length(cmd"\
".substring(cursor_pos,last_cursor_pos))),last_cursor_pos=curs"\
"or_pos,flush()}function insert(r){r&&(cmd=cmd.substring(0,cur"\
"sor_pos)+r+cmd.substring(cursor_pos),cursor_pos+=r.length)}fu"\
"or_pos,flush()}function insert(e){e&&(cmd=cmd.substring(0,cur"\
"sor_pos)+e+cmd.substring(cursor_pos),cursor_pos+=e.length)}fu"\
"nction quoted_insert(){quote_flag=!0}function abort(){return "\
"cmd=\"\",cursor_pos=0,-2}function alert(){}function beginning_o"\
"f_line(){cursor_pos=0}function end_of_line(){cursor_pos=cmd.l"\
@ -72,49 +72,49 @@ static const char *const js_repl_qjs = "" \
"rsor_pos++;is_trailing_surrogate(cmd.charAt(cursor_pos));)cur"\
"sor_pos++}function backward_char(){if(0<cursor_pos)for(cursor"\
"_pos--;is_trailing_surrogate(cmd.charAt(cursor_pos));)cursor_"\
"pos--}function skip_word_forward(r){for(;r<cmd.length&&!is_wo"\
"rd(cmd.charAt(r));)r++;for(;r<cmd.length&&is_word(cmd.charAt("\
"r));)r++;return r}function skip_word_backward(r){for(;0<r&&!i"\
"s_word(cmd.charAt(r-1));)r--;for(;0<r&&is_word(cmd.charAt(r-1"\
"));)r--;return r}function forward_word(){cursor_pos=skip_word"\
"pos--}function skip_word_forward(e){for(;e<cmd.length&&!is_wo"\
"rd(cmd.charAt(e));)e++;for(;e<cmd.length&&is_word(cmd.charAt("\
"e));)e++;return e}function skip_word_backward(e){for(;0<e&&!i"\
"s_word(cmd.charAt(e-1));)e--;for(;0<e&&is_word(cmd.charAt(e-1"\
"));)e--;return e}function forward_word(){cursor_pos=skip_word"\
"_forward(cursor_pos)}function backward_word(){cursor_pos=skip"\
"_word_backward(cursor_pos)}function accept_line(){return writ"\
"e(\"\\n\"),history_add(cmd),-1}function history_add(r){r&&histor"\
"y.push(r),history_index=history.length}function previous_hist"\
"e(\"\\n\"),history_add(cmd),-1}function history_add(e){e&&histor"\
"y.push(e),history_index=history.length}function previous_hist"\
"ory(){0<history_index&&(history_index===history.length&&histo"\
"ry.push(cmd),history_index--,cmd=history[history_index],curso"\
"r_pos=cmd.length)}function next_history(){history_index<histo"\
"ry.length-1&&(history_index++,cmd=history[history_index],curs"\
"or_pos=cmd.length)}function history_search(r){var e=cursor_po"\
"or_pos=cmd.length)}function history_search(e){var r=cursor_po"\
"s;for(let n=1;n<=history.length;n++){var t=(history.length+n*"\
"r+history_index)%history.length;if(history[t].substring(0,e)="\
"==cmd.substring(0,e))return history_index=t,void(cmd=history["\
"e+history_index)%history.length;if(history[t].substring(0,r)="\
"==cmd.substring(0,r))return history_index=t,void(cmd=history["\
"t])}}function history_search_backward(){return history_search"\
"(-1)}function history_search_forward(){return history_search("\
"1)}function delete_char_dir(r){let e,t;if(e=cursor_pos,r<0)fo"\
"r(e--;is_trailing_surrogate(cmd.charAt(e));)e--;for(t=e+1;is_"\
"trailing_surrogate(cmd.charAt(t));)t++;0<=e&&e<cmd.length&&(l"\
"ast_fun===kill_region?kill_region(e,t,r):(cmd=cmd.substring(0"\
",e)+cmd.substring(t),cursor_pos=e))}function delete_char(){de"\
"1)}function delete_char_dir(e){let r,t;if(r=cursor_pos,e<0)fo"\
"r(r--;is_trailing_surrogate(cmd.charAt(r));)r--;for(t=r+1;is_"\
"trailing_surrogate(cmd.charAt(t));)t++;0<=r&&r<cmd.length&&(l"\
"ast_fun===kill_region?kill_region(r,t,e):(cmd=cmd.substring(0"\
",r)+cmd.substring(t),cursor_pos=r))}function delete_char(){de"\
"lete_char_dir(1)}function control_d(){if(0===cmd.length)retur"\
"n write(\"\\n\"),running=!1,-3;delete_char_dir(1)}function backw"\
"ard_delete_char(){delete_char_dir(-1)}function transpose_char"\
"s(){let r=cursor_pos;1<cmd.length&&0<r&&(r===cmd.length&&r--,"\
"cmd=cmd.substring(0,r-1)+cmd.substring(r,r+1)+cmd.substring(r"\
"-1,r)+cmd.substring(r+1),cursor_pos=r+1)}function transpose_w"\
"ords(){var r=skip_word_backward(cursor_pos),e=skip_word_forwa"\
"rd(r),t=skip_word_forward(cursor_pos),n=skip_word_backward(t)"\
";r<e&&e<=cursor_pos&&cursor_pos<=n&&n<t&&(cmd=cmd.substring(0"\
",r)+cmd.substring(n,t)+cmd.substring(e,n)+cmd.substring(r,e),"\
"cursor_pos=t)}function upcase_word(){var r=skip_word_forward("\
"s(){let e=cursor_pos;1<cmd.length&&0<e&&(e===cmd.length&&e--,"\
"cmd=cmd.substring(0,e-1)+cmd.substring(e,e+1)+cmd.substring(e"\
"-1,e)+cmd.substring(e+1),cursor_pos=e+1)}function transpose_w"\
"ords(){var e=skip_word_backward(cursor_pos),r=skip_word_forwa"\
"rd(e),t=skip_word_forward(cursor_pos),n=skip_word_backward(t)"\
";e<r&&r<=cursor_pos&&cursor_pos<=n&&n<t&&(cmd=cmd.substring(0"\
",e)+cmd.substring(n,t)+cmd.substring(r,n)+cmd.substring(e,r),"\
"cursor_pos=t)}function upcase_word(){var e=skip_word_forward("\
"cursor_pos);cmd=cmd.substring(0,cursor_pos)+cmd.substring(cur"\
"sor_pos,r).toUpperCase()+cmd.substring(r)}function downcase_w"\
"ord(){var r=skip_word_forward(cursor_pos);cmd=cmd.substring(0"\
",cursor_pos)+cmd.substring(cursor_pos,r).toLowerCase()+cmd.su"\
"bstring(r)}function kill_region(r,e,t){var n=cmd.substring(r,"\
"e);last_fun!==kill_region?clip_board=n:t<0?clip_board=n+clip_"\
"board:clip_board+=n,cmd=cmd.substring(0,r)+cmd.substring(e),c"\
"ursor_pos>e?cursor_pos-=e-r:cursor_pos>r&&(cursor_pos=r),this"\
"sor_pos,e).toUpperCase()+cmd.substring(e)}function downcase_w"\
"ord(){var e=skip_word_forward(cursor_pos);cmd=cmd.substring(0"\
",cursor_pos)+cmd.substring(cursor_pos,e).toLowerCase()+cmd.su"\
"bstring(e)}function kill_region(e,r,t){var n=cmd.substring(e,"\
"r);last_fun!==kill_region?clip_board=n:t<0?clip_board=n+clip_"\
"board:clip_board+=n,cmd=cmd.substring(0,e)+cmd.substring(r),c"\
"ursor_pos>r?cursor_pos-=r-e:cursor_pos>e&&(cursor_pos=e),this"\
"_fun=kill_region}function kill_line(){kill_region(cursor_pos,"\
"cmd.length,1)}function backward_kill_line(){kill_region(0,cur"\
"sor_pos,-1)}function kill_word(){kill_region(cursor_pos,skip_"\
@ -122,8 +122,8 @@ static const char *const js_repl_qjs = "" \
"l_region(skip_word_backward(cursor_pos),cursor_pos,-1)}functi"\
"on yank(){insert(clip_board)}function control_c(){console.log"\
"(\"^C\"),reset(),readline_print_prompt()}function reset(){cmd=\""\
"\",cursor_pos=0}function get_context_word(r,e){let t=\"\";for(;0"\
"<e&&is_word(r[e-1]);)t=r[--e]+t;return t}function get_context"\
"\",cursor_pos=0}function get_context_word(e,r){let t=\"\";for(;0"\
"<r&&is_word(e[r-1]);)t=e[--r]+t;return t}function get_context"\
"_object(line,pos){let obj,base,c;if(pos<=0||0<=\" ~!%^&*(-+={["\
"|:;,<>?/\".indexOf(line[pos-1]))return g;if(2<=pos&&\".\"===line"\
"[pos-1])switch(pos--,obj={},c=line[pos-1]){case\"'\":case'\"':re"\
@ -132,26 +132,26 @@ static const char *const js_repl_qjs = "" \
"rue\",\"false\",\"null\",\"this\"].includes(base)||!isNaN(+base)?eva"\
"l(base):(obj=get_context_object(line,pos-base.length),null==o"\
"bj?obj:obj===g&&void 0===obj[base]?eval(base):obj[base])):{}}"\
"}function get_completions(r,e){let t,n,o;var i=get_context_wo"\
"rd(r,e),s=[];for(n=0,t=r=get_context_object(r,e-i.length);n<1"\
"0&&null!=t;n++){const r=Object.getOwnPropertyNames(t);for(o=0"\
";o<r.length;o++){const e=r[o];\"string\"==typeof e&&\"\"+ +e!==e&"\
"&e.startsWith(i)&&s.push(e)}t=Object.getPrototypeOf(t)}if(1<s"\
".length){for(s.sort((function(r,e){if(r[0]!==e[0]){if(\"_\"===r"\
"[0])return 1;if(\"_\"===e[0])return-1}return r<e?-1:e<r?1:0})),"\
"}function get_completions(e,r){let t,n,o;var i=get_context_wo"\
"rd(e,r),s=[];for(n=0,t=e=get_context_object(e,r-i.length);n<1"\
"0&&null!=t;n++){const e=Object.getOwnPropertyNames(t);for(o=0"\
";o<e.length;o++){const r=e[o];\"string\"==typeof r&&\"\"+ +r!==r&"\
"&r.startsWith(i)&&s.push(r)}t=Object.getPrototypeOf(t)}if(1<s"\
".length){for(s.sort((function(e,r){if(e[0]!==r[0]){if(\"_\"===e"\
"[0])return 1;if(\"_\"===r[0])return-1}return e<r?-1:r<e?1:0})),"\
"n=o=1;n<s.length;n++)s[n]!==s[n-1]&&(s[o++]=s[n]);s.length=o}"\
"return{tab:s,pos:i.length,ctx:r}}function completion(){let r,"\
"e,t,n,o,i,s,c,a,l;var _=get_completions(cmd,cursor_pos),u=_.t"\
"ab;if(0!==u.length){for(r=u[0],n=r.length,e=1;e<u.length;e++)"\
"for(o=u[e],t=0;t<n;t++)if(o[t]!==r[t]){n=t;break}for(e=_.pos;"\
"e<n;e++)insert(r[e]);if(last_fun===completion&&1===u.length){"\
"const r=_.ctx[u[0]];\"function\"==typeof r?(insert(\"(\"),0===r.l"\
"ength&&insert(\")\")):\"object\"==typeof r&&insert(\".\")}if(last_f"\
"un===completion&&2<=u.length){for(i=0,e=0;e<u.length;e++)i=Ma"\
"th.max(i,u[e].length);for(i+=2,c=Math.max(1,Math.floor((term_"\
"return{tab:s,pos:i.length,ctx:e}}function completion(){let e,"\
"r,t,n,o,i,s,c,a,l;var _=get_completions(cmd,cursor_pos),u=_.t"\
"ab;if(0!==u.length){for(e=u[0],n=e.length,r=1;r<u.length;r++)"\
"for(o=u[r],t=0;t<n;t++)if(o[t]!==e[t]){n=t;break}for(r=_.pos;"\
"r<n;r++)insert(e[r]);if(last_fun===completion&&1===u.length){"\
"const e=_.ctx[u[0]];\"function\"==typeof e?(insert(\"(\"),0===e.l"\
"ength&&insert(\")\")):\"object\"==typeof e&&insert(\".\")}if(last_f"\
"un===completion&&2<=u.length){for(i=0,r=0;r<u.length;r++)i=Ma"\
"th.max(i,u[r].length);for(i+=2,c=Math.max(1,Math.floor((term_"\
"width+1)/i)),l=Math.ceil(u.length/c),write(\"\\n\"),a=0;a<l;a++)"\
"{for(s=0;s<c&&!((e=s*l+a)>=u.length);s++)r=u[e],s!==c-1&&(r=r"\
".padEnd(i)),write(r);write(\"\\n\")}readline_print_prompt()}}}co"\
"{for(s=0;s<c&&!((r=s*l+a)>=u.length);s++)e=u[r],s!==c-1&&(e=e"\
".padEnd(i)),write(e);write(\"\\n\")}readline_print_prompt()}}}co"\
"nst commands={\"""\x01""\":beginning_of_line,\"""\x02""\":backward_char,\""\
"""\x03""\":control_c,\"""\x04""\":control_d,\"""\x05""\":end_of_line,\"""\x06""\":fo"\
"rward_char,\"""\x07""\":abort,\"\\b\":backward_delete_char,\"\\t\":comple"\
@ -169,69 +169,69 @@ static const char *const js_repl_qjs = "" \
"nning_of_line,\"""\x1b""""\x7f""\":backward_kill_word,\"""\x1b""b\":backward_"\
"word,\"""\x1b""d\":kill_word,\"""\x1b""f\":forward_word,\"""\x1b""k\":backward_"\
"kill_line,\"""\x1b""l\":downcase_word,\"""\x1b""t\":transpose_words,\"""\x1b"""\
"u\":upcase_word,\"""\x7f""\":backward_delete_char};function dupstr(r"\
",e){let t=\"\";for(;0<e--;)t+=r;return t}let readline_keys,read"\
"u\":upcase_word,\"""\x7f""\":backward_delete_char};function dupstr(e"\
",r){let t=\"\";for(;0<r--;)t+=e;return t}let readline_keys,read"\
"line_state,readline_cb;function readline_print_prompt(){write"\
"(prompt),term_cursor_x=ucs_length(prompt)%term_width,last_cmd"\
"=\"\",last_cursor_pos=0}function readline_start(r,e){if(cmd=r||"\
"=\"\",last_cursor_pos=0}function readline_start(e,r){if(cmd=e||"\
"\"\",cursor_pos=cmd.length,history_index=history.length,readlin"\
"e_cb=e,prompt=pstate,mexpr)prompt=(prompt+=dupstr(\" \",plen-pr"\
"ompt.length))+ps2;else{if(show_time){let r=Math.round(eval_ti"\
"me)+\" \";eval_time=0,r=dupstr(\"0\",5-r.length)+r,prompt+=r.subs"\
"tring(0,r.length-4)+\".\"+r.substring(r.length-4)}plen=prompt.l"\
"e_cb=r,prompt=pstate,mexpr)prompt=(prompt+=dupstr(\" \",plen-pr"\
"ompt.length))+ps2;else{if(show_time){let e=Math.round(eval_ti"\
"me)+\" \";eval_time=0,e=dupstr(\"0\",5-e.length)+e,prompt+=e.subs"\
"tring(0,e.length-4)+\".\"+e.substring(e.length-4)}plen=prompt.l"\
"ength,show_colors&&(prompt+=colors.yellow),prompt+=ps1,show_c"\
"olors&&(prompt+=colors.none)}readline_print_prompt(),update()"\
",readline_state=0}function handle_char(r){var e=String.fromCo"\
"dePoint(r);switch(readline_state){case 0:\"""\x1b""\"===e?(readline"\
"_keys=e,readline_state=1):handle_key(e);break;case 1:readline"\
"_keys+=e,readline_state=\"[\"===e?2:\"O\"===e?3:(handle_key(readl"\
"ine_keys),0);break;case 2:readline_keys+=e,\";\"===e||\"0\"<=e&&e"\
",readline_state=0}function handle_char(e){var r=String.fromCo"\
"dePoint(e);switch(readline_state){case 0:\"""\x1b""\"===r?(readline"\
"_keys=r,readline_state=1):handle_key(r);break;case 1:readline"\
"_keys+=r,readline_state=\"[\"===r?2:\"O\"===r?3:(handle_key(readl"\
"ine_keys),0);break;case 2:readline_keys+=r,\";\"===r||\"0\"<=r&&r"\
"<=\"9\"||(handle_key(readline_keys),readline_state=0);break;cas"\
"e 3:handle_key(readline_keys+=e),readline_state=0}}function h"\
"andle_key(r){var e;if(quote_flag)1===ucs_length(r)&&insert(r)"\
",quote_flag=!1;else if(e=commands[r]){switch((this_fun=e)(r))"\
"e 3:handle_key(readline_keys+=r),readline_state=0}}function h"\
"andle_key(e){var r;if(quote_flag)1===ucs_length(e)&&insert(e)"\
",quote_flag=!1;else if(r=commands[e]){switch((this_fun=r)(e))"\
"{case-1:return readline_cb(cmd);case-2:return readline_cb(nul"\
"l);case-3:return}last_fun=this_fun}else 1===ucs_length(r)&&\" "\
"\"<=r?(insert(r),last_fun=insert):alert();cursor_pos=cursor_po"\
"l);case-3:return}last_fun=this_fun}else 1===ucs_length(e)&&\" "\
"\"<=e?(insert(e),last_fun=insert):alert();cursor_pos=cursor_po"\
"s<0?0:cursor_pos>cmd.length?cmd.length:cursor_pos,update()}le"\
"t hex_mode=!1,eval_mode=\"std\";function number_to_string(r,e){"\
"if(isFinite(r)){let t;return 0===r?t=1/r<0?\"-0\":\"0\":16===e&&r"\
"===Math.floor(r)?(t=r<0?(r=-r,\"-\"):\"\",t+=\"0x\"+r.toString(16))"\
":t=r.toString(),t}return r.toString()}function bigfloat_to_st"\
"ring(r,e){let t;return BigFloat.isFinite(r)?(0===r?t=1/r<0?\"-"\
"0\":\"0\":16===e?(t=r<0?(r=-r,\"-\"):\"\",t+=\"0x\"+r.toString(16)):t="\
"r.toString(),\"bigfloat\"==typeof r&&\"math\"!==eval_mode?t+=\"l\":"\
"\"std\"!==eval_mode&&t.indexOf(\".\")<0&&(16===e&&t.indexOf(\"p\")<"\
"0||10===e&&t.indexOf(\"e\")<0)&&(t+=\".0\"),t):\"math\"!==eval_mode"\
"?\"BigFloat(\"+r.toString()+\")\":r.toString()}function bigint_to"\
"_string(r,e){let t;return 16===e?(t=r<0?(r=-r,\"-\"):\"\",t+=\"0x\""\
"+r.toString(16)):t=r.toString(),\"std\"===eval_mode&&(t+=\"n\"),t"\
"}function print(r){const e=[];!function r(t){let n,o,i,s,c;va"\
"r a=typeof t;if(\"object\"==a)if(null===t)write(t);else if(0<=e"\
"t hex_mode=!1,eval_mode=\"std\";function number_to_string(e,r){"\
"if(isFinite(e)){let t;return 0===e?t=1/e<0?\"-0\":\"0\":16===r&&e"\
"===Math.floor(e)?(t=e<0?(e=-e,\"-\"):\"\",t+=\"0x\"+e.toString(16))"\
":t=e.toString(),t}return e.toString()}function bigfloat_to_st"\
"ring(e,r){let t;return BigFloat.isFinite(e)?(0===e?t=1/e<0?\"-"\
"0\":\"0\":16===r?(t=e<0?(e=-e,\"-\"):\"\",t+=\"0x\"+e.toString(16)):t="\
"e.toString(),\"bigfloat\"==typeof e&&\"math\"!==eval_mode?t+=\"l\":"\
"\"std\"!==eval_mode&&t.indexOf(\".\")<0&&(16===r&&t.indexOf(\"p\")<"\
"0||10===r&&t.indexOf(\"e\")<0)&&(t+=\".0\"),t):\"math\"!==eval_mode"\
"?\"BigFloat(\"+e.toString()+\")\":e.toString()}function bigint_to"\
"_string(e,r){let t;return 16===r?(t=e<0?(e=-e,\"-\"):\"\",t+=\"0x\""\
"+e.toString(16)):t=e.toString(),\"std\"===eval_mode&&(t+=\"n\"),t"\
"}function print(e){const r=[];!function e(t){let n,o,i,s,c;va"\
"r a=typeof t;if(\"object\"==a)if(null===t)write(t);else if(0<=r"\
".indexOf(t))write(\"[circular]\");else if(has_jscalc&&(t instan"\
"ceof Fraction||t instanceof Complex||t instanceof Mod||t inst"\
"anceof Polynomial||t instanceof PolyMod||t instanceof Rationa"\
"lFunction||t instanceof Series))write(t.toString());else{if(e"\
"lFunction||t instanceof Series))write(t.toString());else{if(r"\
".push(t),Array.isArray(t)){for(n=t.length,write(\"[ \"),o=0;o<n"\
";o++)if(0!==o&&write(\", \"),o in t?r(t[o]):write(\"<empty>\"),20"\
";o++)if(0!==o&&write(\", \"),o in t?e(t[o]):write(\"<empty>\"),20"\
"<o){write(\"...\");break}write(\" ]\")}else if(\"RegExp\"===Object."\
"__getClass(t))write(t.toString());else{for(i=Object.keys(t),n"\
"=i.length,write(\"{ \"),o=0;o<n;o++)0!==o&&write(\", \"),s=i[o],w"\
"rite(s,\": \"),r(t[s]);write(\" }\")}e.pop(t)}else\"string\"==a?(79"\
"rite(s,\": \"),e(t[s]);write(\" }\")}r.pop(t)}else\"string\"==a?(79"\
"<(c=t.__quote()).length&&(c=c.substring(0,75)+'...\"'),write(c"\
")):\"number\"==a?write(number_to_string(t,hex_mode?16:10)):\"big"\
"int\"==a?write(bigint_to_string(t,hex_mode?16:10)):\"bigfloat\"="\
"=a?write(bigfloat_to_string(t,hex_mode?16:10)):\"bigdecimal\"=="\
"a?write(t.toString()+\"m\"):\"symbol\"==a?write(String(t)):\"funct"\
"ion\"==a?write(\"function \"+t.name+\"()\"):write(t)}(r)}function "\
"extract_directive(r){let e;if(\"\\\\\"!==r[0])return\"\";for(e=1;e<"\
"r.length&&is_alpha(r[e]);e++);return r.substring(1,e)}functio"\
"n handle_directive(r,e){let t,n,o;if(\"h\"===r||\"?\"===r||\"help\""\
"===r)help();else{if(\"load\"===r){let t=e.substring(r.length+1)"\
"ion\"==a?write(\"function \"+t.name+\"()\"):write(t)}(e)}function "\
"extract_directive(e){let r;if(\"\\\\\"!==e[0])return\"\";for(r=1;r<"\
"e.length&&is_alpha(e[r]);r++);return e.substring(1,r)}functio"\
"n handle_directive(e,r){let t,n,o;if(\"h\"===e||\"?\"===e||\"help\""\
"===e)help();else{if(\"load\"===e){let t=r.substring(e.length+1)"\
".trim();return t.lastIndexOf(\".\")<=t.lastIndexOf(\"/\")&&(t+=\"."\
"js\"),0}if(\"x\"===r)hex_mode=!0;else if(\"d\"===r)hex_mode=!1;els"\
"e if(\"t\"===r)show_time=!show_time;else{if(has_bignum&&\"p\"===r"\
"){if(1===(t=e.substring(r.length+1).trim().split(\" \")).length"\
"js\"),0}if(\"x\"===e)hex_mode=!0;else if(\"d\"===e)hex_mode=!1;els"\
"e if(\"t\"===e)show_time=!show_time;else{if(has_bignum&&\"p\"===e"\
"){if(1===(t=r.substring(e.length+1).trim().split(\" \")).length"\
"&&\"\"===t[0])write(\"BigFloat precision=\"+prec+\" bits (~\"+Math."\
"floor(prec/log2_10)+\" digits), exponent size=\"+expBits+\" bits"\
"\\n\");else if(\"f16\"===t[0])prec=11,expBits=5;else if(\"f32\"===t"\
@ -242,22 +242,22 @@ static const char *const js_repl_qjs = "" \
"eturn write(\"Invalid precision\\n\"),0;if(Number.isNaN(o)||o<Bi"\
"gFloatEnv.expBitsMin||o>BigFloatEnv.expBitsMax)return write(\""\
"Invalid exponent bits\\n\"),0;prec=n,expBits=o}return}if(has_bi"\
"gnum&&\"digits\"===r)return t=e.substring(r.length+1).trim(),(n"\
"gnum&&\"digits\"===e)return t=r.substring(e.length+1).trim(),(n"\
"=Math.ceil(parseFloat(t)*log2_10))<BigFloatEnv.precMin||n>Big"\
"FloatEnv.precMax?write(\"Invalid precision\\n\"):(prec=n,expBits"\
"=BigFloatEnv.expBitsMax),0;if(has_bignum&&\"mode\"===r)return\"\""\
"===(t=e.substring(r.length+1).trim())?write(\"Running mode=\"+e"\
"=BigFloatEnv.expBitsMax),0;if(has_bignum&&\"mode\"===e)return\"\""\
"===(t=r.substring(e.length+1).trim())?write(\"Running mode=\"+e"\
"val_mode+\"\\n\"):\"std\"===t||\"math\"===t?eval_mode=t:write(\"Inval"\
"id mode\\n\"),0;if(\"clear\"===r)write(\"""\x1b""[H""\x1b""[J\");else if(\"c"\
"\"===r)show_colors=!show_colors;else{if(\"q\"===r)return running"\
"=!1,1;if(has_jscalc&&\"a\"===r)algebraicMode=!0;else{if(!has_js"\
"calc||\"n\"!==r)return write(\"Unknown directive: \"+r+\"\\n\"),0;al"\
"gebraicMode=!1}}}}return 1}function help(){function r(r){retu"\
"rn r?\"*\":\" \"}write(\"\\\\h this help\\n\\\\x \"+r(h"\
"id mode\\n\"),0;if(\"clear\"===e)write(\"""\x1b""[H""\x1b""[J\");else if(\"c"\
"\"===e)show_colors=!show_colors;else{if(\"q\"===e)return running"\
"=!1,1;if(has_jscalc&&\"a\"===e)algebraicMode=!0;else{if(!has_js"\
"calc||\"n\"!==e)return write(\"Unknown directive: \"+e+\"\\n\"),0;al"\
"gebraicMode=!1}}}}return 1}function help(){function e(e){retu"\
"rn e?\"*\":\" \"}write(\"\\\\h this help\\n\\\\x \"+e(h"\
"ex_mode)+\"hexadecimal number display\\n\\\\c toggle col"\
"ors\\n\\\\d \"+r(!hex_mode)+\"decimal number display\\n\\\\cl"\
"ors\\n\\\\d \"+e(!hex_mode)+\"decimal number display\\n\\\\cl"\
"ear clear the terminal\\n\"),has_jscalc&&write(\"\\\\a "\
" \"+r(algebraicMode)+\"algebraic mode\\n\\\\n \"+r(!algebr"\
" \"+e(algebraicMode)+\"algebraic mode\\n\\\\n \"+e(!algebr"\
"aicMode)+\"numeric mode\\n\"),has_bignum&&(write(\"\\\\p [m [e]] s"\
"et the BigFloat precision to 'm' bits\\n\\\\digits n set the B"\
"igFloat precision to 'ceil(n*log2(10))' bits\\n\"),has_jscalc||"\
@ -267,56 +267,57 @@ static const char *const js_repl_qjs = "" \
"_mode&&(expr='\"use math\"; void 0;'+expr);const now=(new Date)"\
".getTime();result=eval(expr),eval_time=(new Date).getTime()-n"\
"ow,write(colors[styles.result]),print(result),write(\"\\n\"),wri"\
"te(colors.none),g._=result}catch(r){show_colors&&write(colors"\
"[styles.error_msg]),r instanceof Error?r.stack&&write(r.stack"\
"):write(\"Throw: \"),show_colors&&write(colors.none)}}function "\
"cmd_start(){var r;config_numcalc||(r=has_jscalc?\"QJSCalc\":\"Qu"\
"ickJS\",console.log(r,'- Type \"\\\\h\" for help')),has_bignum&&(l"\
"og2_10=Math.log(10)/Math.log(2),prec=113,expBits=15,has_jscal"\
"c)&&(eval_mode=\"math\",g.algebraicMode=config_numcalc),cmd_rea"\
"dline_start()}function cmd_readline_start(){try{readline_star"\
"t(dupstr(\" \",level),readline_handle_cmd)}catch(r){console."\
"error(\"ERROR\",r)}}function readline_handle_cmd(r){handle_cmd("\
"r),cmd_readline_start()}function handle_cmd(r){if(null===r)re"\
"turn\"\";if(\"?\"===r||\"h\"===r)return help();var e=extract_direct"\
"ive(r);if(0<e.length){if(!handle_directive(e,r))return;r=r.su"\
"bstring(e.length+1)}\"\"!==r&&(e=colorize_js(r=mexpr?mexpr+\"\\n\""\
"+r:r),pstate=e[0],level=e[1],pstate?mexpr=r:(mexpr=\"\",has_big"\
"num?BigFloatEnv.setPrec(eval_and_print.bind(null,r),prec,expB"\
"its):eval_and_print(r),level=0))}function colorize_js(r){let "\
"e,t,n;const o=r.length;let i,s=\"\",c=0,a=1;const l=[];function"\
" _(r){s+=r}function u(){return s.substring(s.length-1)}functi"\
"on d(){var r=u();return s=s.substring(0,s.length-1),r}functio"\
"n f(r,e){for(;l.length<r;)l.push(\"default\");for(;l.length<e;)"\
"l.push(i)}for(e=0;e<o;){switch(i=null,n=e,t=r[e++]){case\" \":c"\
"ase\"\\t\":case\"\\r\":case\"\\n\":continue;case\"+\":case\"-\":if(e<o&&r["\
"e]===t){e++;continue}a=1;continue;case\"/\":if(e<o&&\"*\"===r[e])"\
"{for(i=\"comment\",_(\"/\"),e++;e<o-1;e++)if(\"*\"===r[e]&&\"/\"===r["\
"e+1]){e+=2,d();break}break}if(e<o&&\"/\"===r[e]){for(i=\"comment"\
"\",e++;e<o&&\"\\n\"!==r[e];e++);break}if(a){for(i=\"regex\",_(\"/\");"\
"e<o;)if(\"\\n\"!==(t=r[e++]))if(\"\\\\\"!==t)if(\"[\"!==u())if(\"[\"!==t"\
"){if(\"/\"===t){for(d();e<o&&is_word(r[e]);)e++;break}}else _(\""\
"[\"),\"[\"!==r[e]&&\"]\"!==r[e]||e++;else\"]\"===t&&d();else e<o&&e+"\
"+;else i=\"error\";a=0;break}a=1;continue;case\"'\":case'\"':case\""\
"`\":(function(n){for(i=\"string\",_(n);e<o;)if(\"\\n\"!==(t=r[e++])"\
"){if(\"\\\\\"===t){if(e>=o)break;e++}else if(t===n){d();break}}el"\
"se i=\"error\"})(t),a=0;break;case\"(\":case\"[\":case\"{\":a=1,c++,_"\
"(t);continue;case\")\":case\"]\":case\"}\":if((a=0)<c&&is_balanced("\
"u(),t)){c--,d();continue}i=\"error\";break;default:if(is_digit("\
"t)){for(i=\"number\";e<o&&(is_word(r[e])||\".\"===r[e]&&(e===o-1|"\
"|\".\"!==r[e+1]));)e++;a=0}else{if(!is_word(t)&&\"$\"!==t){a=1;co"\
"ntinue}!function(){for(a=1;e<o&&is_word(r[e]);)e++;var t=\"|\"+"\
"r.substring(n,e)+\"|\";if(0<=\"|break|case|catch|continue|debugg"\
"er|default|delete|do|else|finally|for|function|if|in|instance"\
"of|new|return|switch|this|throw|try|typeof|while|with|class|c"\
"onst|enum|import|export|extends|super|implements|interface|le"\
"t|package|private|protected|public|static|yield|undefined|nul"\
"l|true|false|Infinity|NaN|eval|arguments|await|\".indexOf(t))r"\
"eturn i=\"keyword\",0<=\"|this|super|undefined|null|true|false|I"\
"nfinity|NaN|arguments|\".indexOf(t)&&(a=0);let s=e;for(;s<o&&\""\
" \"===r[s];)s++;s<o&&\"(\"===r[s]?i=\"function\":0<=\"|void|var|\".i"\
"ndexOf(t)?i=\"type\":(i=\"identifier\",a=0)}()}}i&&f(n,e)}return "\
"f(o,o),[s,c,l]}config_numcalc&&(g.execCmd=function(r){switch("\
"r){case\"dec\":hex_mode=!1;break;case\"hex\":hex_mode=!0;break;ca"\
"se\"num\":algebraicMode=!1;break;case\"alg\":algebraicMode=!0}});"\
"try{termInit()}catch(r){console.error(r)}}(globalThis)}));\n";
"te(colors.none),g._=result}catch(e){show_colors&&write(colors"\
"[styles.error_msg]),e instanceof Error?(console.log(e),e.stac"\
"k&&write(e.stack)):write(\"Throw: \"),show_colors&&write(colors"\
".none)}}function cmd_start(){var e;config_numcalc||(e=has_jsc"\
"alc?\"QJSCalc\":\"QuickJS\",console.log(e,'- Type \"\\\\h\" for help'"\
")),has_bignum&&(log2_10=Math.log(10)/Math.log(2),prec=113,exp"\
"Bits=15,has_jscalc)&&(eval_mode=\"math\",g.algebraicMode=config"\
"_numcalc),cmd_readline_start()}function cmd_readline_start(){"\
"try{readline_start(dupstr(\" \",level),readline_handle_cmd)}"\
"catch(e){console.error(\"ERROR\",e)}}function readline_handle_c"\
"md(e){handle_cmd(e),cmd_readline_start()}function handle_cmd("\
"e){if(null===e)return\"\";if(\"?\"===e||\"h\"===e)return help();var"\
" r=extract_directive(e);if(0<r.length){if(!handle_directive(r"\
",e))return;e=e.substring(r.length+1)}\"\"!==e&&(r=colorize_js(e"\
"=mexpr?mexpr+\"\\n\"+e:e),pstate=r[0],level=r[1],pstate?mexpr=e:"\
"(mexpr=\"\",has_bignum?BigFloatEnv.setPrec(eval_and_print.bind("\
"null,e),prec,expBits):eval_and_print(e),level=0))}function co"\
"lorize_js(e){let r,t,n;const o=e.length;let i,s=\"\",c=0,a=1;co"\
"nst l=[];function _(e){s+=e}function u(){return s.substring(s"\
".length-1)}function d(){var e=u();return s=s.substring(0,s.le"\
"ngth-1),e}function f(e,r){for(;l.length<e;)l.push(\"default\");"\
"for(;l.length<r;)l.push(i)}for(r=0;r<o;){switch(i=null,n=r,t="\
"e[r++]){case\" \":case\"\\t\":case\"\\r\":case\"\\n\":continue;case\"+\":c"\
"ase\"-\":if(r<o&&e[r]===t){r++;continue}a=1;continue;case\"/\":if"\
"(r<o&&\"*\"===e[r]){for(i=\"comment\",_(\"/\"),r++;r<o-1;r++)if(\"*\""\
"===e[r]&&\"/\"===e[r+1]){r+=2,d();break}break}if(r<o&&\"/\"===e[r"\
"]){for(i=\"comment\",r++;r<o&&\"\\n\"!==e[r];r++);break}if(a){for("\
"i=\"regex\",_(\"/\");r<o;)if(\"\\n\"!==(t=e[r++]))if(\"\\\\\"!==t)if(\"[\""\
"!==u())if(\"[\"!==t){if(\"/\"===t){for(d();r<o&&is_word(e[r]);)r+"\
"+;break}}else _(\"[\"),\"[\"!==e[r]&&\"]\"!==e[r]||r++;else\"]\"===t&"\
"&d();else r<o&&r++;else i=\"error\";a=0;break}a=1;continue;case"\
"\"'\":case'\"':case\"`\":(function(n){for(i=\"string\",_(n);r<o;)if("\
"\"\\n\"!==(t=e[r++])){if(\"\\\\\"===t){if(r>=o)break;r++}else if(t=="\
"=n){d();break}}else i=\"error\"})(t),a=0;break;case\"(\":case\"[\":"\
"case\"{\":a=1,c++,_(t);continue;case\")\":case\"]\":case\"}\":if((a=0"\
")<c&&is_balanced(u(),t)){c--,d();continue}i=\"error\";break;def"\
"ault:if(is_digit(t)){for(i=\"number\";r<o&&(is_word(e[r])||\".\"="\
"==e[r]&&(r===o-1||\".\"!==e[r+1]));)r++;a=0}else{if(!is_word(t)"\
"&&\"$\"!==t){a=1;continue}!function(){for(a=1;r<o&&is_word(e[r]"\
");)r++;var t=\"|\"+e.substring(n,r)+\"|\";if(0<=\"|break|case|catc"\
"h|continue|debugger|default|delete|do|else|finally|for|functi"\
"on|if|in|instanceof|new|return|switch|this|throw|try|typeof|w"\
"hile|with|class|const|enum|import|export|extends|super|implem"\
"ents|interface|let|package|private|protected|public|static|yi"\
"eld|undefined|null|true|false|Infinity|NaN|eval|arguments|awa"\
"it|\".indexOf(t))return i=\"keyword\",0<=\"|this|super|undefined|"\
"null|true|false|Infinity|NaN|arguments|\".indexOf(t)&&(a=0);le"\
"t s=r;for(;s<o&&\" \"===e[s];)s++;s<o&&\"(\"===e[s]?i=\"function\":"\
"0<=\"|void|var|\".indexOf(t)?i=\"type\":(i=\"identifier\",a=0)}()}}"\
"i&&f(n,r)}return f(o,o),[s,c,l]}config_numcalc&&(g.execCmd=fu"\
"nction(e){switch(e){case\"dec\":hex_mode=!1;break;case\"hex\":hex"\
"_mode=!0;break;case\"num\":algebraicMode=!1;break;case\"alg\":alg"\
"ebraicMode=!0}});try{termInit()}catch(e){console.error(e)}}(g"\
"lobalThis)}));\n";

5
shlr/qjs/js_repl.qjs
View File

@ -1162,7 +1162,8 @@ import('os').catch(console.error).then((os) => {
/* eval as a script */
// result = std.evalScript(expr, { backtrace_barrier: true });
// expr = expr.replace(/;$//);
// result = (new Function('return (' + expr + ');')).call(global);
// result = (new Function('return ({' + expr + '});')).call(global);
// // // result = eval(expr);
result = eval(expr);
eval_time = (new Date()).getTime() - now;
write(colors[styles.result]);
@ -1174,7 +1175,7 @@ import('os').catch(console.error).then((os) => {
} catch (error) {
if (show_colors) { write(colors[styles.error_msg]); }
if (error instanceof Error) {
// console.log(error);
console.log(error);
if (error.stack) {
write(error.stack);
}