update num regex

Author: tgauth

dsc_lib/src/functions/int.rs

@@ -74,6 +74,13 @@ mod tests {
         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();
@@ -84,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/grammar.js

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