linked-data-python 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

ldpy/lsp/islanddoc.py

@@ -134,7 +134,9 @@ ISLANDS = {
         "A SPARQL query or update, parsed when the file is transpiled rather "
         "than at run time. `{expr}` in term position becomes an initial "
         "binding — never string pasting, so nothing here can be injected. "
-        "Call it on a graph to run it; `.execute()` runs an update.",
+        "Calling it on a graph gives a LAZY query; `.execute()` is what "
+        "forces it — for an update, and for any query whose rdflib `Result` "
+        "you then call a method on.",
         _QUERY, "s-a-sparql-query"),
 
     # -- terms --------------------------------------------------------------
@@ -169,10 +171,10 @@ ISLANDS = {
 
     "firi": IslandDoc(
         "(term) f<...{expr}...> -> URIRef",
-        "A formatted IRI: the braces interpolate as in an f-string, the "
-        "result is percent-encoded and then resolved against `@base`. "
-        "Encoding first is what keeps a space or a slash in a value from "
-        "changing the IRI's structure.",
+        "A formatted IRI: the braces interpolate as in an f-string, and the "
+        "result is resolved against `@base` if it is relative. It does NOT "
+        "percent-encode — the shape of the IRI is yours. To mint one from "
+        "data that may hold a space or a slash, use `e<...>`, which encodes.",
         _TERMS, "formatted-iris-f"),
 
     "fnode": IslandDoc(
@@ -202,7 +204,9 @@ ISLANDS = {
     "eiri": IslandDoc(
         "(expression) e<...{?var}...> -> Expr",
         "A deferred IRI: `f<...>`'s interpolation, except that the holes are "
-        "SPARQL expressions re-evaluated for each set of bindings.",
+        "SPARQL expressions re-evaluated for each set of bindings — and that "
+        "it percent-encodes what it interpolates. This is the form for "
+        "minting an IRI from a data column.",
         _SPARQL_EXPR, "deferred-iris-e"),
 }
 

ldpy/transpiler/core.py

@@ -592,6 +592,40 @@ class Transpiler:
     # chaînes et littéraux RDF
     # ------------------------------------------------------------------
 
+    # Island sigils that open with a brace or a chevron.  A hole beginning
+    # with one of these is an island the scanner will never reach.
+    _HOLE_ISLANDS = ("_:{", "g{", "m{", "s{", "e{", "e<", "f{", "f<", "?{")
+
+    def _island_in_fstring_hole(self, tok_start, end):
+        """The island opener written inside an f-string hole, or None.
+
+        The scanner does not descend into f-string interpolation holes: an
+        island written there would be copied verbatim into the generated
+        Python, which then fails with a message from CPython's f-string
+        parser that names nothing (record ldpy/012). Refusing it here, by
+        name, costs one scan of the token and turns a baffling failure into
+        an actionable one.
+        """
+        tok = self.text[tok_start:end]
+        if "f" not in tok[:3].lower() or "{" not in tok:
+            return None
+        i, n = 0, len(tok)
+        while i < n:
+            if tok[i] != "{":
+                i += 1
+                continue
+            if tok[i + 1:i + 2] == "{":         # '{{' is an escaped brace
+                i += 2
+                continue
+            j = i + 1
+            while j < n and tok[j] in " \t":
+                j += 1
+            for opener in self._HOLE_ISLANDS:
+                if tok.startswith(opener, j):
+                    return opener
+            i += 1
+        return None
+
     def _handle_string(self, start, prefix_start=None):
         """start : indice du guillemet. prefix_start : indice du préfixe de
         chaîne (r/b/f/u) déjà repéré, sinon None."""
@@ -607,6 +641,12 @@ class Transpiler:
         if suffix is None and t[end:end + 2] == "^^":
             suffix = ("datatype", None, end + 2)
         if suffix is None:
+            opener = self._island_in_fstring_hole(tok_start, end)
+            if opener is not None:
+                self._error(
+                    "îlot '%s' dans un trou d'f-string : le scanner n'y "
+                    "descend pas. Sortez la lecture dans une variable "
+                    "au-dessus de l'f-string." % opener)
             self._copy(end - self.i)
             self.operand = False
             self.stmt_start = False
@@ -2124,6 +2164,14 @@ class Transpiler:
             elif c in "\"'":
                 end = self._string_end(self.i)
                 pieces.append(self._take(end - self.i))
+            elif c == "<" and self._iriref_end(self.i) is not None:
+                # A full IRI is a token, not punctuation: its '#' is part of
+                # the IRI, not a comment. Without this the fragment of
+                # <http://example.org/ns#X> — the most ordinary shape an IRI
+                # takes in RDF — swallowed the rest of the line, closing
+                # brace included. `<` that does NOT open an IRI is SPARQL's
+                # less-than, and falls through to the single-character case.
+                pieces.append(self._take(self._iriref_end(self.i) - self.i))
             elif c == "#":
                 j = t.find("\n", self.i)
                 pieces.append(self._take((j if j != -1 else self.n) - self.i))

{linked_data_python-0.6.0.dist-info → linked_data_python-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linked-data-python
-Version: 0.6.0
+Version: 0.6.2
 Summary: Python extended with Semantic Web primitives: IRIs, RDF literals and Turtle-notation graphs as expressions, transpiled by island parsing.
 Author-email: Maxime Lefrançois <maxime.lefrancois@emse.fr>
 License: MIT

{linked_data_python-0.6.0.dist-info → linked_data_python-0.6.2.dist-info}/RECORD

@@ -13,17 +13,17 @@ ldpy/lsp/__init__.py,sha256=rK5GYOITi9PN09-WVlJ2aPKodW8dWTpgI_X6dFbP1zA,542
 ldpy/lsp/__main__.py,sha256=MIp4ktqaoWZCNIMfv14bSC9pqK86JBS5XVjd1Z3c24o,72
 ldpy/lsp/backend.py,sha256=8DnSGaBk1dsIMOBo7D1WQxxF3MZjJbYd78jp4ucWORY,5375
 ldpy/lsp/hover.py,sha256=zSJ0PpU3kTJDXcwI2zSDCbsKrT-eNTt2RlvmEPRoV-M,2407
-ldpy/lsp/islanddoc.py,sha256=vxxRKEcywBH31c8XgykEoC8fZfvbHok1NH-rPc-0Sy0,9540
+ldpy/lsp/islanddoc.py,sha256=mBiBcaaswH3cVNSeh_h9DV8c5RaWIASxOnVS13g9KiI,9843
 ldpy/lsp/rpc.py,sha256=-TF_9U8dum23Pi4O1FZLogwoZgrGrt14J5BFB1OYVZw,3554
 ldpy/lsp/server.py,sha256=PAMMookGUn00vAW_-a5BGy3qkVe9PoUdfzAzpdlvoF8,16359
 ldpy/lsp/translate.py,sha256=HU9fBP_xWyYLih6QwQfSoyfF-MH-oInFcPX3o8Vc2GI,6116
 ldpy/transpiler/__init__.py,sha256=9mQx0e47ixz0iMqSbCBbtGiwJ7PLxTcsVSIp6KNTMG4,504
-ldpy/transpiler/core.py,sha256=LaZT8hE4jocIcTLyb2kc_mFtwu8QTSm0FhOMNetY_2k,114831
+ldpy/transpiler/core.py,sha256=BnEm2qf9u2HC998OJ9iKFksE5eoPtG96Bd3ao9Si7H4,117145
 ldpy/transpiler/errors.py,sha256=zEEwsNvC2Tawq8jIYls7hrbcWSvQtd7eo89k_SKp0k0,1142
 ldpy/transpiler/linemap.py,sha256=ecLlCUkD4-6QQtUjGfAL28ql7LPITTS4fjLcDIbAwpQ,11386
-linked_data_python-0.6.0.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
-linked_data_python-0.6.0.dist-info/METADATA,sha256=q7sq2gWlVV18IGg6zFfFYc9EPyuTuP50JwP1quO0ZAU,7974
-linked_data_python-0.6.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-linked_data_python-0.6.0.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
-linked_data_python-0.6.0.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
-linked_data_python-0.6.0.dist-info/RECORD,,
+linked_data_python-0.6.2.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
+linked_data_python-0.6.2.dist-info/METADATA,sha256=RhDkJ0IJ9BHjIQsxibF0Ln547zVLYPwsV9NTKyOddTM,7974
+linked_data_python-0.6.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+linked_data_python-0.6.2.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
+linked_data_python-0.6.2.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
+linked_data_python-0.6.2.dist-info/RECORD,,