check for error nodes within rust parser for function

Author: tgauth

dsc_lib/src/functions/int.rs

@@ -70,15 +70,15 @@ mod tests {
     #[test]
     fn float() {
         let mut parser = Statement::new().unwrap();
-        let err = parser.parse_and_execute("[int(1.2)]", &Context::new()).unwrap_err();
-        assert!(matches!(err, DscError::IntegerConversion(_)));
+        let err = parser.parse_and_execute("[int(1.0)]", &Context::new()).unwrap_err();
+        assert!(matches!(err, DscError::Parser(_)));
     }
 
     #[test]
     fn incomplete_float() {
         let mut parser = Statement::new().unwrap();
         let err = parser.parse_and_execute("[int(.2)]", &Context::new()).unwrap_err();
-        assert!(matches!(err, DscError::IntegerConversion(_)));
+        assert!(matches!(err, DscError::Parser(_)));
     }
 
     #[test]

dsc_lib/src/parser/functions.rs

@@ -36,13 +36,23 @@ impl Function {
     ///
     /// This function will return an error if the function node is not valid.
     pub fn new(statement_bytes: &[u8], function: &Node) -> Result<Self, DscError> {
-        let Some(function_name) = function.child_by_field_name("name") else {
+        let mut function_name = None;
+        let mut function_args = None;
+        let mut cursor = function.walk();
+        for member in function.named_children(&mut cursor) {
+            match member.kind() {
+                "arguments" => function_args = Some(member),
+                "functionName" => function_name = Some(member),
+                "ERROR" => return Err(DscError::Parser("Found error node parsing function".to_string())),
+                _ => {}
+            }
+        }
+        let Some(name) = function_name else {
             return Err(DscError::Parser("Function name node not found".to_string()));
         };
-        let function_args = function.child_by_field_name("args");
         let args = convert_args_node(statement_bytes, &function_args)?;
         Ok(Function{
-            name: function_name.utf8_text(statement_bytes)?.to_string(),
+            name: name.utf8_text(statement_bytes)?.to_string(),
             args})
     }
 

tree-sitter-dscexpression/corpus/invalid_expressions.txt

@@ -122,8 +122,9 @@ Invalid float argument
         (function
           (functionName)
           (ERROR
-            (functionName)
-            (memberName)))))
+            (functionName))
+          (arguments
+            (number)))))
 
 =====
 Plus-sign number argument
@@ -136,5 +137,35 @@ Plus-sign number argument
         (function
           (functionName)
           (ERROR
-            (UNEXPECTED '+')
-            (memberName)))))
+            (UNEXPECTED '+'))
+          (arguments
+            (number)))))
+
+=====
+Float input
+=====
+[myFunction(1234.5678)]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (ERROR
+            (number))
+          (arguments
+              (number)))))
+
+=====
+Float input starting with decimal
+=====
+[myFunction(.1)]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (ERROR)
+          (arguments
+              (number)))))

tree-sitter-dscexpression/corpus/valid_expressions.txt

@@ -102,19 +102,6 @@ Nested dot-notation
         (memberAccess
           (memberName))))
 
-=====
-Float input
-=====
-[myFunction(1234.5678)]
----
-
-    (statement
-      (expression
-        (function
-          (functionName)
-          (arguments
-              (number)))))
-
 =====
 Quotes float input
 =====
@@ -127,16 +114,3 @@ Quotes float input
           (functionName)
           (arguments
               (string)))))
-
-=====
-Float input starting with decimal
-=====
-[myFunction(.1)]
----
-
-    (statement
-      (expression
-        (function
-          (functionName)
-          (arguments
-              (number)))))

tree-sitter-dscexpression/grammar.js

@@ -29,7 +29,7 @@ module.exports = grammar({
     _quotedString: $ => seq('\'', $.string, '\''),
     // ARM strings do not allow to contain single-quote characters
     string: $ => /[^']*/,
-    number: $ => /-?(\d*[.])?\d+/,
+    number: $ => /-?\d+/,
     boolean: $ => choice('true', 'false'),
 
     memberAccess: $ => seq('.', $.memberName, repeat(seq('.', $.memberName))),