From a3d44d47f6c6974631c7f4ce9ed5fbfbe0ba0261 Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Fri, 20 Sep 2019 12:37:00 -0500
Subject: [PATCH] Update

---
 version1.0/nasal_parser.h | 62 +++++++++++++++++++++++++++++++++++----
 version1.0/test.txt       |  6 +++-
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/version1.0/nasal_parser.h b/version1.0/nasal_parser.h
index c7ff7d1..9b24d5e 100644
--- a/version1.0/nasal_parser.h
+++ b/version1.0/nasal_parser.h
@@ -176,6 +176,37 @@ void nasal_parser::definition_expr()
 }
 void nasal_parser::assignment_expr()
 {
+	get_token();
+	if(this_token.type!=__equal && this_token.type!=__add_equal
+		&& this_token.type!=__sub_equal && this_token.type!=__mul_equal
+		&& this_token.type!=__div_equal && this_token.type!=__link_equal)
+	{
+		parse.push(this_token);
+		return;
+	}
+	get_token();
+	switch(this_token.type)
+	{
+		case __id:identifier_begin_expr();break;
+		case __number:number_begin_expr();break;
+		case __string:string_begin_expr();break;
+		case __left_brace:hash_init_generator();break;
+		case __left_bracket:list_init_generator();break;
+		case __func:function_expr();break;
+		default:
+			++error;
+			std::cout<<">>[Error] line "<<this_token.line<<": must have a correct data type after operator."<<std::endl;
+			return;
+			break;
+	}
+	get_token();
+	if(this_token.type!=__semi)
+	{
+		++error;
+		std::cout<<">>[Error] line "<<this_token.line<<": expect a \';\' at the end of this line."<<std::endl;
+		parse.push(this_token);
+		return;
+	}
 	return;
 }
 void nasal_parser::loop_expr()
@@ -363,11 +394,11 @@ void nasal_parser::identifier_begin_expr()
 	get_token();
 	switch(this_token.type)
 	{
-		case __add_equal:
-		case __sub_equal:add_sub_expr();break;
-		case __mul_equal:
-		case __div_equal:mul_div_expr();break;
-		case __link_equal:link_expr();break;
+		case __add_operator:
+		case __sub_operator:add_sub_expr();break;
+		case __mul_operator:
+		case __div_operator:mul_div_expr();break;
+		case __link_operator:link_expr();break;
 		case __equal:assignment_expr();break;
 		case __left_curve:call_function_expr();break;
 		case __left_bracket:list_search_expr();break;
@@ -384,6 +415,27 @@ void nasal_parser::identifier_begin_expr()
 			std::cout<<"\" at this line."<<std::endl;
 			break;
 	}
+	get_token();
+	if(this_token.type==__semi)
+		parse.push(this_token);
+	else
+	{
+		switch(this_token.type)
+		{
+			case __equal:
+			case __add_equal:
+			case __sub_equal:
+			case __mul_equal:
+			case __div_equal:
+			case __link_equal:
+				parse.push(this_token);
+				assignment_expr();
+				break;
+			default:
+				parse.push(this_token);
+				break;
+		}
+	}
 	return;
 }
 void nasal_parser::number_begin_expr()
diff --git a/version1.0/test.txt b/version1.0/test.txt
index da68ce8..ff6e935 100644
--- a/version1.0/test.txt
+++ b/version1.0/test.txt
@@ -5,4 +5,8 @@ id(id);
 id("str",1,1);
 var e=1;
 var x=10*2-20;
-var id;
\ No newline at end of file
+var id;
+var id=[1,2,3,4];
+var id={id:"str"};
+id();
+id.id();
\ No newline at end of file