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

Fix number parsing

Browse source
This commit is contained in:
James Westman 2022-04-18 18:05:25 -05:00
parent e76bff9291
commit 4e2501c7d7
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
blueprintcompiler/tokenizer.py
View file

@ -40,8 +40,9 @@ _tokens = [
(TokenType.IDENT, r"[A-Za-z_][\d\w\-_]*"), (TokenType.IDENT, r"[A-Za-z_][\d\w\-_]*"),
(TokenType.QUOTED, r'"(\\"|[^"\n])*"'), (TokenType.QUOTED, r'"(\\"|[^"\n])*"'),
(TokenType.QUOTED, r"'(\\'|[^'\n])*'"), (TokenType.QUOTED, r"'(\\'|[^'\n])*'"),
(TokenType.NUMBER, r"[-+]?[\d_]+(\.[\d_]+)?"),
(TokenType.NUMBER, r"0x[A-Fa-f0-9]+"), (TokenType.NUMBER, r"0x[A-Fa-f0-9]+"),
(TokenType.NUMBER, r"[-+]?[\d_]*\d(\.[\d_]*\d)?"),
(TokenType.NUMBER, r"[-+]?\.[\d_]*\d"),
(TokenType.WHITESPACE, r"\s+"), (TokenType.WHITESPACE, r"\s+"),
(TokenType.COMMENT, r"\/\*[\s\S]*?\*\/"), (TokenType.COMMENT, r"\/\*[\s\S]*?\*\/"),
(TokenType.COMMENT, r"\/\/[^\n]*"), (TokenType.COMMENT, r"\/\/[^\n]*"),

7
tests/samples/numbers.blp Normal file
View file

@ -0,0 +1,7 @@
using Gtk 4.0;
Gtk.Label {
xalign: .5;
margin-end: 1_000_000;
margin-top: 0x30;
}

9
tests/samples/numbers.ui Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkLabel">
<property name="xalign">0.5</property>
<property name="margin-end">1000000</property>
<property name="margin-top">48</property>
</object>
</interface>

1
tests/test_samples.py
View file

@ -142,6 +142,7 @@ class TestSamples(unittest.TestCase):
self.assert_sample("inline_menu") self.assert_sample("inline_menu")
self.assert_sample("layout") self.assert_sample("layout")
self.assert_sample("menu") self.assert_sample("menu")
self.assert_sample("numbers")
self.assert_sample("object_prop") self.assert_sample("object_prop")
self.assert_sample("parseable") self.assert_sample("parseable")
self.assert_sample("property") self.assert_sample("property")