From 058dd0feef92317932e1aac5e265acff3be8ae97 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sat, 9 Nov 2019 00:02:21 +0800
Subject: [PATCH] Update

---
 balloon/abstract_syntax_tree.cpp | 32 ++++++++++++++++++++++++--------
 balloon/abstract_syntax_tree.h   |  2 ++
 balloon/balloon_var.h            |  1 +
 balloon/main.cpp                 |  8 +++++---
 balloon/test.txt                 | 23 +++++++++++++++++++++++
 5 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 balloon/test.txt

diff --git a/balloon/abstract_syntax_tree.cpp b/balloon/abstract_syntax_tree.cpp
index 4611161..b81111d 100644
--- a/balloon/abstract_syntax_tree.cpp
+++ b/balloon/abstract_syntax_tree.cpp
@@ -1,15 +1,14 @@
 #ifndef __ABSTRACT_SYNTAX_TREE_CPP__
 #define __ABSTRACT_SYNTAX_TREE_CPP__
 
-balloon_scope global;
 int exit_type=0;
 var abstract_syntax_tree::call_id()
 {
 	var temp;
 	if(children.empty())
 	{
-		if(global.search_var(name))
-			temp=global.get_var(name);
+		if(scope.search_var(name))
+			temp=scope.get_var(name);
 		else
 		{
 			std::cout<<">>[Runtime-error] cannot find a var named \'"<<name<<"\'."<<std::endl;
@@ -59,7 +58,7 @@ var abstract_syntax_tree::get_value()
 }
 void abstract_syntax_tree::run_root()
 {
-	global.set_clear();
+	scope.set_clear();
 	int beg_time,end_time;
 	exit_type=__process_exited_successfully;
 	beg_time=time(NULL);
@@ -70,10 +69,10 @@ void abstract_syntax_tree::run_root()
 			var new_var;
 			std::list<abstract_syntax_tree>::iterator j=i->children.begin();
 			std::string _name=j->name;
-			if(!global.search_var(_name))
+			if(!scope.search_var(_name))
 			{
 				new_var.set_name(_name);
-				global.add_var(new_var);
+				scope.add_new_var(new_var);
 			}
 			else
 			{
@@ -87,7 +86,7 @@ void abstract_syntax_tree::run_root()
 		else if(i->type==__string)
 			std::cout<<i->str<<std::endl;
 		else if(i->type==__id)
-			i->call_id();
+			std::cout<<i->call_id().get_name()<<std::endl;
 		else if(i->type==__while)
 		{
 			;
@@ -96,17 +95,34 @@ void abstract_syntax_tree::run_root()
 		{
 			;
 		}
-		
 		if(exit_type!=__process_exited_successfully)
 			break;
 	}
 	end_time=time(NULL);
+	std::cout<<"-------------------------------------------------------------------------------------------"<<std::endl;
 	std::cout<<">>[Runtime] process exited after "<<end_time-beg_time<<" sec(s) with returned state \'";
 	print_exit_type(exit_type);
 	std::cout<<"\'."<<std::endl;
+	scope.set_clear();
 	return;
 }
 
+void abstract_syntax_tree::run_func()
+{
+	scope.add_new_block_scope();
+	scope.add_new_local_scope();
+	
+	scope.pop_last_block_scope();
+	return;
+}
+
+void abstract_syntax_tree::run_block(int block_type)
+{
+	scope.add_new_local_scope();
+	
+	scope.pop_last_local_scope();
+	return;
+}
 
 		
 
diff --git a/balloon/abstract_syntax_tree.h b/balloon/abstract_syntax_tree.h
index 9b7d1ee..3b67440 100644
--- a/balloon/abstract_syntax_tree.h
+++ b/balloon/abstract_syntax_tree.h
@@ -194,6 +194,8 @@ class abstract_syntax_tree
 		var call_id();
 		var get_value();
 		void run_root();
+		void run_func();
+		void run_block(int);
 };
 
 #endif
diff --git a/balloon/balloon_var.h b/balloon/balloon_var.h
index 1391d2f..30e8f09 100644
--- a/balloon/balloon_var.h
+++ b/balloon/balloon_var.h
@@ -68,6 +68,7 @@ class var
 };
 
 var error_var;
+
 void var::set_type(int _type)
 {
 	type=_type;
diff --git a/balloon/main.cpp b/balloon/main.cpp
index 037d1f5..a39a081 100644
--- a/balloon/main.cpp
+++ b/balloon/main.cpp
@@ -1,9 +1,11 @@
 #include "balloon.h"
+
+resource_file prog;
+balloon_lexer lex;
+balloon_parse pas;
+
 int main()
 {
-	resource_file prog;
-	balloon_lexer lex;
-	balloon_parse pas;
 	std::string command;
 	std::cout<<">> Balloon interpreter by ValKmjolnir"<<std::endl;
 	std::cout<<">> Input [help] to find help."<<std::endl;
diff --git a/balloon/test.txt b/balloon/test.txt
new file mode 100644
index 0000000..9df80e3
--- /dev/null
+++ b/balloon/test.txt
@@ -0,0 +1,23 @@
+var a=1;
+var b=2;
+var c="string";
+var d='str';
+var e=[];
+var f={};
+var g=[0,'str',[],{}];
+var h={
+    va1:1,
+    va2:"str",
+    va3:'s',
+    va4:[],
+    va5:{fuck:0}
+};
+a=2;
+b=3;
+c="hello world!";
+var i=func(v1,v2,v3){return [0,0,0];};
+107374;
+"str";
+'fuck';
+a;
+z;
\ No newline at end of file