From 2b4b1af72cfc214b89b1dd551275aa3d3ede786e Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Mon, 9 Nov 2020 12:54:46 +0800
Subject: [PATCH] update

---
 nasal_misc.h  |  4 ++--
 nasal_parse.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/nasal_misc.h b/nasal_misc.h
index 4d56afc..205a4aa 100644
--- a/nasal_misc.h
+++ b/nasal_misc.h
@@ -151,9 +151,9 @@ std::string trans_number_to_string(double number)
 		number-=(double)(int(number/integer_bit))*integer_bit;
 		integer_bit/=10;
 	}
-	if(number!=0)
+	if(number>0.000000001)
 		trans_num_string+='.';
-	while(number!=0)
+	while(number>0.000000001)
 	{
 		trans_num_string+=(char)('0'+int(number*10));
 		number*=10;
diff --git a/nasal_parse.h b/nasal_parse.h
index 0317ab9..1c4b62e 100644
--- a/nasal_parse.h
+++ b/nasal_parse.h
@@ -788,6 +788,40 @@ nasal_ast nasal_parse::additive_expr()
         ++ptr;
         if(ptr<tok_list_size) tmp.add_child(multive_expr());
         else{ ++error; error_info(error_line,lack_calculation);}
+        if(tmp.get_type()!=ast_link && tmp.get_children()[0].get_type()==ast_number && tmp.get_children()[1].get_type()==ast_number)
+        {
+            double num1=tmp.get_children()[0].get_num();
+            double num2=tmp.get_children()[1].get_num();
+            double num;
+            if(tmp.get_type()==ast_add)
+                num=num1+num2;
+            else if(tmp.get_type()==ast_sub)
+                num=num1-num2;
+            tmp.set_type(ast_number);
+            tmp.set_num(num);
+            tmp.get_children().clear();
+        }
+        else if(tmp.get_type()==ast_link)
+        {
+            int type1=tmp.get_children()[0].get_type();
+            int type2=tmp.get_children()[1].get_type();
+            if((type1==ast_number || type1==ast_string) && (type2==ast_number || type2==ast_string))
+            {
+                std::string s1,s2;
+                if(type1==ast_number)
+                    s1=trans_number_to_string(tmp.get_children()[0].get_num());
+                else
+                    s1=tmp.get_children()[0].get_str();
+                if(type2==ast_number)
+                    s2=trans_number_to_string(tmp.get_children()[1].get_num());
+                else
+                    s2=tmp.get_children()[1].get_str();
+                s1+=s2;
+                tmp.set_type(ast_string);
+                tmp.set_str(s1);
+                tmp.get_children().clear();
+            }
+        }
         node=tmp;
         ++ptr;
     }
@@ -818,6 +852,15 @@ nasal_ast nasal_parse::multive_expr()
             error_info(error_line,lack_calculation);
             break;
         }
+        if(tmp.get_children()[0].get_type()==ast_number && tmp.get_children()[1].get_type()==ast_number)
+        {
+            double num1=tmp.get_children()[0].get_num();
+            double num2=tmp.get_children()[1].get_num();
+            double num=(tmp.get_type()==ast_mult? num1*num2:num1/num2);
+            tmp.set_type(ast_number);
+            tmp.set_num(num);
+            tmp.get_children().clear();
+        }
         node=tmp;
         ++ptr;
     }
@@ -842,6 +885,17 @@ nasal_ast nasal_parse::unary()
             node.add_child(scalar());
     }
     else{ ++error; error_info(error_line,lack_calculation);}
+    if(node.get_children()[0].get_type()==ast_number)
+    {
+        double num=node.get_children()[0].get_num();
+        if(node.get_type()==ast_unary_not)
+            num=(!num);
+        else
+            num=-num;
+        node.set_type(ast_number);
+        node.set_num(num);
+        node.get_children().clear();
+    }
     return node;
 }
 nasal_ast nasal_parse::scalar()