alteraparser 2.5.0__tar.gz → 2.5.2__tar.gz

{alteraparser-2.5.0 → alteraparser-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alteraparser
-Version: 2.5.0
+Version: 2.5.2
 Summary: Alteraparser is a library that provides functions to define a grammar that can be passed to a parser.
 Author: Thomas Bollmeier
 Author-email: Thomas Bollmeier <developer@thomas-bollmeier.de>

{alteraparser-2.5.0 → alteraparser-2.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alteraparser"
-version = "2.5.0"
+version = "2.5.2"
 authors = [
     { name = "Thomas Bollmeier", email = "developer@thomas-bollmeier.de" }
 ]

{alteraparser-2.5.0 → alteraparser-2.5.2}/src/alteraparser/ast_.py

@@ -137,7 +137,10 @@ class AstTransformer:
             transformed_child = self.transform(child)
             ast.children[idx] = transformed_child
 
-        return self._transformers[ast.name](ast) if ast.name in self._transformers else ast
+        saved_id = ast.id
+        transformed_ast = self._transformers[ast.name](ast) if ast.name in self._transformers else ast
+        transformed_ast.id = saved_id
+        return transformed_ast
 
 
 def transform_ast(ast_transformer: AstTransformer, ast_name: str):

{alteraparser-2.5.0 → alteraparser-2.5.2}/src/alteraparser/meta/cli.py

@@ -1,31 +1,13 @@
 from argparse import ArgumentParser
 from pathlib import Path
 import sys
-import tomllib
 
 from alteraparser.meta.codegen import generate_python_module_code
 
-
-def _read_project_version() -> str:
-    for parent in Path(__file__).resolve().parents:
-        pyproject = parent / "pyproject.toml"
-        if pyproject.exists():
-            content = pyproject.read_text(encoding="utf-8")
-            data = tomllib.loads(content)
-            return data["project"]["version"]
-    raise FileNotFoundError("pyproject.toml not found")
-
-
 def _create_argument_parser() -> ArgumentParser:
     parser = ArgumentParser(
         description="Generate Python parser code from an Alteraparser grammar."
     )
-    parser.add_argument(
-        "-v",
-        "--version",
-        action="version",
-        version=f"%(prog)s {_read_project_version()}",
-    )
     parser.add_argument(
         "infile",
         nargs="?",

{alteraparser-2.5.0 → alteraparser-2.5.2}/src/alteraparser/meta/codegen.py

@@ -80,7 +80,6 @@ class CodeGenerator:
         self._write_line(f"def create_{snake_name}_grammar() -> Grammar:")
         self._indent()
         self._write_line("grammar = Grammar()")
-        self._write_line(f"lg = {language_name}LexerGrammar()")
         self._write_line()
 
         grammar_printer = GrammarPrinter(self, keyword_map_inv)
@@ -237,15 +236,15 @@ class GrammarPrinter(AstWalker):
                 keyword = ast.value
                 token_type = self._keyword_map[keyword]
                 if not identifier:
-                    self._write_line(f"tok(lg.{token_type}){self._delim()} # <-- '{keyword}'")
+                    self._write_line(f"tok(\"{token_type}\"){self._delim()} # <-- '{keyword}'")
                 else:
-                    self._write_line(f"tok(lg.{token_type}, \"{identifier}\"){self._delim()} # <-- '{keyword}'")
+                    self._write_line(f"tok(\"{token_type}\", \"{identifier}\"){self._delim()} # <-- '{keyword}'")
             case "token_type":
                 token_type = ast.value
                 if not identifier:
-                    self._write_line(f"tok(lg.{token_type}){self._delim()}")
+                    self._write_line(f"tok(\"{token_type}\"){self._delim()}")
                 else:
-                    self._write_line(f"tok(lg.{token_type}, \"{identifier}\"){self._delim()}")
+                    self._write_line(f"tok(\"{token_type}\", \"{identifier}\"){self._delim()}")
 
     def on_exit(self, ast: Ast):
         if self._in_macro_def: