From ee57994da6c425c46b4007f7efb8f77a42cf6d2c Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sat, 19 Oct 2019 19:32:34 +0800
Subject: [PATCH] Bug fixed

---
 version1.1/nasal_lexer.h  |  2 +-
 version1.1/nasal_parser.h | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/version1.1/nasal_lexer.h b/version1.1/nasal_lexer.h
index 26f88de..988a4bd 100644
--- a/version1.1/nasal_lexer.h
+++ b/version1.1/nasal_lexer.h
@@ -458,7 +458,7 @@ class nasal_lexer
 					else if((*i).content=="<=")
 						(*i).type=__cmp_less_or_equal;
 				}
-				else if(((*i).content==";") || ((*i).content==",") || ((*i).content=="=") || ((*i).content==":") || ((*i).content==".") || ((*i).content=="?") || ((*i).content=="%") || ((*i).content=="$") || ((*i).content=="`") || ((*i).content=="^") || ((*i).content=="@"))
+				else if(((*i).content==";") || ((*i).content==",") || ((*i).content=="=") || ((*i).content==":") || ((*i).content==".") || ((*i).content=="?") || ((*i).content=="|") || ((*i).content=="%") || ((*i).content=="$") || ((*i).content=="`") || ((*i).content=="^") || ((*i).content=="@"))
 				{
 					char c=(*i).content[0];
 					switch(c)
diff --git a/version1.1/nasal_parser.h b/version1.1/nasal_parser.h
index 3335d54..41e9640 100644
--- a/version1.1/nasal_parser.h
+++ b/version1.1/nasal_parser.h
@@ -913,7 +913,7 @@ void nasal_parser::loop_expr()
 		switch(this_token.type)
 		{
 			case __var:definition_expr();break;
-			case __id:calculation_expr();break;
+			case __id:parse.push(this_token);calculation_expr();break;
 			case __semi:parse.push(this_token);break;
 			default:
 				std::cout<<">>[Error] line "<<this_token.line<<": \'";
@@ -1023,7 +1023,7 @@ void nasal_parser::mul_div_operator_expr()
 			case __left_curve:parse.push(this_token);calculation_expr();break;
 			default:
 				++error;
-				std::cout<<">>[Error] line "<<this_token.line<<": expect a data after this operator."<<std::endl;
+				std::cout<<">>[Error] line "<<this_token.line<<": expect a data after operator '*' or '/'."<<std::endl;
 				return;
 				break;
 		}
@@ -1047,7 +1047,7 @@ void nasal_parser::one_operator_expr()
 		case __left_curve:parse.push(this_token);calculation_expr();break;
 		default:
 			++error;
-			std::cout<<">>[Error] line "<<this_token.line<<": expect a data after this operator."<<std::endl;
+			std::cout<<">>[Error] line "<<this_token.line<<": expect a data after operator '!' or '-'."<<std::endl;
 			return;
 			break;
 	}
@@ -1081,7 +1081,7 @@ void nasal_parser::calculation_expr()
 		else
 		{
 			++error;
-			std::cout<<">>[Error] line "<<this_token.line<<": expect a scalar at this place."<<std::endl;
+			std::cout<<">>[Error] line "<<this_token.line<<": expect a scalar before operator '+' , '-' , '*' , '/' or '~'."<<std::endl;
 			return;
 		}
 		get_token();
@@ -1119,6 +1119,10 @@ void nasal_parser::calculation_expr()
 				}
 				break;
 			case __semi:parse.push(this_token);return;break;
+			case __unknown_operator:
+				++error;
+				std::cout<<">>[Error] line "<<this_token.line<<": __unknown_operator '"<<this_token.content<<"'."<<std::endl;
+				return;break;
 			default:parse.push(this_token);return;break;
 		}
 	}
@@ -1195,6 +1199,8 @@ void nasal_parser::call_function_expr()
 		switch(this_token.type)
 		{
 			case __left_curve:
+			case __nor_operator:
+			case __sub_operator:
 			case __number:
 			case __string:
 			case __id:parse.push(this_token);calculation_expr();break;