⚡ optimize error report info

src/main.cpp

@@ -105,11 +105,10 @@ void execute(
     using clk = std::chrono::high_resolution_clock;
     const auto den = clk::duration::period::den;
 
-    error   err;
-    lexer   lex(err);
-    parse   parse(err);
-    linker  ld(err);
-    codegen gen(err);
+    lexer   lex;
+    parse   parse;
+    linker  ld;
+    codegen gen;
     vm      ctx;
 
     // lexer scans file to get tokens
@@ -151,7 +150,7 @@ void execute(
     // run
     auto start = clk::now();
     if (cmd&VM_DEBUG) {
-        dbg(err).run(gen, ld, argv);
+        dbg().run(gen, ld, argv);
     } else if (cmd&VM_TIME || cmd&VM_EXEC) {
         ctx.run(gen, ld, argv, cmd&VM_DETAIL);
     }

src/nasal_codegen.cpp

@@ -232,9 +232,9 @@ void codegen::func_gen(function* node) {
     }
     add_symbol(arg);
 
-    in_iterloop.push(0);
+    in_loop_level.push_back(0);
     block_gen(block);
-    in_iterloop.pop();
+    in_loop_level.pop_back();
     code[lsize].num = local.back().size();
     if (local.back().size()>=STACK_DEPTH) {
         die("too many local variants: " +
@@ -775,9 +775,9 @@ void codegen::forei_gen(forei_expr* node) {
             gen(op_meq, 1, node->get_iterator()->get_line());
         }
     }
-    ++in_iterloop.top();
+    ++in_loop_level.back();
     block_gen(node->get_code_block());
-    --in_iterloop.top();
+    --in_loop_level.back();
     gen(op_jmp, ptr, node->get_line());
     code[ptr].num=code.size();
     load_continue_break(code.size()-1, code.size());
@@ -1100,7 +1100,7 @@ void codegen::block_gen(code_block* node) {
 }
 
 void codegen::ret_gen(return_expr* node) {
-    for(u32 i = 0; i<in_iterloop.top(); ++i) {
+    for(u32 i = 0; i<in_loop_level.back(); ++i) {
         gen(op_pop, 0, node->get_line());
         gen(op_pop, 0, node->get_line());
     }
@@ -1110,8 +1110,8 @@ void codegen::ret_gen(return_expr* node) {
 
 const error& codegen::compile(parse& parse, linker& import) {
     fileindex = 0;
-    file = import.filelist().data();
-    in_iterloop.push(0);
+    file = import.filelist();
+    in_loop_level.push_back(0);
 
     // add special symbol globals, which is a hash stores all global variables
     add_symbol("globals");
@@ -1124,7 +1124,6 @@ const error& codegen::compile(parse& parse, linker& import) {
     gen(op_exit, 0, 0);
 
     // size out of bound check
-    err.load(file[0]); // load main execute file
     if (const_number_table.size()>0xffffff) {
         err.err("code",
             "too many constant numbers: " +

src/nasal_codegen.h

@@ -23,9 +23,9 @@
 class codegen {
 private:
     u16 fileindex;
-    error& err;
-    const std::string* file;
-    std::stack<u32> in_iterloop;
+    error err;
+    std::vector<std::string> file;
+    std::vector<u32> in_loop_level;
     std::unordered_map<f64, u32> const_number_map;
     std::unordered_map<std::string, u32> const_string_map;
     std::vector<f64> const_number_table;
@@ -105,7 +105,7 @@ public:
     }
 
 public:
-    codegen(error& e): fileindex(0), err(e), file(nullptr) {}
+    codegen(): fileindex(0) {}
     const error& compile(parse&, linker&);
     void print(std::ostream&);
 };

src/nasal_dbg.h

@@ -64,7 +64,7 @@ private:
     usize fsize;
     u16 bk_fidx;
     u32 bk_line;
-    error& src;
+    error src;
 
     std::vector<std::string> parse(const std::string&);
     u16 file_index(const std::string&) const;
@@ -76,10 +76,7 @@ private:
     void interact();
 
 public:
-    dbg(error& err):
-        next(false), fsize(0),
-        bk_fidx(0), bk_line(0),
-        src(err) {}
+    dbg(): next(false), fsize(0), bk_fidx(0), bk_line(0) {}
     void run(
         const codegen&,
         const linker&,

src/nasal_err.cpp

@@ -86,23 +86,13 @@ void flstream::load(const std::string& f) {
 }
 
 void error::fatal(const std::string& stage, const std::string& info) {
-    std::cerr << red << stage << ": " << white << info << reset << "\n";
-    if (file.length()) {
-        std::cerr << cyan << " --> " << red << file << reset << "\n\n";
-    } else {
-        std::cerr << reset << "\n";
-    }
+    std::cerr << red << stage << ": " << white << info << reset << "\n\n";
     std::exit(1);
 }
 
 void error::err(const std::string& stage, const std::string& info) {
     ++cnt;
-    std::cerr << red << stage << ": " << white << info << reset << "\n";
-    if (file.length()) {
-        std::cerr << cyan << " --> " << red << file << reset << "\n\n";
-    } else {
-        std::cerr << reset << "\n";
-    }
+    std::cerr << red << stage << ": " << white << info << reset << "\n\n";
 }
 
 void error::err(

src/nasal_err.h

@@ -60,4 +60,5 @@ public:
             std::exit(1);
         }
     }
+    u32 geterr() const {return cnt;}
 };

src/nasal_import.cpp

@@ -1,7 +1,6 @@
 #include "nasal_import.h"
 
-linker::linker(error& e):
-    show_path(false), lib_loaded(false), err(e) {
+linker::linker(): show_path(false), lib_loaded(false) {
     char sep = is_windows()? ';':':';
     std::string PATH = getenv("PATH");
     usize last = 0, pos = PATH.find(sep, 0);
@@ -54,16 +53,19 @@ std::string linker::find_file(
             find_file("std/lib.nas", location);
     }
     if (!show_path) {
-        err.load(location.file);
-        err.err("link", "cannot find file <" + filename + ">");
+        err.err("link",
+            "in <" + location.file + ">: " +
+            "cannot find file <" + filename + ">\n");
+        err.err("link", "use <-d> to get detail search path");
         return "";
     }
     std::string paths = "";
     for(const auto& i : fpath) {
-        paths += "  " + i + "\n";
+        paths += "  -> " + i + "\n";
     }
-    err.load(location.file);
-    err.err("link", "cannot find file <" + filename + "> in these paths:\n" + paths);
+    err.err("link",
+        "in <" + location.file + ">: " +
+        "cannot find file <" + filename + "> in these paths:\n" + paths);
     return "";
 }
 
@@ -140,8 +142,8 @@ void linker::link(code_block* new_tree_root, code_block* old_tree_root) {
 }
 
 code_block* linker::import_regular_file(call_expr* node) {
-    lexer lex(err);
-    parse par(err);
+    lexer lex;
+    parse par;
     // get filename
     auto filename = get_path(node);
     // clear this node
@@ -160,8 +162,12 @@ code_block* linker::import_regular_file(call_expr* node) {
     }
     
     // start importing...
-    lex.scan(filename);
-    par.compile(lex);
+    if (lex.scan(filename).geterr()) {
+        err.err("link", "error occurred when analysing <" + filename + ">");
+    }
+    if (par.compile(lex).geterr())  {
+        err.err("link", "error occurred when analysing <" + filename + ">");
+    }
     auto tmp = par.swap(nullptr);
 
     // check if tmp has 'import'
@@ -169,8 +175,8 @@ code_block* linker::import_regular_file(call_expr* node) {
 }
 
 code_block* linker::import_nasal_lib() {
-    lexer lex(err);
-    parse par(err);
+    lexer lex;
+    parse par;
     auto filename = find_file("lib.nas", {0, 0, 0, 0, files[0]});
     if (!filename.length()) {
         return new code_block({0, 0, 0, 0, filename});
@@ -182,8 +188,12 @@ code_block* linker::import_nasal_lib() {
     }
     
     // start importing...
-    lex.scan(filename);
-    par.compile(lex);
+    if (lex.scan(filename).geterr()) {
+        err.err("link", "error occurred when analysing library <" + filename + ">");
+    }
+    if (par.compile(lex).geterr())  {
+        err.err("link", "error occurred when analysing library <" + filename + ">");
+    }
     auto tmp = par.swap(nullptr);
 
     // check if tmp has 'import'

src/nasal_import.h

@@ -21,7 +21,7 @@ class linker{
 private:
     bool show_path;
     bool lib_loaded;
-    error& err;
+    error err;
     std::vector<std::string> files;
     std::vector<std::string> envpath;
 
@@ -34,7 +34,7 @@ private:
     code_block* import_nasal_lib();
     code_block* load(code_block*, u16);
 public:
-    linker(error&);
+    linker();
     const error& link(parse&, const std::string&, bool);
     const std::vector<std::string>& filelist() const {return files;}
 };

src/nasal_lexer.cpp

@@ -74,9 +74,10 @@ void lexer::open(const std::string& file) {
     std::ifstream in(file, std::ios::binary);
     if (in.fail()) {
         err.err("lexer", "failed to open <" + file + ">");
-    } else {
-        err.load(file);
+        res = "";
+        return;
     }
+    err.load(file);
     std::stringstream ss;
     ss << in.rdbuf();
     res = ss.str();

src/nasal_lexer.h

@@ -95,7 +95,7 @@ private:
     usize ptr;
     std::string filename;
     std::string res;
-    error& err;
+    error err;
     std::vector<token> toks;
     const std::unordered_map<std::string, tok> typetbl {
         {"true"    ,tok::tktrue  },
@@ -175,9 +175,7 @@ private:
     token dots();
     token calc_opr();
 public:
-    lexer(error& e):
-        line(1), column(0),
-        ptr(0), filename(""), res(""), err(e) {}
+    lexer(): line(1), column(0), ptr(0), filename(""), res("") {}
     const error& scan(const std::string&);
     const std::vector<token>& result() const {return toks;}
 };

src/nasal_parse.h

@@ -18,7 +18,7 @@ private:
     u32 in_loop; // count loop block
     const token* toks;
     code_block* root;
-    error& err;
+    error err;
 
 private:
     const std::unordered_map<tok, std::string> tokname {
@@ -146,11 +146,7 @@ public:
     }
 
 public:
-    parse(error& e):
-        ptr(0), in_func(0), in_loop(0),
-        toks(nullptr),
-        root(nullptr),
-        err(e) {}
+    parse(): ptr(0), in_func(0), in_loop(0), toks(nullptr), root(nullptr) {}
     ~parse() {
         if (root) {
             delete root;