more badness cases

Author: telmomenezes

src/hyperbase/cli/repl.py

@@ -270,6 +270,13 @@ class CommandCompleter(Completer):
     # command name.
     PATH_ARG_COMMANDS = frozenset({"load", "save", "count-csv", "classify"})
 
+    # Commands that take multiple path arguments. Unlike the single-arg
+    # case above (which feeds PathCompleter everything after the first
+    # space), these complete only the current word — the slice between
+    # the cursor and the previous space — so that successive paths can
+    # each be completed independently.
+    MULTI_PATH_ARG_COMMANDS = frozenset({"genparse"})
+
     def __init__(
         self,
         commands: dict,
@@ -295,6 +302,12 @@ def get_completions(
                 sub_doc = Document(text=arg, cursor_position=len(arg))
                 yield from self.path_completer.get_completions(sub_doc, complete_event)
                 return
+            if cmd_name in self.MULTI_PATH_ARG_COMMANDS:
+                last_space = text.rfind(" ")
+                word = text[last_space + 1 :]
+                sub_doc = Document(text=word, cursor_position=len(word))
+                yield from self.path_completer.get_completions(sub_doc, complete_event)
+                return
             if cmd_name == "set" and " " in arg:
                 setting_name, _, value = arg.partition(" ")
                 if setting_name in self.path_settings:

src/hyperbase/parsers/badness.py

@@ -29,11 +29,11 @@ def _visit(current_edge: Hyperedge) -> None:
             ars = current_edge.argroles()
             ar_counts: Counter[str] = Counter()
             for ar in ars:
-                if ar not in "masox?":
+                if ar not in "masox":
                     current_errors.append(
                         (
                             "bad-argrole",
-                            f"Bad argument role '{ar}'. Should be one of 'masox?'.",
+                            f"Bad argument role '{ar}'. Should be one of 'masox'.",
                             2,
                         )
                     )
@@ -46,7 +46,7 @@ def _visit(current_edge: Hyperedge) -> None:
             connector_type = current_edge[0].type()
             if len(current_edge) >= 2:
                 target_mt = current_edge[1].mt
-                if connector_type in {"Md", "Mq", "Mp"} and target_mt != "C":
+                if connector_type in {"Ma", "Md", "Mq", "Mp"} and target_mt != "C":
                     current_errors.append(
                         (
                             f"bad-{connector_type.lower()}-target",
@@ -64,6 +64,15 @@ def _visit(current_edge: Hyperedge) -> None:
                             3,
                         )
                     )
+                elif connector_type == "Mn" and target_mt not in {"C", "P"}:
+                    current_errors.append(
+                        (
+                            "bad-mn-target",
+                            "Modifiers of type 'Mn' should only be applied to "
+                            "concepts (type 'C') or predicates (type 'P').",
+                            3,
+                        )
+                    )
         except Exception:
             pass