From 65dfef0a332441918f87998b1a9d1b9c719c19a2 Mon Sep 17 00:00:00 2001 From: ValKmjolnir Date: Mon, 9 Aug 2021 01:02:27 +0800 Subject: [PATCH] update --- main.cpp | 2 +- nasal_builtin.h | 2 +- nasal_codegen.h | 2 +- nasal_import.h | 2 +- nasal_lexer.h | 4 ++-- nasal_parse.h | 4 ++-- nasal_vm.h | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.cpp b/main.cpp index 051699c..2587d00 100644 --- a/main.cpp +++ b/main.cpp @@ -20,7 +20,7 @@ void help_cmd() <<" -c, --code | view bytecode.\n" <<" -e, --exec | execute script file.\n" <<" -t, --time | execute and get the running time.\n" - <<" -o, --opcn | count operands while running.\n" + <<" -o, --opcnt | count operands while running.\n" <<"file:\n" <<" input file name to execute script file.\n"; return; diff --git a/nasal_builtin.h b/nasal_builtin.h index 07f1961..4621d23 100644 --- a/nasal_builtin.h +++ b/nasal_builtin.h @@ -54,7 +54,7 @@ nasal_val* builtin_right(std::vector&,nasal_gc&); nasal_val* builtin_cmp(std::vector&,nasal_gc&); nasal_val* builtin_chr(std::vector&,nasal_gc&); -#define builtin_err(func_name,info) std::cout<<">> [vm] "<> [code] line "<> [import] in <\""<: error(s) occurred in "<: error(s) occurred in "<> [lexer] cannot open file <"<.\n"; + std::cout<<"[lexer] cannot open file <"<.\n"; fin.close(); return; } @@ -150,7 +150,7 @@ int nasal_lexer::get_tok_type(std::string& tk_str) void nasal_lexer::die(const char* error_info) { ++error; - std::cout<<">> [lexer] line "<& toks) if(!error_token.size()) return; ++error; - std::cout<<">> [parse] line"; + std::cout<<"[parse] line"; int err_line=0; for(auto& tok:error_token) if(err_line!=tok.line) @@ -143,7 +143,7 @@ void nasal_parse::main_process(std::vector& toks) void nasal_parse::die(int line,std::string&& info) { ++error; - std::cout<<">> [parse] line "<> [vm] error at 0x%.8x: %s\n",pc,str.c_str()); + printf("[vm] error at 0x%.8x: %s\n",pc,str.c_str()); // trace back will use ret_stack ret.push(pc); traceback(); @@ -216,7 +216,7 @@ void nasal_vm::die(std::string str) } void nasal_vm::stackoverflow() { - printf(">> [vm] stack overflow\n"); + printf("[vm] stack overflow\n"); traceback(); stackinfo(10); return;