update expressions to error for non-ints

dsc_lib/src/functions/int.rs

@@ -67,6 +67,20 @@ mod tests {
         assert_eq!(result, 123);
     }
 
+    #[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(_)));
+    }
+
+    #[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(_)));
+    }
+
     #[test]
     fn nested() {
         let mut parser = Statement::new().unwrap();
@@ -77,7 +91,7 @@ mod tests {
     #[test]
     fn error() {
         let mut parser = Statement::new().unwrap();
-        let err = parser.parse_and_execute("[int('foo')]", &Context::new()).unwrap_err();
+        let err = parser.parse_and_execute("[int('foo.1')]", &Context::new()).unwrap_err();
         assert!(matches!(err, DscError::FunctionArg(_, _)));
     }
 }

tree-sitter-dscexpression/corpus/invalid_expressions.txt

@@ -110,3 +110,17 @@ Incomplete expression
         (function
           (functionName)))
       (MISSING "]"))
+
+=====
+Invalid float argument
+=====
+[myFunction(a.1)]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (ERROR
+            (functionName)
+            (memberName)))))

tree-sitter-dscexpression/corpus/valid_expressions.txt

@@ -101,3 +101,29 @@ Nested dot-notation
                 (memberName)))))
         (memberAccess
           (memberName))))
+
+=====
+Float input
+=====
+[myFunction(1234.5678)]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (arguments
+              (number)))))
+
+=====
+Quotes float input
+=====
+[myFunction('1234.5678')]
+---
+
+    (statement
+      (expression
+        (function
+          (functionName)
+          (arguments
+              (string)))))

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+/,
+    number: $ => /-?(\d*[.])?\d+/,
     boolean: $ => choice('true', 'false'),
 
     memberAccess: $ => seq('.', $.memberName, repeat(seq('.', $.memberName))),