Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
target
enums/target
tests/repositories
*~
60 changes: 30 additions & 30 deletions src/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ mod tests {
lang: LANG,
source: &str,
file: &str,
correct_operators: &mut Vec<&str>,
correct_operands: &mut Vec<&str>,
correct_operators: &mut [&str],
correct_operands: &mut [&str],
) {
let path = PathBuf::from(file);
let mut trimmed_bytes = source.trim_end().trim_matches('\n').as_bytes().to_vec();
Expand Down Expand Up @@ -293,8 +293,8 @@ mod tests {
"if True:
a = 1 + 2",
"foo.py",
&mut vec!["if", "=", "+"],
&mut vec!["True", "a", "1", "2"],
&mut ["if", "=", "+"],
&mut ["True", "a", "1", "2"],
);
}

Expand All @@ -309,8 +309,8 @@ mod tests {
b = 2 + a
c = 3 + 3",
"foo.py",
&mut vec!["def", "=", "+"],
&mut vec!["foo", "bar", "toto", "a", "b", "c", "1", "2", "3"],
&mut ["def", "=", "+"],
&mut ["foo", "bar", "toto", "a", "b", "c", "1", "2", "3"],
);
}

Expand All @@ -322,8 +322,8 @@ mod tests {
float avg;
avg = (a + b + c) / 3;",
"foo.c",
&mut vec!["int", "float", "()", "=", "+", "/", ",", ";"],
&mut vec!["a", "b", "c", "avg", "3"],
&mut ["int", "float", "()", "=", "+", "/", ",", ";"],
&mut ["a", "b", "c", "avg", "3"],
);
}

Expand All @@ -339,8 +339,8 @@ mod tests {
printf(\"avg = %d\", avg);
}",
"foo.c",
&mut vec!["()", "{}", "int", "&", "=", "+", "/", ",", ";"],
&mut vec![
&mut ["()", "{}", "int", "&", "=", "+", "/", ",", ";"],
&mut [
"main",
"a",
"b",
Expand All @@ -362,8 +362,8 @@ mod tests {
"let: usize a = 5; let b: f32 = 7.0; let c: i32 = 3;",
"foo.rs",
// FIXME tree-sitter-rust does not parse the comma inside the println! macro
&mut vec!["let", "usize", "=", ";", "f32", "i32"],
&mut vec!["a", "b", "c", "5", "7.0", "3"],
&mut ["let", "usize", "=", ";", "f32", "i32"],
&mut ["a", "b", "c", "5", "7.0", "3"],
);
}

Expand All @@ -378,8 +378,8 @@ mod tests {
}",
"foo.rs",
// FIXME tree-sitter-rust does not parse the comma inside the println! macro
&mut vec!["fn", "()", "{}", "let", "=", "+", "/", ";", "!"],
&mut vec!["main", "a", "b", "c", "avg", "5", "3", "println", "\"{}\""],
&mut ["fn", "()", "{}", "let", "=", "+", "/", ";", "!"],
&mut ["main", "a", "b", "c", "avg", "5", "3", "println", "\"{}\""],
);
}

Expand All @@ -393,8 +393,8 @@ mod tests {
avg = (a + b + c) / 3;
console.log(\"{}\", avg);",
"foo.js",
&mut vec!["()", "var", "let", "=", "+", "/", ",", ".", ";"],
&mut vec![
&mut ["()", "var", "let", "=", "+", "/", ",", ".", ";"],
&mut [
"a",
"b",
"c",
Expand Down Expand Up @@ -423,10 +423,10 @@ mod tests {
console.log(\"{}\", avg);
}",
"foo.js",
&mut vec![
&mut [
"function", "()", "{}", "var", "let", "=", "+", "/", ",", ".", ";",
],
&mut vec![
&mut [
"main",
"a",
"b",
Expand Down Expand Up @@ -454,8 +454,8 @@ mod tests {
avg = (a + b + c) / 3;
console.log(\"{}\", avg);",
"foo.js",
&mut vec!["()", "var", "let", "=", "+", "/", ",", ".", ";"],
&mut vec![
&mut ["()", "var", "let", "=", "+", "/", ",", ".", ";"],
&mut [
"a",
"b",
"c",
Expand Down Expand Up @@ -484,10 +484,10 @@ mod tests {
console.log(\"{}\", avg);
}",
"foo.js",
&mut vec![
&mut [
"function", "()", "{}", "var", "let", "=", "+", "/", ",", ".", ";",
],
&mut vec![
&mut [
"main",
"a",
"b",
Expand Down Expand Up @@ -516,11 +516,11 @@ mod tests {
avg = (a + b + c) / 3;
console.log(\"{}\", avg);",
"foo.ts",
&mut vec![
&mut [
"()", "var", "let", "string", "number", "boolean", ":", "=", "+", "/", ",", ".",
";",
],
&mut vec![
&mut [
"a",
"b",
"c",
Expand Down Expand Up @@ -554,11 +554,11 @@ mod tests {
console.log(\"{}\", avg);
}",
"foo.ts",
&mut vec![
&mut [
"function", "()", "{}", "var", "let", "string", "number", "boolean", ":", "=", "+",
"/", ",", ".", ";",
],
&mut vec![
&mut [
"main",
"a",
"b",
Expand Down Expand Up @@ -591,11 +591,11 @@ mod tests {
avg = (a + b + c) / 3;
console.log(\"{}\", avg);",
"foo.ts",
&mut vec![
&mut [
"()", "var", "let", "string", "number", "boolean", ":", "=", "+", "/", ",", ".",
";",
],
&mut vec![
&mut [
"a",
"b",
"c",
Expand Down Expand Up @@ -629,11 +629,11 @@ mod tests {
console.log(\"{}\", avg);
}",
"foo.ts",
&mut vec![
&mut [
"function", "()", "{}", "var", "let", "string", "number", "boolean", ":", "=", "+",
"/", ",", ".", ";",
],
&mut vec![
&mut [
"main",
"a",
"b",
Expand Down