Commit: 04371911620cb14d75d2b06dc1995c22ef5dc686 - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: 04371911620cb14d75d2b06dc1995c22ef5dc686 (tree)
• Hora: 2022-01-25 06:01:28
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

Added better logging &str-support

Mudança Sumário

• modified: castle/ast/_base.py
• modified: castle/ast/peg.py

Diff

diff -r ea1d00c39628 -r 04371911620c castle/ast/_base.py
--- a/castle/ast/_base.py	Sun Jan 23 21:30:13 2022 +0100
+++ b/castle/ast/_base.py	Mon Jan 24 22:01:28 2022 +0100
@@ -6,6 +6,16 @@
         super().__init__(**kwargs)
         self._parse_tree = parse_tree
 
+    def __str__(self): # mostly for debugging
+        return str(type(self).__name__) + "\n\t" + "\n\t".join(f'{n}\t{str(v)}:{type(v).__name__}' for n,v in self.__dict__.items() if n[0]!='_')
+
+    @staticmethod
+    def _typeName(x):
+        return type(x).__name__
+
+    def _valType(self, x):
+        return f'{x}:{self._typeName(x)}'
+        return type(x).__name__
 
     @property
     def position(self): return self._parse_tree.position
@@ -32,5 +42,9 @@
     def __init__(self, *, name, **kwargs):
         super().__init__(**kwargs)
         self.validate_or_raise(name)
+        if isinstance(name, ID):
+            name=name.name
         self.name=name
 
+    def __str__(self): # mostly for debugging
+        return self.name

diff -r ea1d00c39628 -r 04371911620c castle/ast/peg.py
--- a/castle/ast/peg.py	Sun Jan 23 21:30:13 2022 +0100
+++ b/castle/ast/peg.py	Mon Jan 24 22:01:28 2022 +0100
@@ -14,12 +14,12 @@
 
     def __init__(self, *, value=None, **kwargs):
         super().__init__(**kwargs)
-        logger.debug(f'{type(self).__name__}:: value:={value}:{type(value)}')
+        logger.debug(f'{self._typeName(self)}:: value:={value}:{self._typeName(value)}')
         self._value=value
 
     @property
     def value(self):
-        logger.debug(f'{type(self).__name__}:: @property={self._value}')
+        logger.debug(f'{self._typeName(self)}:: @property={self._value}')
         return self._value
 
 
@@ -78,12 +78,13 @@
     def __init__(self, *,
                  name: ID, expr:Expression=None,
                  **kwargs):
+        logger.debug(f'{self._typeName(self)}: name={self._valType(name)}, expr={self._valType(expr)}')
+        if expr:
+            logger.debug("\t" + "; ".join(f'{c}:{type(c)}' for c in expr))
         ID.validate_or_raise(name)
         super().__init__(**kwargs)
         self.name = name
         self.expr = expr
-        logger.debug(f'{type(self).__name__}:: expr:={expr}:{type(expr)}')
-        logger.debug("\t" + "; ".join(f'{c}:{type(c)}' for c in expr))
 
 
 class Rules(MixIn_children_as_tuple, PEG): pass
@@ -94,10 +95,10 @@
                  rules: Rules=None,
                  settings: Settings=None,
                  **kwargs):
+        logger.debug(f'{self._typeName(self)}:: kwargs={kwargs}')
         super().__init__(**kwargs)
         self.rules = rules
         self.settings = settings
-        logger.debug(f'{type(self).__name__}:: kwargs={kwargs}')
 
 
 class Group(Expression): pass                                           # abstract --  Note: Do not Group for  '(' ...')';  that's a Sequence!!