From 1d8408c13de9423aa2a8d3ef5b33826ef0c89243 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sun, 24 Nov 2019 18:09:19 +0800
Subject: [PATCH] Update

---
 balloon/abstract_syntax_tree.cpp | 22 +++++++++++++++-------
 balloon/balloon_scope.h          | 31 +++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/balloon/abstract_syntax_tree.cpp b/balloon/abstract_syntax_tree.cpp
index 55389e0..bc55e08 100644
--- a/balloon/abstract_syntax_tree.cpp
+++ b/balloon/abstract_syntax_tree.cpp
@@ -953,17 +953,25 @@ var abstract_syntax_tree::run_func(std::list<var> parameter,var self_func)
 		{
 			std::list<var>::iterator i=parameter.begin();
 			var* array_addr=scope.append_get_addr(i->get_name());
-			if(array_addr!=&error_var)
+			if(array_addr->get_type()==__var_array)
 			{
-				++i;
-				for(;i!=parameter.end();++i)
-					array_addr->append_array(*i);
+				if(array_addr!=&error_var)
+				{
+					++i;
+					for(;i!=parameter.end();++i)
+						array_addr->append_array(*i);
+				}
+				else
+				{
+					std::cout<<">>[Runtime-error] line "<<line<<": cannot find a var named \'"<<parameter.begin()->get_name()<<"\'."<<std::endl;
+					exit_type=__find_var_failure;
+				}
 			}
 			else
 			{
-				std::cout<<">>[Runtime-error] line "<<line<<": cannot find a var named \'"<<parameter.begin()->get_name()<<"\'."<<std::endl;
-				exit_type=__find_var_failure;
-			}
+				std::cout<<">>[Runtime-error] line "<<line<<": called var's type is not an array."<<std::endl;
+				exit_type=__error_value_type;
+			}	
 		}
 		else
 		{
diff --git a/balloon/balloon_scope.h b/balloon/balloon_scope.h
index 8760cb5..5435535 100644
--- a/balloon/balloon_scope.h
+++ b/balloon/balloon_scope.h
@@ -1,6 +1,20 @@
 #ifndef __BALLOON_SCOPE_H__
 #define __BALLOON_SCOPE_H__
 
+
+/*
+	when running a balloon process
+	there will be two types of blocks:
+		root block
+			if-else block
+			loop block
+		function block
+	and many types of local scopes:
+		if-else local scope
+		loop local scope
+	local scopes must be put in a block
+	values in different blocks cannot call each other
+*/
 class balloon_scope
 {
 	private:
@@ -25,7 +39,9 @@ class balloon_scope
 		{
 			if(!scope_list.empty() && !scope_list.back().empty())
 			{
-				// check the last scope
+				// check the last block scope
+				// redefinition only occurs in last block scope
+				// if scope list is empty ,then check the global scope
 				std::list<std::list<var> >::iterator i=scope_list.back().end();
 				--i;
 				for(std::list<var>::iterator j=i->begin();j!=i->end();++j)
@@ -46,6 +62,7 @@ class balloon_scope
 		{
 			if(!scope_list.empty() && !scope_list.back().empty())
 			{
+				// get the last block
 				std::list<std::list<var> >::iterator i=scope_list.back().end();
 				--i;
 				for(;;--i)
@@ -72,6 +89,7 @@ class balloon_scope
 		{
 			if(!scope_list.empty() && !scope_list.back().empty())
 			{
+				// get the last block and the get the last local scope in this blcok
 				std::list<std::list<var> >::iterator i=scope_list.back().end();
 				--i;
 				i->push_back(t);
@@ -179,34 +197,31 @@ class balloon_scope
 		var* get_addr(std::string name)
 		{
 			var* addr=NULL;
-			if(!scope_list.empty())
+			if(!scope_list.empty() && !scope_list.back().empty())
 			{
+				// get the last block
 				std::list<std::list<var> >::iterator i=scope_list.back().end();
 				--i;
 				for(;;--i)
 				{
 					if(!i->empty())// avoid sigsegv
-					{
 						for(std::list<var>::iterator j=i->begin();j!=i->end();++j)
 							if(j->get_name()==name)
 							{
 								addr=&(*j);
 								return addr;
 							}
-						if(i==scope_list.back().begin())
-							break;
-					}
+					if(i==scope_list.back().begin())
+						break;
 				}
 			}
 			if(!global.empty())
-			{
 				for(std::list<var>::iterator i=global.begin();i!=global.end();++i)
 					if(i->get_name()==name)
 					{
 						addr=&(*i);
 						return addr;
 					}
-			}
 			return &error_var;
 		}
 		void add_new_block_scope()