From d5d426d6eb76a913709501bbf51ebcba474f1925 Mon Sep 17 00:00:00 2001
From: ValKmjolnir <lhk101lhk101@qq.com>
Date: Sun, 20 Mar 2022 18:28:45 +0800
Subject: [PATCH] update main.cpp and bug fix

---
 main.cpp           | 40 ++++++++++++++++------------------------
 nasal_ast.h        |  6 +++---
 nasal_codegen.h    | 34 ++++++++++------------------------
 nasal_gc.h         |  2 +-
 test/ascii-art.nas |  5 +++--
 test/bfs.nas       |  2 ++
 test/life.nas      |  2 ++
 7 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/main.cpp b/main.cpp
index 79a13a0..e62f2bb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,8 +18,8 @@ void help()
 #endif
     <<"nasal <option>\n"
     <<"option:\n"
-    <<"    -h, --help    | get help.\n"
-    <<"    -v, --version | get version of nasal interpreter.\n\n"
+    <<"    -h, --help      | get help.\n"
+    <<"    -v, --version   | get version of nasal interpreter.\n\n"
     <<"nasal <file>\n"
     <<"file:\n"
     <<"    input file name to execute script file.\n\n"
@@ -114,9 +114,7 @@ void execute(const std::string& file,const uint32_t cmd)
 
 int main(int argc,const char* argv[])
 {
-    if(!argc)
-        return 0;
-    if(argc==1)
+    if(argc<=1)
     {
         logo();
         return 0;
@@ -134,28 +132,22 @@ int main(int argc,const char* argv[])
             err();
         return 0;
     }
+    std::unordered_map<std::string,uint32_t> cmdlst={
+        {"--lex",VM_LEXINFO},{"-l",VM_LEXINFO},
+        {"--ast",VM_ASTINFO},{"-a",VM_ASTINFO},
+        {"--code",VM_CODEINFO},{"-c",VM_CODEINFO},
+        {"--exec",VM_EXEC},{"-e",VM_EXEC},
+        {"--opcnt",VM_OPCALLNUM|VM_EXEC},{"-o",VM_OPCALLNUM|VM_EXEC},
+        {"--time",VM_EXECTIME},{"-t",VM_EXECTIME},
+        {"--detail",VM_DBGINFO|VM_EXEC},{"-d",VM_DBGINFO|VM_EXEC},
+        {"--optimize",VM_OPTIMIZE},{"-op",VM_OPTIMIZE},
+        {"--debug",VM_DEBUG},{"-dbg",VM_DEBUG}
+    };
     uint32_t cmd=0;
     for(int i=1;i<argc-1;++i)
     {
-        std::string s(argv[i]);
-        if(s=="--lex" || s=="-l")
-            cmd|=VM_LEXINFO;
-        else if(s=="--ast" || s=="-a")
-            cmd|=VM_ASTINFO;
-        else if(s=="--code" || s=="-c")
-            cmd|=VM_CODEINFO;
-        else if(s=="--exec" || s=="-e")
-            cmd|=VM_EXEC;
-        else if(s=="--opcnt" || s=="-o")
-            cmd|=VM_OPCALLNUM|VM_EXEC;
-        else if(s=="--time" || s=="-t")
-            cmd|=VM_EXECTIME;
-        else if(s=="--detail" || s=="-d")
-            cmd|=VM_DBGINFO|VM_EXEC;
-        else if(s=="--optimize" || s=="-op")
-            cmd|=VM_OPTIMIZE;
-        else if(s=="--debug" || s=="-dbg")
-            cmd|=VM_DEBUG;
+        if(cmdlst.count(argv[i]))
+            cmd|=cmdlst[argv[i]];
         else
             err();
     }
diff --git a/nasal_ast.h b/nasal_ast.h
index a38f357..b333a3a 100644
--- a/nasal_ast.h
+++ b/nasal_ast.h
@@ -116,10 +116,10 @@ const char* ast_name[]=
     "if",
     "elsif",
     "else",
-    "multi_id",
-    "multi_scalar",
+    "multi-id",
+    "multi-scalar",
     "def",
-    "multi_assign",
+    "multi-assign",
     "continue",
     "break",
     "return",
diff --git a/nasal_codegen.h b/nasal_codegen.h
index 4cfef19..c5af598 100644
--- a/nasal_codegen.h
+++ b/nasal_codegen.h
@@ -769,32 +769,18 @@ void nasal_codegen::for_gen(const nasal_ast& ast)
         case ast_null:break;
         case ast_def:def_gen(ast[0]);break;
         case ast_multi_assign:multi_assign_gen(ast[0]);break;
-        case ast_nil:
-        case ast_num:
-        case ast_str:
-        case ast_func:break;
-        case ast_vec:
-        case ast_hash:
+        case ast_nil:case ast_num:case ast_str:case ast_func:break;
+        case ast_vec:case ast_hash:
         case ast_call:
-        case ast_equal:
-        case ast_addeq:
-        case ast_subeq:
-        case ast_multeq:
-        case ast_diveq:
-        case ast_lnkeq:
-        case ast_neg:
-        case ast_not:
-        case ast_add:
-        case ast_sub:
-        case ast_mult:
-        case ast_div:
+        case ast_equal:case ast_addeq:case ast_subeq:
+        case ast_multeq:case ast_diveq:case ast_lnkeq:
+        case ast_neg:case ast_not:
+        case ast_add:case ast_sub:
+        case ast_mult:case ast_div:
         case ast_link:
-        case ast_cmpeq:
-        case ast_neq:
-        case ast_leq:
-        case ast_less:
-        case ast_geq:
-        case ast_grt:
+        case ast_cmpeq:case ast_neq:
+        case ast_leq:case ast_less:
+        case ast_geq:case ast_grt:
         case ast_trino:
             calc_gen(ast[0]);
             gen(op_pop,0,ast[0].line());
diff --git a/nasal_gc.h b/nasal_gc.h
index 2fd9771..980b9b2 100644
--- a/nasal_gc.h
+++ b/nasal_gc.h
@@ -57,7 +57,7 @@ struct nasal_ref
         double   num;
         nasal_ref* addr;
         nasal_val* gcobj;
-    }value;
+    } value;
 
     // vm_none/vm_nil
     nasal_ref(const uint8_t t=vm_none):type(t){}
diff --git a/test/ascii-art.nas b/test/ascii-art.nas
index 3ff7bf3..d0390cb 100644
--- a/test/ascii-art.nas
+++ b/test/ascii-art.nas
@@ -143,6 +143,8 @@ var curve6=func(){
         print('\n');
     }
 }
+if(os.platform()=="windows")
+    system("chcp 65001");
 trans_ttf("just for test");
 trans_ttf(" ValKmjolnir ");
 trans_ttf("just for fun");
@@ -151,5 +153,4 @@ curve2();
 curve3();
 curve4();
 curve5();
-curve6();
-println("🟩🟥");
\ No newline at end of file
+curve6();
\ No newline at end of file
diff --git a/test/bfs.nas b/test/bfs.nas
index 4b11223..6917e11 100644
--- a/test/bfs.nas
+++ b/test/bfs.nas
@@ -61,5 +61,7 @@ var bfs=func(begin,end)
     return;
 }
 
+if(os.platform()=="windows")
+    system("chcp 65001");
 print("\ec");
 bfs([0,0],[9,19]);
\ No newline at end of file
diff --git a/test/life.nas b/test/life.nas
index 01e60f8..cefe744 100644
--- a/test/life.nas
+++ b/test/life.nas
@@ -36,6 +36,8 @@ var prt=func()
 
 func()
 {
+    if(os.platform()=="windows")
+        system("chcp 65001");
     print("\ec");
     rand(time(0));
     map=new_map();