linked-data-python 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

ldpy/console.py

@@ -70,6 +70,12 @@ class LdpyConsole(code.InteractiveConsole):
         self._prefixes = dict(prefixes or {})
         self._prefix_cols = {k: 0 for k in self._prefixes}
         self._base = base
+        # The current graph and the current bindings are declarations too:
+        # like @prefix, a top-level @graph must survive to the next entry
+        # (otherwise `+{ ... }` after `@graph as g` sees no graph at all).
+        self._graph_var = None
+        self._bindings_var = None
+        self._counter = 0
 
     def runsource(self, source, filename=None, symbol="single"):
         """Transpile then compile one entry; True = incomplete entry
@@ -79,6 +85,10 @@ class LdpyConsole(code.InteractiveConsole):
         t.prefixes = dict(self._prefixes)
         t._prefix_col = dict(self._prefix_cols)
         t.base = self._base
+        t._graph_var = self._graph_var
+        t._bindings_var = self._bindings_var
+        # fresh names must not collide with those of the previous entries
+        t._ns_counter = self._counter
         try:
             result = t.run()
         except LdpySyntaxError as e:
@@ -98,6 +108,9 @@ class LdpyConsole(code.InteractiveConsole):
         self._prefixes = dict(t.prefixes)
         self._prefix_cols = dict(t._prefix_col)
         self._base = t.base
+        self._graph_var = t._graph_var
+        self._bindings_var = t._bindings_var
+        self._counter = t._ns_counter
         for w in result.warnings:
             self.write(str(w) + "\n")
         self.runcode(code_obj)

ldpy/debug.py

@@ -92,11 +92,30 @@ def probe():
 #: re-exported: debug tooling looks for them here (pure functions, defined
 #: alongside the map in ldpy/transpiler/linemap.py)
 __all__ = ["stepping_rules", "probe", "package_dir", "load_map",
+           "shadow_rel",
            "translate_breakpoints", "translate_frames",
            "snap_breakpoint_line", "snap_breakpoint_lines",
            "run_direct", "main"]
 
 
+def shadow_rel(source, root=None):
+    """Path of the shadow inside the output directory.
+
+    Without a root, the basename: the shadow sits beside the source, and two
+    files never meet. With one — a workspace whose whole build is gathered in
+    a single directory — the tree is mirrored, which is what keeps `a/m.ldpy`
+    and `b/m.ldpy` from writing the same `m.py`. A source outside the root
+    falls back to its basename rather than climbing out of the output
+    directory with `../`."""
+    name = os.path.basename(source)
+    if not root:
+        return name
+    rel = os.path.relpath(os.path.abspath(source), os.path.abspath(root))
+    if rel.startswith(os.pardir + os.sep) or rel == os.pardir:
+        return name
+    return rel
+
+
 def load_map(map_path):
     """Load a LanguageMap from a .ldpy.map file (JSON)."""
     with open(map_path, "r", encoding="utf-8") as f:
@@ -167,6 +186,10 @@ def main(argv=None):
                              "straight in the .ldpy)")
     parser.add_argument("-o", "--out", default=DEFAULT_OUT,
                         help="shadow directory (default: %(default)s)")
+    parser.add_argument("--root", metavar="DIR",
+                        help="tree root the shadow mirrors: the .py is "
+                             "written at OUT/<path of the source relative "
+                             "to DIR> (default: OUT/<basename>)")
     parser.add_argument("--listen", metavar="HOTE:PORT",
                         help="start debugpy listening (e.g. 127.0.0.1:5678)")
     parser.add_argument("--wait-for-client", action="store_true",
@@ -201,8 +224,7 @@ def main(argv=None):
 
     try:
         py_path, map_path, result = build_file(
-            args.source, args.out,
-            rel=os.path.basename(args.source))
+            args.source, args.out, rel=shadow_rel(args.source, args.root))
     except LdpySyntaxError as e:
         print(str(e), file=sys.stderr)
         return 1

ldpy/runtime.py

@@ -641,7 +641,6 @@ def add_to(graph, *triples, bindings=None):
         s2, p2, o2 = term(s), term(p), term(o)
         if s2 is not None and p2 is not None and o2 is not None:
             graph.add((s2, p2, o2))
-    return graph
 
 
 def remove_from(graph, *patterns, bindings=None):
@@ -665,13 +664,12 @@ def remove_from(graph, *patterns, bindings=None):
                     to_remove.add(inst)
         for tr in to_remove:
             graph.remove(tr)
-        return graph
+        return
     term = _materializer(bindings, keep_vars=True)
     for s, p, o in patterns:
         tr = tuple(None if isinstance(x, (Variable, bn)) else x
                    for x in (term(s), term(p), term(o)))
         graph.remove(tr)
-    return graph
 
 
 def graph(namespaces, base, *triples, bindings=None):

ldpy/transpiler/core.py

@@ -345,13 +345,16 @@ class Transpiler:
         self.operand = False
         self.stmt_start = False
 
-    def _error(self, msg, line=None, col=None):
+    def _error(self, msg, line=None, col=None, incomplete=True):
         exc = LdpySyntaxError(msg, self.filename,
                               self.src_line if line is None else line,
                               self.src_col if col is None else col)
         # la console s'en sert pour distinguer « entrée incomplète » (îlot
-        # non fermé en fin de tampon) d'une vraie erreur de syntaxe
-        exc.at_eof = self.i >= self.n
+        # non fermé en fin de tampon) d'une vraie erreur de syntaxe.
+        # `incomplete=False` : erreur qu'une suite d'entrée ne répare pas
+        # (elle porte sur ce qui a déjà été lu), même si le curseur est en
+        # fin de tampon — sinon la console attendrait indéfiniment.
+        exc.at_eof = incomplete and self.i >= self.n
         raise exc
 
     def _warn(self, msg):
@@ -675,7 +678,7 @@ class Transpiler:
             if re.match(r"@(prefix|base|graph|bindings)\b", t[j:j + 10]):
                 self._close_copy()
                 self._take(m.end() - self.i)        # le mot-clé
-                while self._peek() in " \t":
+                while self._peek() in (" ", "\t"):
                     self._take(1)
                 if not self._try_prefix_or_base(scope_mode=name):
                     self._error("déclaration d'îlot attendue après "
@@ -1388,7 +1391,8 @@ class Transpiler:
             if not encl:
                 what = "prefix %s:" % name if kind == "prefix" else kind
                 self._error("nonlocal @%s : aucune déclaration englobante "
-                            "(comme le nonlocal de Python)" % what)
+                            "(comme le nonlocal de Python)" % what,
+                            incomplete=False)
             keep = encl[-1]
             target_col = self._scope_stack[keep][0]
             touched = [i for i in matches if i > keep]
@@ -1562,7 +1566,7 @@ class Transpiler:
         return self._take(m.end() - self.i)
 
     def _graph_ws_inline(self):
-        while self._peek() in " \t":
+        while self._peek() in (" ", "\t"):
             self._take(1)
 
     def _addremove_island(self, sign):
@@ -1581,7 +1585,7 @@ class Transpiler:
             self._error("'%s{ ... }' sans graphe courant : déclarez-le avec "
                         "'@graph <expression>' ou '@graph as g' (fiche 014), "
                         "ou donnez-le en suffixe — %s{ ... }(g)"
-                        % (sign, sign))
+                        % (sign, sign), incomplete=False)
         bvar = sfx_bindings if sfx_bindings else self._bindings_var
         fn = "add_to" if sign == "+" else "remove_from"
         args = [gvar]
@@ -2482,7 +2486,7 @@ class Transpiler:
             if word.upper() == "BOUND" and after == "(":
                 self._take(len(word) + 1)
                 self._e_ws()
-                if self._peek() not in "?$":
+                if self._peek() not in ("?", "$"):
                     self._error("BOUND attend une variable ?v")
                 self._take(1)
                 vm = _NAME_RE.match(t, self.i)

{linked_data_python-0.5.1.dist-info → linked_data_python-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linked-data-python
-Version: 0.5.1
+Version: 0.5.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.5.1.dist-info → linked_data_python-0.5.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ldpy/__init__.py,sha256=IyuzHrp5OtuGO_NrrdmMUQW6bTYcyS5uob7CeoXg8mY,1943
 ldpy/__main__.py,sha256=YKTEjmNQuh_0p-KiEus9HngFs_ZDmS56RXzHTspiWVI,3077
 ldpy/build.py,sha256=495F9KyFMar-hTCuaQkF3FvzWQX4mE9H0U0V-JuRDmA,3394
-ldpy/console.py,sha256=1FrroxoTTWG7fIBzaDQvOxPGj6NkyXJDJhhl5RXyE_0,4204
-ldpy/debug.py,sha256=5o8oVYIbFk6rB9-ShTIfym_bhVG3imTw_l0taJZ9qH0,9462
+ldpy/console.py,sha256=vMSnFFoOIOcanw6_niNxqgrt-F4gzMOrD1GopkXru5s,4837
+ldpy/debug.py,sha256=JUuzeKc8ya4SG30AxaUVeihTEbzySo1cS0sU0s78Mv0,10493
 ldpy/formatter.py,sha256=VaDPECxhivsMe8jnX_fOL7BUyLEu5r4xREdr4Hav-0c,12695
 ldpy/importer.py,sha256=QXAhSujPN6rFMJSQuj0UsWyI4CajirKt1SOrykJ_fUw,3670
 ldpy/pygments_lexer.py,sha256=mcQ0u9nZjLnSWpqzcxd6bZjk69LfKSNTsf9A3rqfhhk,25320
-ldpy/runtime.py,sha256=2xugLVjgtbay9GAsC_QGVFBeaXSRbja7xEkl2ZbYDQ4,36040
+ldpy/runtime.py,sha256=InXxP1kwxrtozYZAqW6J-fmmUYiI_ykFswvZ_mK5TTY,36000
 ldpy/sparql.py,sha256=CHSB4v5lEuVQKRPuwcM8xI3jN2FVHkmPVb675QkAD9Y,14770
 ldpy/lsp/__init__.py,sha256=rK5GYOITi9PN09-WVlJ2aPKodW8dWTpgI_X6dFbP1zA,542
 ldpy/lsp/__main__.py,sha256=MIp4ktqaoWZCNIMfv14bSC9pqK86JBS5XVjd1Z3c24o,72
@@ -17,12 +17,12 @@ 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=4_YXbLLdtZfRTLb3ySprsnS_LXqiGfxZXqZvnXWT5T8,113482
+ldpy/transpiler/core.py,sha256=XiRuq9YbFnvNiWo4kio0Rd5a6KsC4Om-1NIMIAbaK5M,113824
 ldpy/transpiler/errors.py,sha256=zEEwsNvC2Tawq8jIYls7hrbcWSvQtd7eo89k_SKp0k0,1142
 ldpy/transpiler/linemap.py,sha256=ecLlCUkD4-6QQtUjGfAL28ql7LPITTS4fjLcDIbAwpQ,11386
-linked_data_python-0.5.1.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
-linked_data_python-0.5.1.dist-info/METADATA,sha256=zC_1FxXgKCcqGYOcqNzUQkVVJ40m8HMKH-GzbMPsfWU,7974
-linked_data_python-0.5.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-linked_data_python-0.5.1.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
-linked_data_python-0.5.1.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
-linked_data_python-0.5.1.dist-info/RECORD,,
+linked_data_python-0.5.2.dist-info/licenses/LICENSE.md,sha256=R6KjQ098eAFd2k5mKaSRJqMH1LhY4o7xkHrKT5vjRfs,1074
+linked_data_python-0.5.2.dist-info/METADATA,sha256=6zP3Q2bhARECaLwSWW77SOhSE9mbmtqXzefvYM_zu_c,7974
+linked_data_python-0.5.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+linked_data_python-0.5.2.dist-info/entry_points.txt,sha256=n8Vs52oH81BrKOe1DNUvdFLSOlEufRMpK2waPFa6aYk,224
+linked_data_python-0.5.2.dist-info/top_level.txt,sha256=dkG_F4jYkh6CS6gdpQeV_gKW3yaJBvl1ukUu0zo2KA8,5
+linked_data_python-0.5.2.dist-info/RECORD,,