Commit: 984d76e4ac51198c89b933b705010167df0dc922 - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• Revisión: 984d76e4ac51198c89b933b705010167df0dc922 (tree)
• Tiempo: 2022-04-23 02:56:41
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Cleanup

Cambiar Resumen

• modified: Makefile
• modified: castle/readers/parser/__init__.py
• modified: pytst/readers/parser/general/test_file.py
• delete: pytst/writers/python/test_1_rules.py

Diferencia incremental

diff -r 9bdc9ed57eb6 -r 984d76e4ac51 Makefile
--- a/Makefile	Fri Apr 22 17:17:47 2022 +0200
+++ b/Makefile	Fri Apr 22 19:56:41 2022 +0200
@@ -48,9 +48,9 @@
 PYREVERSE_DIR=pyreversed
 PYREVERSE_FORMAT=svg
 PYREVERSE_OPTIONS=-kAmy
-PYREVERSE_PRJS= castle.readers castle.ast castle.writers castle
+PYREVERSE_PRJS= castle castle.readers castle.ast #castle.writers
 
-pyanalyse: ${PYREVERSE_DIR}
+pyanalyse pyreverse: ${PYREVERSE_DIR}
 	for P in ${PYREVERSE_PRJS}; do \
 		echo "PYANALYSE::" $$P "...";\
 		pyreverse -d ${PYREVERSE_DIR} -o ${PYREVERSE_FORMAT} ${PYREVERSE_OPTIONS} -p $$P --colorized --max-color-depth=42 -my $$P ;\

diff -r 9bdc9ed57eb6 -r 984d76e4ac51 castle/readers/parser/__init__.py
--- a/castle/readers/parser/__init__.py	Fri Apr 22 17:17:47 2022 +0200
+++ b/castle/readers/parser/__init__.py	Fri Apr 22 19:56:41 2022 +0200
@@ -16,38 +16,44 @@
 
 
 class PEGReader(BaseReader):
-    """File-Reader to read & parse files, using a PEG parser.
+    """File-Reader to read input-files and parse them using a PEG-parser.
 
-    When creating a :py:class:`PEGReader` a default value for the `language_def` & `comment_def` can be set (and/or can
-    be set when reading a file -- see py:func`parse`). This language_def & comment_def should defined using *Arpeggio*.
+    The ("programming") language --in which the input-files are written-- is defined once, by language- and (optionally)
+    comment-definitions (using a PEG). Also a ``visitor`` (a class) has to be specified; which translate the parse-tree
+    into an AST.  Then no ``comment_def`` is given, it is assumed either no comments are expected, or the
+    ``language_def`` will handle it.
+
+    After the language is defined, multiple (unrelated) files can be read/parsed -- each one is translated into an AST.
+
+    Note: the language/comment-definitions and visitor-class should defined using *Arpeggio*.
 
     Also, a :py:class:`visitor` (class) should be specified. (this can only be done once).
+    When creating a class the search-path `read_dirs` (to look for file-to-be-parsed) can be set.
 
-    When creating a class the search-path `read_dirs` (to look for file-to-be-parsed) can be set.
     """
 
-    def __init__(self, *, read_dirs: list[str]=[],
-                 language_def=None, comment_def=None, visitor:Callable=None,
+    def __init__(self, *, language_def=None, comment_def=None, visitor:Callable=None,
+                 read_dirs: list[str]=[],
                  **kwargs):
         super().__init__(read_dirs=read_dirs, **kwargs)
+        if language_def is None:
+            raise ValueError("The `language_def` is a mandatory parameter")
         if visitor is None:
             raise ValueError("visitor is a mandatory parameter")
+        self._language_def = language_def
+        self._comment_def = comment_def                                 # Can be None
         self._visitor = visitor
-        self.default_language_def = language_def
-        self.default_comment_def = comment_def
 
 
     def parse(self,  filename:str, *, language_def=None, comment_def=None):
         """Read & Parse a file"""
-        if not language_def: language_def = self.default_language_def
-        if not comment_def: comment_def = self.default_comment_def
         txt = self._read(filename)
-        ast = self._do_parse(txt, language_def, comment_def)
+        ast = self._do_parse(txt)
         return ast
 
 
-    def _do_parse(self, txt, language_def, comment_def):
-        parser = arpeggio.ParserPython(language_def=language_def, comment_def=comment_def)
+    def _do_parse(self, txt):
+        parser = arpeggio.ParserPython(language_def=self._language_def, comment_def=self._comment_def)
 
         pt = parser.parse(txt)
         logger.info(f"Reader:_do_parse::\t parse_tree: start={pt.position} end={pt.position_end}; len(txt)={len(txt)}")

diff -r 9bdc9ed57eb6 -r 984d76e4ac51 pytst/readers/parser/general/test_file.py
--- a/pytst/readers/parser/general/test_file.py	Fri Apr 22 17:17:47 2022 +0200
+++ b/pytst/readers/parser/general/test_file.py	Fri Apr 22 19:56:41 2022 +0200
@@ -6,12 +6,12 @@
 
 
 def test_file():
-    reader = PEGReader(read_dirs=('../../../demos/ThinOnion',
+    reader = PEGReader(language_def=grammar.peg_grammar,
+                       comment_def=grammar.comment,
+                       visitor=visitor.PegVisitor(),
+                       read_dirs=('../../../demos/ThinOnion',
                                   '../../.././demos/ThinOnion/grammar',
-                                  '../../.././pytst/readers/parser'),
-                       language_def=grammar.peg_grammar,
-                       comment_def=grammar.comment,
-                       visitor=visitor.PegVisitor())
+                                  '../../.././pytst/readers/parser'))
     ast = reader.parse('grammar.peg')
     # Remember: ast is a Grammar!!
 

diff -r 9bdc9ed57eb6 -r 984d76e4ac51 pytst/writers/python/test_1_rules.py
--- a/pytst/writers/python/test_1_rules.py	Fri Apr 22 17:17:47 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-import pytest
-
-from jinja2  import Template
-
-from castle.ast import grammar # To build the ATS
-
-
-
-def __test_simple_rule():
-    expected	= """def rule_crossref():\treturn ID"""
-    castle	= """rule_crossref	<- ID ;"""
-
-    ## Build the AST -- Ignoring the parse_tree
-    id_rn = grammar.ID(name="rule_crossref")
-    id_xr = grammar.ID(name="ID")
-