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

Use "using" instead of "gtk" and "import"

Browse source 
- Having one keyword for both is less syntax to remember
- I might use "include" as a keyword in the future, which would make
  "import" confusing, so use "using" instead
This commit is contained in:
James Westman 2021-10-22 22:26:00 -05:00
parent 78a9481631
commit b3c28ce3d4
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
5 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtkblueprinttool/parser.py
View file

@ -30,9 +30,9 @@ def parse(tokens) -> ast.UI:
gtk_directive = Group(
ast.GtkDirective,
Sequence(
Keyword("gtk"),
Fail(UseNumber(None), "Version number must be in quotation marks"),
UseQuoted("version").expected("a version number for GTK"),
Keyword("using"),
Keyword("Gtk"),
UseNumberText("version").expected("a version number for GTK"),
StmtEnd().expected("`;`"),
)
)
@ -40,10 +40,9 @@ def parse(tokens) -> ast.UI:
import_statement = Group(
ast.Import,
Sequence(
Keyword("import"),
Keyword("using"),
UseIdent("namespace").expected("a GIR namespace"),
Fail(UseNumber(None), "Version number must be in quotation marks"),
UseQuoted("version").expected("a version number"),
UseNumberText("version").expected("a version number"),
StmtEnd().expected("`;`"),
)
).recover()
@ -173,7 +172,7 @@ def parse(tokens) -> ast.UI:
ui = Group(
ast.UI,
Sequence(
gtk_directive.err("File must start with a gtk directive (e.g. `gtk 4.0;`)"),
gtk_directive.err("File must start with a \"using gtk\" directive (e.g. `using Gtk 4.0;`)"),
ZeroOrMore(import_statement),
ZeroOrMore(AnyOf(
template,