From 352735a843dba1ca0c2721b8e150222667773bfc Mon Sep 17 00:00:00 2001
From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com>
Date: Sun, 19 Jul 2020 10:54:59 -0700
Subject: [PATCH] update

---
 version3.0/nasal_enum.h  |  4 +++-
 version3.0/nasal_parse.h | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/version3.0/nasal_enum.h b/version3.0/nasal_enum.h
index de43987..671fb54 100644
--- a/version3.0/nasal_enum.h
+++ b/version3.0/nasal_enum.h
@@ -129,7 +129,8 @@ enum parse_error
     dynamic_id_not_end,
     multi_assign_lack_val,
     lack_definition,
-    lack_loop_iter
+    lack_loop_iter,
+    lack_func_content
 };
 
 void error_info(int line,int error_type,std::string error_str="")
@@ -163,6 +164,7 @@ void error_info(int line,int error_type,std::string error_str="")
         case multi_assign_lack_val:detail="multi-assignment lacks value list.";break;
         case lack_definition:     detail="expected a definition expression here.";break;
         case lack_loop_iter:      detail="expected an iterator to loop through.";break;
+        case lack_func_content:   detail="expected arguments or expression block here.";break;
     }
     std::cout<<detail<<std::endl;
     return;
diff --git a/version3.0/nasal_parse.h b/version3.0/nasal_parse.h
index 3fd16f7..54ffd47 100644
--- a/version3.0/nasal_parse.h
+++ b/version3.0/nasal_parse.h
@@ -370,6 +370,12 @@ nasal_ast nasal_parse::func_gen()
         ++error;
         return node;
     }
+    if(tok_list[ptr].type!=tok_left_curve && tok_list[ptr].type!=tok_left_brace)
+    {
+        ++error;
+        error_info(error_line,lack_func_content);
+        return node;
+    }
     if(tok_list[ptr].type==tok_left_curve)
     {
         node.add_child(args_list_gen());
@@ -531,7 +537,7 @@ nasal_ast nasal_parse::exprs_gen()
         {
             node.add_child(expr());
             ++ptr;
-            if(ptr<tok_list_size || tok_list[ptr].type==tok_semi)
+            if(ptr<tok_list_size && tok_list[ptr].type==tok_semi)
                 ++ptr;
             else if(node.get_children().empty() || need_semi_check(node.get_children().back()))
             {
@@ -779,7 +785,15 @@ nasal_ast nasal_parse::scalar()
     else if(tok_list[ptr].type==tok_identifier)
         node=id_gen();
     else if(tok_list[ptr].type==tok_func)
-        node=func_gen();
+    {
+        if(ptr+1<tok_list_size && tok_list[ptr+1].type==tok_identifier)
+        {
+            ++ptr;
+            node=id_gen();
+        }
+        else
+            node=func_gen();
+    }
     else if(tok_list[ptr].type==tok_left_bracket)
         node=vector_gen();
     else if(tok_list[ptr].type==tok_left_brace)