Siklos/blueprint-compiler
1
0
Fork 0
mirror of https://gitlab.gnome.org/jwestman/blueprint-compiler.git synced 2025-05-04 15:59:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

parser: Merge consecutive "Unexpected tokens" errors

Browse source 
Fixes #24
This commit is contained in:
James Westman 2021-12-16 23:18:31 -06:00
parent 5b76a3b8dd
commit 8e1a9f72dd
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
5 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/sample_errors/consecutive_unexpected_tokens.blp Normal file
View file

@ -0,0 +1,7 @@
using Gtk 4.0;
Button {
visible: false;
not actually blueprint code;
Label {}
}

1
tests/sample_errors/consecutive_unexpected_tokens.err Normal file
View file

@ -0,0 +1 @@
5,3,31,Unexpected tokens

5
tests/test_samples.py
View file

@ -71,9 +71,9 @@ class TestSamples(unittest.TestCase):
raise MultipleErrors(ast.errors)
except PrintableError as e:
def error_str(error):
line, col = utils.idx_to_pos(error.start, blueprint)
line, col = utils.idx_to_pos(error.start + 1, blueprint)
len = error.end - error.start
return ",".join([str(line + 1), str(col + 1), str(len), error.message])
return ",".join([str(line + 1), str(col), str(len), error.message])
if isinstance(e, CompileError):
actual = error_str(e)
@ -143,6 +143,7 @@ class TestSamples(unittest.TestCase):
self.assert_sample_error("a11y_prop_type")
self.assert_sample_error("class_assign")
self.assert_sample_error("class_dne")
self.assert_sample_error("consecutive_unexpected_tokens")
self.assert_sample_error("duplicate_obj_id")
self.assert_sample_error("enum_member_dne")
self.assert_sample_error("filters_in_non_file_filter")