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 "<> [parse] error: [line "<