dead code cleanup

Author: neta-elad

Makefile

@@ -28,6 +28,11 @@ coverage:
 	pytest --cov=pyconlang
 
 
+.PHONY: dead-code
+dead-code:
+	vulture pyconlang
+
+
 .PHONY: env
 env:
 	! [ -d .venv ] && python3 -m venv .venv || true

pyconlang/book/conlang/__init__.py

@@ -40,7 +40,6 @@ def __init__(self, translator: Translator) -> None:
         super().__init__()
 
         self.translator = translator
-        self.valid_cache = False
 
     def extendMarkdown(self, md: Markdown) -> None:
         md.registerExtension(self)

pyconlang/book/conlang/advanced_macros.py

@@ -5,16 +5,6 @@
 from .conlang_macro import ConlangMacro
 
 
-class ShortcutRomanizedMacro(ConlangMacro):
-    @classmethod
-    def expression(cls) -> str:
-        return rf"\[\[(?P<text>.+?)\]\]"
-
-    def map_match(self, match: re.Match[str]) -> str:
-        text = match.group("text")
-        return f"r[{text}]"
-
-
 class AdvancedMacro(ConlangMacro, metaclass=ABCMeta):
     @classmethod
     def expression(cls) -> str:

pyconlang/book/conlang/dictionary.py

@@ -5,7 +5,6 @@
 
 from ... import CHANGES_GLOB, CHANGES_PATH, LEXICON_GLOB, LEXICON_PATH
 from ...cache import path_cached_property
-from ...domain import DefaultFusion, Morpheme, Word
 from ...lexicon.domain import Entry
 from ...translate import Translator
 
@@ -98,6 +97,3 @@ def show_entry(self, entry: Entry) -> str:
             ", ".join(forms)
             + f" [ph({entry.form})] pr[{entry.form}] {entry.description()}"
         )
-
-    def form_to_morphemes(self, form: Word[DefaultFusion]) -> list[Morpheme]:
-        return self.translator.lexicon.resolve(form).leaves()

pyconlang/book/multi.py

@@ -18,7 +18,7 @@ def __init__(self, pattern: str) -> None:
     # have contradictory type annotations,
     # so we have to ignore type.
     def handleMatch(  # type: ignore
-        self, m: re.Match[str], data: Any
+        self, m: re.Match[str], _data: Any
     ) -> tuple[ElementTree.Element, int, int]:
         el = ElementTree.Element("span")
         el.text = m.group(2)

pyconlang/cache.py

@@ -136,7 +136,7 @@ def __init__(self, paths: list[AnyPath], func: Callable[[_C], _T]) -> None:
         self.attrname = None
         self.__doc__ = func.__doc__
 
-    def __set_name__(self, owner: _C, name: str) -> None:
+    def __set_name__(self, _owner: _C, name: str) -> None:
         if self.attrname is None:
             self.attrname = name
         elif name != self.attrname:
@@ -149,7 +149,7 @@ def __set_name__(self, owner: _C, name: str) -> None:
     def hidden_name(self) -> str:
         return f"__path_cached_func_{self.attrname}"
 
-    def __get__(self, instance: _C | None, owner: type[_C] | None = None) -> _T:
+    def __get__(self, instance: _C | None, _owner: type[_C] | None = None) -> _T:
         assert instance is not None
 
         if self.attrname is None:
@@ -244,9 +244,9 @@ def __enter__(self) -> Self:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        _exc_type: Optional[Type[BaseException]],
+        _exc_val: Optional[BaseException],
+        _exc_tb: Optional[TracebackType],
     ) -> bool:
         self.cache_path.parent.mkdir(parents=True, exist_ok=True)
         self.cache_path.write_bytes(

pyconlang/domain.py

@@ -203,12 +203,6 @@ def leaves(self) -> list[Compoundable]:
         return self.head.leaves() + self.tail.leaves()
 
 
-def default_compound(
-    head: "Word[DefaultFusion]", joiner: Joiner, tail: "Word[DefaultFusion]"
-) -> "Compound[DefaultFusion]":
-    return Compound(head, joiner, tail)
-
-
 Word = Component[Compoundable] | Compound[Compoundable]
 
 DefaultWord = Word[DefaultFusion]
@@ -283,7 +277,3 @@ def scope(self) -> Scope:
 
 
 DefaultSentence = Sentence[DefaultWord]
-
-
-def default_sentence(tags: Tags, words: list[DefaultWord]) -> DefaultSentence:
-    return Sentence(tags, words)

pyconlang/evolve/__init__.py

@@ -61,7 +61,6 @@ class Evolver:
     query_cache: PersistentDict[tuple[Path, Query], Evolved]
     trace_cache: PersistentDict[tuple[Path, Query], list[TraceLine]]
     batcher: Batcher = field(default_factory=Batcher)
-    clients: dict[Path, LexurgyClient] = field(default_factory=dict)
 
     @classmethod
     @contextmanager

pyconlang/lexicon/__init__.py

@@ -266,7 +266,7 @@ def extend_with_affix(
                             self.resolve(definition.get_form(), scope),
                         )
 
-    def substitute(
+    def substitute(  # todo: remove?
         self, var: Var, form: DefaultWord, scope: Scope = Scope()
     ) -> ResolvedForm:
         return self.extend_with_affixes(
@@ -283,12 +283,6 @@ def get_vars(self, name: TemplateName | None) -> tuple[Var, ...]:
 
             raise MissingTemplate(name.name)
 
-    def resolve_entry(self, entry: Entry) -> list[ResolvedForm]:
-        return [
-            self.substitute(var, entry.form, entry.tags.scope)
-            for var in self.get_vars(entry.template)
-        ]
-
     def form(self, record: Definable, scope: Scope = Scope()) -> DefaultWord:
         match record:
             case Prefix() | Suffix():
@@ -297,11 +291,6 @@ def form(self, record: Definable, scope: Scope = Scope()) -> DefaultWord:
             case Lexeme():
                 return self.get_entry(record, scope).form
 
-    def resolve_definable(
-        self, record: Definable, scope: Scope = Scope()
-    ) -> ResolvedForm:
-        return self.resolve(self.form(record, scope), scope)
-
     def define(self, record: Definable, scope: Scope = Scope()) -> str:
         match record:
             case Prefix() | Suffix():

pyconlang/lexicon/domain.py

@@ -58,10 +58,6 @@ class Template:
     tags: Tags
     vars: tuple[Var, ...]
 
-    @classmethod
-    def from_args(cls, name: TemplateName, tags: Tags, *var_args: Var) -> "Template":
-        return cls(name, tags, var_args)
-
 
 @dataclass(eq=True, frozen=True)
 class Entry: