From e9e5e1a3fca3235d10f256e3133aa84a829ab05a Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:25:14 +0800
Subject: [PATCH] update

---
 version2.0/nasal_ast.h   |  2 +-
 version2.0/nasal_enum.h  | 62 +++++++++++++++++++++++++++++++++++++---
 version2.0/nasal_parse.h |  1 -
 version2.0/nasal_sym.h   |  1 +
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/version2.0/nasal_ast.h b/version2.0/nasal_ast.h
index 7ed6026..64b2658 100644
--- a/version2.0/nasal_ast.h
+++ b/version2.0/nasal_ast.h
@@ -106,7 +106,7 @@ void abstract_syntax_tree::print_tree_block(const int n)
 	for(int i=0;i<n;++i)
 		__str+="| ";
 	std::cout<<__str;
-	print_parse_token(node_type);
+	print_ast_type(node_type);
 	switch(node_type)
 	{
 		case __number:  std::cout<<": "<<var_number;break;
diff --git a/version2.0/nasal_enum.h b/version2.0/nasal_enum.h
index d11d255..5f8e909 100644
--- a/version2.0/nasal_enum.h
+++ b/version2.0/nasal_enum.h
@@ -22,7 +22,8 @@ void print_lexer_token(int type)
 	return;
 }
 
-enum parse_token_type
+// parse_gen_type include enums for parser and ast
+enum parse_gen_type
 {
 	__stack_end=1,
 	__cmp_equal,__cmp_not_equal,__cmp_less,__cmp_less_or_equal,__cmp_more,__cmp_more_or_equal,
@@ -125,6 +126,60 @@ void print_parse_token(int type)
 		case __number:            context="num";       break;
 		case __string:            context="str";       break;
 		
+		default:                  context="undefined";   break;
+	}
+	std::cout<<context;
+	return;
+}
+void print_ast_type(int type)
+{
+	std::string context="";
+	switch(type)
+	{
+		case __cmp_equal:         context=" == "; break;
+		case __cmp_not_equal:     context=" != "; break;
+		case __cmp_less:          context=" < ";  break;
+		case __cmp_less_or_equal: context=" <= "; break;
+		case __cmp_more:          context=" > ";  break;
+		case __cmp_more_or_equal: context=" >= "; break;
+		
+		case __and_operator:      context=" and ";break;
+		case __or_operator:       context=" or "; break;
+		case __nor_operator:      context=" ! ";  break;
+		case __add_operator:      context=" + ";  break;
+		case __sub_operator:      context=" - ";  break;
+		case __mul_operator:      context=" * ";  break;
+		case __div_operator:      context=" / ";  break;
+		case __link_operator:     context=" ~ ";  break;
+		
+		case __equal:             context=" = ";  break;
+		case __add_equal:         context=" += "; break;
+		case __sub_equal:         context=" -= "; break;
+		case __mul_equal:         context=" *= "; break;
+		case __div_equal:         context=" /= "; break;
+		case __link_equal:        context=" ~= "; break;
+		
+		case __ques_mark:         context="?";    break;
+
+		case __var:               context="var ";      break;
+		case __func:              context="func ";     break;
+		case __continue:          context="continue";  break;
+		case __break:             context="break";     break;
+		case __for:               context="for";       break;
+		case __forindex:          context="forindex";  break;
+		case __foreach:           context="foreach ";  break;
+		case __while:             context="while";     break;
+		case __if:                context="if ";       break;
+		case __elsif:             context="elsif ";    break;
+		case __else:              context="else ";     break;
+		case __return:            context="return ";   break;
+		case __nil:               context="nil";       break;
+		
+		case __id:                context="id";        break;
+		case __dynamic_id:        context="id...";     break;
+		case __number:            context="num";       break;
+		case __string:            context="str";       break;
+		
 		case __root:              context="root";        break;
 		case __null_type:         context="null_type";   break;
 		case __multi_id:          context="ids";         break;
@@ -323,8 +378,8 @@ void print_parse_error(int error_type,int line,int error_token_type=__stack_end)
 
 enum scalar_type
 {
-	scalar_nil,
-	scalar_number=1,
+	scalar_nil=0,
+	scalar_number,
 	scalar_string,
 	scalar_vector,
 	scalar_hash,
@@ -345,5 +400,4 @@ void print_scalar_type(const int type)
 	return;
 }
 
-
 #endif
diff --git a/version2.0/nasal_parse.h b/version2.0/nasal_parse.h
index 997211c..29a3b64 100644
--- a/version2.0/nasal_parse.h
+++ b/version2.0/nasal_parse.h
@@ -102,7 +102,6 @@ void nasal_parse::print_detail_token()
 			std::cout<<std::endl<<line<<"\t"<<indent;
 		}
 		print_parse_token(tmp.top().type);
-
 		if(tmp.top().type==__left_brace)
 			indent+=' ';
 		tmp.pop();
diff --git a/version2.0/nasal_sym.h b/version2.0/nasal_sym.h
index aa322d0..059d24d 100644
--- a/version2.0/nasal_sym.h
+++ b/version2.0/nasal_sym.h
@@ -25,6 +25,7 @@ class sym_hash_map
 			for(std::map<std::string,int>::iterator i=sym_map.begin();i!=sym_map.end();++i)
 				nasal_gc.reference_delete(i->second);
 			sym_map.clear();
+			nasal_gc.gc_scanner();
 			return;
 		}
         void set_clear()