diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d373cc..1ec071e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
- pages
build:
- image: registry.gitlab.gnome.org/gnome/blueprint-compiler
+ image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
stage: build
script:
- black --check --diff ./ tests
@@ -33,7 +33,7 @@ build:
path: coverage.xml
fuzz:
- image: registry.gitlab.gnome.org/gnome/blueprint-compiler
+ image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
stage: build
script:
- meson _build
diff --git a/blueprint-compiler.doap b/blueprint-compiler.doap
deleted file mode 100644
index f3e4000..0000000
--- a/blueprint-compiler.doap
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Blueprint
- A modern language for creating GTK interfaces
- Blueprint is a language and associated tooling for building user interfaces for GTK.
-
- Python
-
-
-
-
-
-
-
- James Westman
-
- jwestman
-
-
-
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 850b6d8..de6c06f 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -255,11 +255,7 @@ def decompile_element(
ctx._node_stack.append(xml)
ctx.start_block()
-
- try:
- gir = decompiler(*args, **kwargs)
- except TypeError as e:
- raise UnsupportedError(tag=xml.tag)
+ gir = decompiler(*args, **kwargs)
if not decompiler._skip_children:
for child in xml.children:
@@ -270,6 +266,8 @@ def decompile_element(
except UnsupportedError as e:
raise e
+ except TypeError as e:
+ raise UnsupportedError(tag=xml.tag)
def decompile(data: str) -> str:
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index df1c2e1..1e7297c 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -219,7 +219,7 @@ def report_bug(): # pragma: no cover
f"""{Colors.BOLD}{Colors.RED}***** COMPILER BUG *****
The blueprint-compiler program has crashed. Please report the above stacktrace,
along with the input file(s) if possible, on GitLab:
-{Colors.BOLD}{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/GNOME/blueprint-compiler/-/issues/new?issue
+{Colors.BOLD}{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/new?issue
{Colors.CLEAR}"""
)
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 8005e9e..26d8e2a 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -71,7 +71,7 @@ def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
print(
f"""{Colors.FAINT}Either the original XML file had an error, or there is a bug in the
porting tool. If you think it's a bug (which is likely), please file an issue on GitLab:
-{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/GNOME/blueprint-compiler/-/issues/new?issue{Colors.CLEAR}\n"""
+{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/new?issue{Colors.CLEAR}\n"""
)
return CouldNotPort("does not compile")
@@ -136,7 +136,7 @@ def step1():
wrap.write(
f"""[wrap-git]
directory = blueprint-compiler
-url = https://gitlab.gnome.org/GNOME/blueprint-compiler.git
+url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
revision = {VERSION}
depth = 1
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index de6fbf1..e0b4246 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -302,18 +302,12 @@ expr.children = [
@decompiler("lookup", skip_children=True, cdata=True)
def decompile_lookup(
- ctx: DecompileCtx,
- gir: gir.GirContext,
- cdata: str,
- name: str,
- type: T.Optional[str] = None,
+ ctx: DecompileCtx, gir: gir.GirContext, cdata: str, name: str, type: str
):
if ctx.parent_node is not None and ctx.parent_node.tag == "property":
ctx.print("expr ")
- if type is None:
- type = ""
- elif t := ctx.type_by_cname(type):
+ if t := ctx.type_by_cname(type):
type = decompile.full_name(t)
else:
type = "$" + type
@@ -333,7 +327,7 @@ def decompile_lookup(
if constant == ctx.template_class:
ctx.print("template." + name)
elif constant == "":
- ctx.print(f"item as <{type}>.{name}")
+ ctx.print("item as <" + type + ">." + name)
else:
ctx.print(constant + "." + name)
return
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index e590539..ae062fb 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -17,7 +17,7 @@
#
# SPDX-License-Identifier: LGPL-3.0-or-later
-"""Utilities for parsing an AST from a token stream."""
+""" Utilities for parsing an AST from a token stream. """
import typing as T
from enum import Enum
diff --git a/docs/collect-sections.py b/docs/collect-sections.py
index a2dd004..07bc5f6 100755
--- a/docs/collect-sections.py
+++ b/docs/collect-sections.py
@@ -9,7 +9,7 @@ from pathlib import Path
__all__ = ["get_docs_section"]
-DOCS_ROOT = "https://gnome.pages.gitlab.gnome.org/blueprint-compiler"
+DOCS_ROOT = "https://jwestman.pages.gitlab.gnome.org/blueprint-compiler"
sections: dict[str, "Section"] = {}
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 8081c8d..86112cf 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
"sources": [
{
"type": "git",
- "url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",
+ "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
"tag": "v0.16.0"
}
]
diff --git a/docs/index.rst b/docs/index.rst
index 6cd130f..a71b968 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -59,7 +59,7 @@ Features
Links
-----
-- `Source code `_
+- `Source code `_
- `Workbench `_ lets you try, preview and export Blueprint
- `GNOME Builder `_ provides builtin support
- `Vim syntax highlighting plugin by thetek42 `_
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 2fd5dbb..0961d14 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -10,7 +10,7 @@ Properties are the main way to set values on objects, but they are limited by th
Extensions are a feature of ``Gtk.Buildable``--see `Gtk.Buildable.custom_tag_start() `_ for internal details.
- Because they aren't part of the type system, they aren't present in typelib files like properties and signals are. Therefore, if a library adds a new extension, syntax for it must be added to Blueprint manually. If there's a commonly used extension that isn't supported by Blueprint, please `file an issue `_.
+ Because they aren't part of the type system, they aren't present in typelib files like properties and signals are. Therefore, if a library adds a new extension, syntax for it must be added to Blueprint manually. If there's a commonly used extension that isn't supported by Blueprint, please `file an issue `_.
.. rst-class:: grammar-block
diff --git a/docs/setup.rst b/docs/setup.rst
index 914c753..839f8f6 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -8,7 +8,7 @@ Setting up Blueprint on a new or existing project
Using the porting tool
~~~~~~~~~~~~~~~~~~~~~~
-Clone `blueprint-compiler `_
+Clone `blueprint-compiler `_
from source. You can install it using ``meson _build`` and ``ninja -C _build install``,
or you can leave it uninstalled.
@@ -29,7 +29,7 @@ blueprint-compiler works as a meson subproject.
[wrap-git]
directory = blueprint-compiler
- url = https://gitlab.gnome.org/GNOME/blueprint-compiler.git
+ url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
revision = main
depth = 1
diff --git a/tests/samples/issue_187.ui b/tests/samples/issue_187.ui
deleted file mode 100644
index 941a00f..0000000
--- a/tests/samples/issue_187.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/samples/issue_187_dec.blp b/tests/samples/issue_187_dec.blp
deleted file mode 100644
index 30b997c..0000000
--- a/tests/samples/issue_187_dec.blp
+++ /dev/null
@@ -1,7 +0,0 @@
-using Gtk 4.0;
-
-template ListItem {
- child: Label {
- label: bind template.item as <$RecentObject>.filename;
- };
-}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index f96d0eb..1f56eb6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -181,7 +181,11 @@ class TestSamples(unittest.TestCase):
def test_samples(self):
# list the samples directory
- samples = [f.stem for f in Path(__file__).parent.glob("samples/*.blp")]
+ samples = [
+ f.stem
+ for f in Path(__file__).parent.glob("samples/*.blp")
+ if not f.stem.endswith("_dec")
+ ]
samples.sort()
for sample in samples:
REQUIRE_ADW_1_4 = ["adw_breakpoint"]
@@ -211,7 +215,7 @@ class TestSamples(unittest.TestCase):
]
# Decompiler-only tests
- SKIP_COMPILE = ["issue_177", "issue_187", "translator_comments"]
+ SKIP_COMPILE = ["issue_177", "translator_comments"]
SKIP_DECOMPILE = [
# Comments are not preserved in either direction
@@ -224,7 +228,7 @@ class TestSamples(unittest.TestCase):
continue
with self.subTest(sample):
- if sample not in SKIP_COMPILE and not sample.endswith("_dec"):
+ if sample not in SKIP_COMPILE:
self.assert_sample(sample, skip_run=sample in SKIP_RUN)
with self.subTest("decompile/" + sample):
diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
index ad5f828..2bca595 100644
--- a/tests/test_tokenizer.py
+++ b/tests/test_tokenizer.py
@@ -25,7 +25,7 @@ from blueprintcompiler.tokenizer import Token, TokenType, tokenize
class TestTokenizer(unittest.TestCase):
- def assert_tokenize(self, string: str, expect: list[Token]):
+ def assert_tokenize(self, string: str, expect: [Token]):
try:
tokens = tokenize(string)
self.assertEqual(len(tokens), len(expect))