Skip to content

update expressions to error for non-ints #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 31, 2024
Merged

update expressions to error for non-ints #438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb1c994
update expressions to error for non-ints
tgauth May 21, 2024
449ab93
update num regex
tgauth May 23, 2024
f981a15
Merge branch 'main' into update-exp-for-non-ints
tgauth May 23, 2024
d4ca398
add tests
tgauth May 24, 2024
bf75873
Merge branch 'update-exp-for-non-ints' of https://github.com/tgauth/d…
tgauth May 24, 2024
65e28a3
check for error nodes within rust parser for function
tgauth May 24, 2024
7d41075
add test for incomplete float
tgauth May 31, 2024
c7e5901
Merge branch 'main' into update-exp-for-non-ints
tgauth May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dsc_lib/src/functions/int.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ 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 nested() {
let mut parser = Statement::new().unwrap();
Expand Down
14 changes: 14 additions & 0 deletions tree-sitter-dscexpression/corpus/invalid_expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,17 @@ Incomplete expression
(function
(functionName)))
(MISSING "]"))

=====
Invalid float argument
=====
[myFunction(a.1)]
---

(statement
(expression
(function
(functionName)
(ERROR
(functionName)
(memberName)))))
26 changes: 26 additions & 0 deletions tree-sitter-dscexpression/corpus/valid_expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))))
2 changes: 1 addition & 1 deletion tree-sitter-dscexpression/grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = grammar({
_quotedString: $ => seq('\'', $.string, '\''),
// ARM strings do not allow to contain single-quote characters
string: $ => /[^']*/,
number: $ => /-?\d+/,
number: $ => /[+-]?([0-9]*[.])?[0-9]+/,
boolean: $ => choice('true', 'false'),

memberAccess: $ => seq('.', $.memberName, repeat(seq('.', $.memberName))),
Expand Down