From dffb943c3ff1a9635b8bccff3f78b3faead8bf02 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sat, 12 Oct 2019 21:51:03 +0800
Subject: [PATCH] Finished part of AST

---
 version1.0/ast.h           | 32 ++++++++++++++++++--------------
 version1.0/ast_generator.h | 23 ++++++++++++++---------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/version1.0/ast.h b/version1.0/ast.h
index df3bb9e..a515048 100644
--- a/version1.0/ast.h
+++ b/version1.0/ast.h
@@ -58,42 +58,40 @@ class abstract_syntax_tree
 		void print_ast_node(int tab_num)
 		{
 			for(int i=0;i<tab_num;++i)
-				std::cout<<" ";
+				std::cout<<"   ";
 			if(ast_node_type==__number)
 			{
-				std::cout<<"[ Number:";
+				std::cout<<"[Number:";
 				std::cout<<var_number;
-				std::cout<<" ]"<<std::endl;
+				std::cout<<"]"<<std::endl;
 				return;
 			}
 			else if(ast_node_type==__string)
 			{
-				std::cout<<"[ String:"<<var_string<<" ]"<<std::endl;
+				std::cout<<"[String:"<<var_string<<"]"<<std::endl;
 				return;
 			}
-			std::cout<<"{ [ Type:";
+			std::cout<<"{  [Type:";
 			print_token(ast_node_type);
-			std::cout<<" ]"<<std::endl;
+			std::cout<<"]"<<std::endl;
 			if(!children.empty())
 			{
 				for(int i=0;i<tab_num;++i)
-					std::cout<<" ";
-				std::cout<<"[ Children ]"<<std::endl;
+					std::cout<<"   ";
+				std::cout<<"   [Children]"<<std::endl;
 				for(std::list<abstract_syntax_tree>::iterator i=children.begin();i!=children.end();++i)
 					i->print_ast_node(tab_num+1);
-				std::cout<<std::endl;
 			}
 			if(!statement_list.empty())
 			{
 				for(int i=0;i<tab_num;++i)
-					std::cout<<" ";
-				std::cout<<"[ Statement(s) ]"<<std::endl;
+					std::cout<<"   ";
+				std::cout<<"   [Statement(s)]"<<std::endl;
 				for(std::list<abstract_syntax_tree>::iterator i=statement_list.begin();i!=statement_list.end();++i)
 					i->print_ast_node(tab_num+1);
-				std::cout<<std::endl;
 			}
 			for(int i=0;i<tab_num;++i)
-				std::cout<<" ";
+				std::cout<<"   ";
 			std::cout<<"}"<<std::endl;
 			return;
 		}
@@ -106,11 +104,17 @@ class abstract_syntax_tree
 		// for definition
 		void set_definition_expr(std::string& name,abstract_syntax_tree var_content)
 		{
-			ast_node_type=__var;
+			ast_node_type=__definition;
 			id_name=name;
 			children.push_back(var_content);
 			return;
 		}
+		// for assignment
+		void set_assignment_expr()
+		{
+			ast_node_type=__assignment;
+			return;
+		}
 		// for if
 		void set_if_expr(abstract_syntax_tree condition,abstract_syntax_tree statements)
 		{
diff --git a/version1.0/ast_generator.h b/version1.0/ast_generator.h
index eae83c2..6b9cc72 100644
--- a/version1.0/ast_generator.h
+++ b/version1.0/ast_generator.h
@@ -272,7 +272,7 @@ abstract_syntax_tree generator::definition_expr()
 	}
 	else if(this_token.type==__id)
 	{
-		;
+		id_name=this_token.content;
 	}
 	get_token();
 	if(this_token.type==__semi)
@@ -286,16 +286,16 @@ abstract_syntax_tree generator::definition_expr()
 	t.type=__semi;
 	switch(this_token.type)
 	{
-		case __number:number_begin_expr();break;
-		case __string:string_begin_expr();break;
-		case __id:identifier_begin_expr();break;
-		case __func:function_generate_expr();parse.push(t);break;
+		case __number:node.set_definition_expr(id_name,number_begin_expr());break;
+		case __string:node.set_definition_expr(id_name,string_begin_expr());break;
+		case __id:node.set_definition_expr(id_name,identifier_begin_expr());break;
+		case __func:node.set_definition_expr(id_name,function_generate_expr());parse.push(t);break;
 		case __add_operator:
 		case __sub_operator:
-		case __nor_operator:one_operator_expr();break;
-		case __left_bracket:list_generate_expr();break;
-		case __left_brace:hash_generate_expr();break;
-		case __left_curve:in_curve_calc_expr();break;
+		case __nor_operator:node.set_definition_expr(id_name,one_operator_expr());break;
+		case __left_bracket:node.set_definition_expr(id_name,list_generate_expr());break;
+		case __left_brace:node.set_definition_expr(id_name,hash_generate_expr());break;
+		case __left_curve:node.set_definition_expr(id_name,in_curve_calc_expr());break;
 		default:break;
 	}
 	return node;
@@ -318,6 +318,7 @@ abstract_syntax_tree generator::assignment_expr()
 		case __left_curve:in_curve_calc_expr();break;
 		default:break;
 	}
+	node.set_assignment_expr();
 	return node;
 }
 bool generator::else_if_check()
@@ -739,6 +740,7 @@ abstract_syntax_tree generator::loop_expr()
 			}
 		}
 	}
+	node.set_node_to_loop();
 	return node;
 }
 abstract_syntax_tree generator::continue_break_expr()
@@ -955,6 +957,7 @@ abstract_syntax_tree generator::call_list_expr()
 			default:parse.push(this_token);break;
 		}
 	}
+	node.set_node_to_list_search();
 	return node;
 }
 abstract_syntax_tree generator::call_function_expr()
@@ -986,6 +989,8 @@ abstract_syntax_tree generator::call_function_expr()
 		case __dot:call_hash_expr();break;
 		default:parse.push(this_token);break;
 	}
+	
+	node.set_node_to_call_function();
 	return node;
 }
 abstract_syntax_tree generator::call_hash_expr()