📝 fix MSVC warning in nasal_builtin.h & improve error output.

module/fib.cpp

@@ -1,6 +1,5 @@
 #include <iostream>
 #include "../nasal.h"
-#include "../nasal_gc.h"
 
 double fibonaci(double x){
     if(x<=2)

module/keyboard.cpp

@@ -1,5 +1,4 @@
 #include "../nasal.h"
-#include "../nasal_gc.h"
 #include <unistd.h>
 #include <iostream>
 #ifdef _WIN32
@@ -63,7 +62,7 @@ public:
             peek_char=-1;
             return ch;
         }
-        read(0,&ch,1);
+        ssize_t tmp=read(0,&ch,1);
         return ch;
 #else
         return getch();

module/nasocket.cpp

@@ -1,5 +1,4 @@
 #include "../nasal.h"
-#include "../nasal_gc.h"
 #include <unistd.h>
 
 #ifdef _WIN32

nasal.h

@@ -138,7 +138,7 @@ string rawstr(const string& str,const usize maxlen=0)
             case '\v':  ret+="\\v"; break;
             case '\f':  ret+="\\f"; break;
             case '\r':  ret+="\\r"; break;
-            case '\033':ret+="\\e";break;
+            case '\033':ret+="\\e"; break;
             case '\"':  ret+="\\\"";break;
             case '\'':  ret+="\\\'";break;
             case '\\':  ret+="\\\\";break;
@@ -150,4 +150,6 @@ string rawstr(const string& str,const usize maxlen=0)
     return ret;
 }
 
+#include "nasal_gc.h" // declarations of nas_ref and nasal_gc
+
 #endif

nasal_builtin.h

@@ -279,11 +279,11 @@ nas_ref builtin_u32or(nas_ref* local,nasal_gc& gc)
 }
 nas_ref builtin_u32nand(nas_ref* local,nasal_gc& gc)
 {
-    return {vm_num,(f64)(~(u32(local[1].num())&u32(local[2].num())))};
+    return {vm_num,(f64)(u32)(~(u32(local[1].num())&u32(local[2].num())))};
 }
 nas_ref builtin_u32not(nas_ref* local,nasal_gc& gc)
 {
-    return {vm_num,(f64)(~u32(local[1].num()))};
+    return {vm_num,(f64)(u32)(~u32(local[1].num()))};
 }
 nas_ref builtin_pow(nas_ref* local,nasal_gc& gc)
 {

nasal_codegen.h

@@ -436,7 +436,7 @@ void nasal_codegen::func_gen(const nasal_ast& ast)
     in_iterloop.pop();
     code[lsize].num=local.back().size();
     if(local.back().size()>=STACK_DEPTH)
-        die("too many local variants: "+std::to_string(local.back().size())+".",block.line());
+        die("too many local variants: "+std::to_string(local.back().size()),block.line());
     local.pop_back();
 
     if(!block.size() || block.child().back().type()!=ast_ret)
@@ -472,7 +472,7 @@ void nasal_codegen::call_id(const nasal_ast& ast)
         {
             gen(op_callb,i,ast.line());
             if(local.empty())
-                die("builtin functions work in a local scope.",ast.line());
+                die("should warp native functions in local scope",ast.line());
             return;
         }
     i32 index;
@@ -491,7 +491,7 @@ void nasal_codegen::call_id(const nasal_ast& ast)
         gen(op_callg,index,ast.line());
         return;
     }
-    die("undefined symbol \""+str+"\".",ast.line());
+    die("undefined symbol \""+str+"\"",ast.line());
 }
 
 void nasal_codegen::call_hash(const nasal_ast& ast)
@@ -588,7 +588,7 @@ void nasal_codegen::mcall_id(const nasal_ast& ast)
     for(u32 i=0;builtin[i].name;++i)
         if(builtin[i].name==str)
         {
-            die("cannot change builtin function.",ast.line());
+            die("cannot modify native function",ast.line());
             return;
         }
     i32 index;
@@ -607,7 +607,7 @@ void nasal_codegen::mcall_id(const nasal_ast& ast)
         gen(op_mcallg,index,ast.line());
         return;
     }
-    die("undefined symbol \""+str+"\".",ast.line());
+    die("undefined symbol \""+str+"\"",ast.line());
 }
 
 void nasal_codegen::mcall_vec(const nasal_ast& ast)
@@ -1235,7 +1235,7 @@ void nasal_codegen::compile(const nasal_parse& parse,const nasal_import& import)
     block_gen(parse.ast()); // generate main block
     gen(op_exit,0,0);
     if(global.size()>=STACK_DEPTH)
-        die("too many global variants: "+std::to_string(global.size())+".",0);
+        die("too many global variants: "+std::to_string(global.size()),0);
     nerr.chkerr();
 }
 

nasal_lexer.h

@@ -142,12 +142,12 @@ void nasal_lexer::open(const string& file)
     struct stat buffer;
     if(stat(file.c_str(),&buffer)==0 && !S_ISREG(buffer.st_mode))
     {
-        nerr.err("lexer","<"+file+"> is not a regular file.");
+        nerr.err("lexer","<"+file+"> is not a regular file");
         nerr.chkerr();
     }
     std::ifstream fin(file,std::ios::binary);
     if(fin.fail())
-        nerr.err("lexer","failed to open <"+file+">.");
+        nerr.err("lexer","failed to open <"+file+">");
     else
         nerr.load(file);
     std::stringstream ss;
@@ -182,7 +182,7 @@ string nasal_lexer::utf8_gen()
                 string utf_info="0x"+chrhex(tmp[0]);
                 for(u32 i=1;i<tmp.size();++i)
                     utf_info+=" 0x"+chrhex(tmp[i]);
-                die("invalid utf-8 character `"+utf_info+"`, make sure it is utf8-text file.");
+                die("invalid utf-8 character `"+utf_info+"`, make sure it is utf8-text file");
                 std::exit(1);
             }
             str+=tmp;
@@ -224,7 +224,7 @@ string nasal_lexer::num_gen()
             str+=res[ptr++];
         column+=str.length();
         if(str.length()<3)// "0x"
-            die("invalid number `"+str+"`.");
+            die("invalid number `"+str+"`");
         return str;
     }
     // generate oct number
@@ -236,7 +236,7 @@ string nasal_lexer::num_gen()
             str+=res[ptr++];
         column+=str.length();
         if(str.length()<3)// "0o"
-            die("invalid number `"+str+"`.");
+            die("invalid number `"+str+"`");
         return str;
     }
     // generate dec number
@@ -253,7 +253,7 @@ string nasal_lexer::num_gen()
         if(str.back()=='.')
         {
             column+=str.length();
-            die("invalid number `"+str+"`.");
+            die("invalid number `"+str+"`");
             return "0";
         }
     }
@@ -268,7 +268,7 @@ string nasal_lexer::num_gen()
         if(str.back()=='e' || str.back()=='E' || str.back()=='-' || str.back()=='+')
         {
             column+=str.length();
-            die("invalid number `"+str+"`.");
+            die("invalid number `"+str+"`");
             return "0";
         }
     }
@@ -317,12 +317,12 @@ string nasal_lexer::str_gen()
     // check if this string ends with a " or '
     if(ptr++>=res.size())
     {
-        die("get EOF when generating string.");
+        die("get EOF when generating string");
         return str;
     }
     ++column;
     if(begin=='`' && str.length()!=1)
-        die("\'`\' is used for string that includes one character.");
+        die("\'`\' is used for string that includes one character");
     return str;
 }
 
@@ -369,7 +369,7 @@ void nasal_lexer::scan(const string& file)
             ++column;
             u32 type=get_type(str);
             if(!type)
-                die("invalid operator `"+str+"`.");
+                die("invalid operator `"+str+"`");
             tokens.push_back({line,column,type,str});
             ++ptr;
         }
@@ -397,7 +397,7 @@ void nasal_lexer::scan(const string& file)
         {
             ++column;
             char c=res[ptr++];
-            die("invalid character 0x"+chrhex(c)+".");
+            die("invalid character 0x"+chrhex(c));
         }
     }
     tokens.push_back({line,column,tok_eof,"eof"});

nasal_vm.h

@@ -880,7 +880,7 @@ inline void nasal_vm::o_mcallv()
         }
     }
     else
-        die("cannot get memory space in other types");
+        die("cannot get memory space in this type");
 }
 inline void nasal_vm::o_mcallh()
 {