From 67ae3505fbe2b283d998e7de7e5dff2d97645e4b Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:16:55 +0800
Subject: [PATCH] update

---
 nasal.ebnf    | 4 ++--
 nasal_enum.h  | 2 +-
 nasal_parse.h | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nasal.ebnf b/nasal.ebnf
index 3070f3b..ee5a6b9 100644
--- a/nasal.ebnf
+++ b/nasal.ebnf
@@ -59,11 +59,11 @@ multive_expr::=
     (unary|scalar) ('*' | '/') (unary|scalar)
 ;
 unary::=
-    ('-'|'!') scalar
+    ('-'|'!') (unary|scalar)
 ;
 scalar::=
     function {call_scalar}
-    |identifier {call_scalar}
+    |[func] identifier {call_scalar}
     |vector {call_scalar}
     |hash {call_scalar}
     |number
diff --git a/nasal_enum.h b/nasal_enum.h
index b55c74f..33db5ce 100644
--- a/nasal_enum.h
+++ b/nasal_enum.h
@@ -140,7 +140,7 @@ enum parse_error
 void error_info(int line,int error_type,std::string error_str="")
 {
     std::string detail;
-    std::cout<<">> [parse] error_info: [line "<<line<<"] ";
+    std::cout<<">> [parse] error: [line "<<line<<"] ";
     switch(error_type)
     {
         case unknown:              std::cout<<"unknown error.\n";                       break;
diff --git a/nasal_parse.h b/nasal_parse.h
index f6d4e84..f2ae575 100644
--- a/nasal_parse.h
+++ b/nasal_parse.h
@@ -834,7 +834,13 @@ nasal_ast nasal_parse::unary()
         case tok_not:node.set_type(ast_unary_not);break;
     }
     ++ptr;
-    if(ptr<tok_list_size) node.add_child(scalar());
+    if(ptr<tok_list_size)
+    {
+        if(tok_list[ptr].type==tok_sub || tok_list[ptr].type==tok_not)
+            node.add_child(unary());
+        else
+            node.add_child(scalar());
+    }
     else{ ++error; error_info(error_line,lack_calculation);}
     return node;
 }