From f1de7b3a09a335ed9753b8a080325ab7d7c0ac33 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Thu, 10 Oct 2019 10:33:14 -0500
Subject: [PATCH] New update

---
 version1.0/main.cpp           | 13 +++++++++++--
 version1.0/nasal.h            |  2 +-
 version1.0/nasal_parser.h     | 24 +++++-------------------
 version1.0/nasal_token_type.h |  7 +++++++
 version1.0/nasal_var.h        |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/version1.0/main.cpp b/version1.0/main.cpp
index 0f4f49d..d3bcf36 100644
--- a/version1.0/main.cpp
+++ b/version1.0/main.cpp
@@ -4,6 +4,7 @@ int main()
 	resource_programme_process prog;
 	nasal_lexer lex;
 	nasal_parser pas;
+	generator gen;
 	std::string command;
 	std::cout<<">> Nasal interpreter by ValKmjolnir"<<std::endl;
 	std::cout<<">> Input [help] to find help."<<std::endl;
@@ -61,7 +62,12 @@ int main()
 			lex.token_list_type_detail_edit();
 			pas.parse_process(lex.return_list());
 			pas.parse_main_work();
-			pas.print_ast();
+			if(!pas.get_error_num())
+			{
+				gen.gen_process(lex.return_list());
+				gen.gen_main_work();
+				gen.print_ast();
+			}
 		}
 		else if(command=="run")
 		{
@@ -69,7 +75,10 @@ int main()
 			lex.token_list_type_detail_edit();
 			pas.parse_process(lex.return_list());
 			pas.parse_main_work();
-			pas.run();
+			if(!pas.get_error_num())
+			{
+				;
+			}
 		}
 		else
 			prog.input_file(command);
diff --git a/version1.0/nasal.h b/version1.0/nasal.h
index f21b573..f90f2de 100644
--- a/version1.0/nasal.h
+++ b/version1.0/nasal.h
@@ -9,13 +9,13 @@
 #include <list>
 
 #include "nasal_token_type.h"
-#include "abstract_syntax_tree.h"
 #include "ast.h"
 #include "nasal_var.h"
 #include "nasal_var_inrun_list.h"
 
 #include "nasal_lexer.h"
 #include "nasal_parser.h"
+#include "ast_generator.h"
 
 #include "nasal_var.cpp"
 
diff --git a/version1.0/nasal_parser.h b/version1.0/nasal_parser.h
index edf10d5..91158ed 100644
--- a/version1.0/nasal_parser.h
+++ b/version1.0/nasal_parser.h
@@ -1,14 +1,10 @@
 #ifndef __NASAL_PARSER_H__
 #define __NASAL_PARSER_H__
 
-#include "nasal_token_type.h"
-
 class nasal_parser
 {
 	private:
-		ast_tree_node root;
 		std::stack<token> parse;
-		std::stack<ast_tree_node> node_cache;
 		token this_token;
 		int error;
 		int warning;
@@ -30,6 +26,10 @@ class nasal_parser
 			parse.pop();
 			return;
 		}
+		int get_error_num()
+		{
+			return error;
+		}
 		void print_parser_stack()
 		{
 			if(parse.empty())
@@ -84,7 +84,7 @@ class nasal_parser
 			}
 			if(temp.empty())
 			{
-				std::cout<<">>[Parse] [-Warning] Empty lexer list."<<std::endl;
+				std::cout<<">>[Parse] warning: empty lexer list."<<std::endl;
 				return;
 			}
 			while(!temp.empty())
@@ -94,20 +94,6 @@ class nasal_parser
 			}
 			return;
 		}
-		void print_ast()
-		{
-			std::cout<<">>[Abstract-syntax-tree]"<<std::endl;
-			root.print(0);
-			return;
-		}
-		void run()
-		{
-			if(!error)
-				root.run();
-			else
-				std::cout<<">>[Parse] "<<error<<" error(s) occurred,stop."<<std::endl;
-			return;
-		}
 		void parse_main_work();
 		void in_curve_calc_expr();
 		void number_begin_expr();
diff --git a/version1.0/nasal_token_type.h b/version1.0/nasal_token_type.h
index fac9839..89ee3c2 100644
--- a/version1.0/nasal_token_type.h
+++ b/version1.0/nasal_token_type.h
@@ -30,6 +30,8 @@ enum token_type
 	//basic elements
 	
 	__root,
+	__list,__hash,
+	__call_function,__list_search,__hash_search,
 	__block,
 	__definition,__assignment,
 	__function,__loop,__ifelse
@@ -91,6 +93,11 @@ void print_token(int type)
 		case __string:            context="str";break;
 		
 		case __root:              context="root";break;
+		case __list:              context="list";break;
+		case __hash:              context="hash";break;
+		case __call_function:     context="call_func";break;
+		case __list_search:       context="call_list";break;
+		case __hash_search:       context="call_hash";break;
 		case __block:             context="block";break;
 		case __definition:        context="definition";break;
 		case __assignment:        context="assignment";break;
diff --git a/version1.0/nasal_var.h b/version1.0/nasal_var.h
index 31d3b0b..694e64b 100644
--- a/version1.0/nasal_var.h
+++ b/version1.0/nasal_var.h
@@ -51,7 +51,7 @@ class nasal_hash
 class nasal_function
 {
 	private:
-		std::list<ast_tree_node> root;
+		std::list<abstract_syntax_tree> root;
 	public:
 		nasal_function();
 		nasal_function(const nasal_function&);