From c186d3b0301042af5d1fd834b24fee624574ea07 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Fri, 10 Apr 2020 04:27:19 -0700
Subject: [PATCH] update

---
 version2.0/main.cpp        | 10 +++++++---
 version2.0/nasal_lexer.h   | 14 +++++++++++++-
 version2.0/nasal_runtime.h |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/version2.0/main.cpp b/version2.0/main.cpp
index 8965282..a6a9626 100644
--- a/version2.0/main.cpp
+++ b/version2.0/main.cpp
@@ -20,6 +20,10 @@ nasal_runtime runtime;
 std::string command;
 int main()
 {
+#ifdef _WIN32
+	// use chcp 65001 to use unicode io
+	system("chcp 65001");
+#endif
 	// this curve looks really cool
 	std::cout<<"       __                _      "<<std::endl;
 	std::cout<<"    /\\ \\ \\__ _ ___  __ _| |  "<<std::endl;
@@ -27,13 +31,13 @@ int main()
 	std::cout<<"  / /\\  / (_| \\__ \\ (_| | |  "<<std::endl;
 	std::cout<<"  \\_\\ \\/ \\__,_|___/\\__,_|_|"<<std::endl;
 #ifdef _WIN32
-			std::cout<<">> [system] Windows system."<<std::endl;
+	std::cout<<">> [system] Windows system."<<std::endl;
 #endif
 #ifdef _linux_
-			std::cout<<">> [system] Linux system."<<std::endl;
+	std::cout<<">> [system] Linux system."<<std::endl;
 #endif
 #ifdef TARGET_OS_MAC
-			std::cout<<">> [system] MacOS system."<<std::endl;
+	std::cout<<">> [system] MacOS system."<<std::endl;
 #endif
 	std::cout<<">> Nasal interpreter ver 2.0 ."<<std::endl;
 	std::cout<<">> Code: https://github.com/ValKmjolnir/Nasal-Interpreter"<<std::endl;
diff --git a/version2.0/nasal_lexer.h b/version2.0/nasal_lexer.h
index 199fc66..c926c92 100644
--- a/version2.0/nasal_lexer.h
+++ b/version2.0/nasal_lexer.h
@@ -158,7 +158,8 @@ void resource_file::input_file(std::string filename)
 		c=fin.get();
 		if(fin.eof())
 			break;
-		source_code.push_back(c<0? '?':c);
+		//source_code.push_back(c<0? '?':c);
+		source_code.push_back(c);
 	}
 	fin.close();
 	return;
@@ -198,6 +199,17 @@ void resource_file::print_resource()
 	{
 		if(32<=source_code[i])
 			std::cout<<source_code[i];
+		else if(source_code[i]<0)
+		{
+			std::string tmp="";
+			for(;i<source_code.size();++i)
+			{
+				if(source_code[i]>=0)
+					break;
+				tmp.push_back(source_code[i]);
+			}
+			std::cout<<tmp;--i;
+		}
 		else
 			std::cout<<" ";
 		if(source_code[i]=='\n')
diff --git a/version2.0/nasal_runtime.h b/version2.0/nasal_runtime.h
index 291861d..730d735 100644
--- a/version2.0/nasal_runtime.h
+++ b/version2.0/nasal_runtime.h
@@ -4786,7 +4786,7 @@ void nasal_runtime::main_proc(abstract_syntax_tree& root)
             break;
     }
     end_time=std::time(NULL);
-    std::cout<<">> [Runtime] process exited after "<<end_time-begin_time<<" s ."<<std::endl;
+    std::cout<<std::endl<<">> [Runtime] process exited after "<<end_time-begin_time<<" s ."<<std::endl;
     global_scope.clear();
     main_local_scope.clear();
     nasal_gc.gc_init();