Commit: ecebad1e4f0787a4d5dff6b088de54bb282bcc8f - CCastle2 (hg)

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

Commit MetaInfo

• Revision: ecebad1e4f0787a4d5dff6b088de54bb282bcc8f (tree)
• Zeit: 2022-04-14 05:53:37
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Improved Design/Peg.puml: Oke but upside-down

Ändern Zusammenfassung

• modified: Design/Peg.puml
• modified: Makefile
• modified: castle/ast/peg.py

Diff

diff -r bd6054195c00 -r ecebad1e4f07 Design/Peg.puml
--- a/Design/Peg.puml	Mon Apr 11 21:36:29 2022 +0200
+++ b/Design/Peg.puml	Wed Apr 13 22:53:37 2022 +0200
@@ -1,81 +1,140 @@
 @startuml
+
 abstract AST_BASE {
   _parse_tree
-  start()
-  end()
+  position()
+  position_end()
+  serialize()
 }
 
+class ID {
+  name
+  validate_or_raise()
+}
+
+ID  =|> AST_BASE
+
 package Peg #0077ff {
 
 abstract PEG
-AST_BASE <|== PEG
+PEG ==|>   AST_BASE
 
-PEG      <|== NonTerminal
-PEG      <|== Terminal
-PEG      <|== Setting
-PEG      <|..... Markers
-Markers  <|== EOF
-annotation Markers
-annotation EOF
+package MixIns  #Gray {
 
+  class MixIn_value_attribute<MixIn> {
+  _value
+  value()
+  }
+
+  class MixIn_expr_attribute<MixIn> {
+  _expr
+  expr()
+  }
+
+  class MixIn_children_tuple<MixIn> {
+   _children :Tuple
+  __len__()
+  __getitem__()
+  __iter__()
+  }
+}
 
 
 abstract Terminal
-Terminal <|== StrTerm
-Terminal <|== RexExpTerm
+Terminal   ==|> PEG
+Terminal  ---|> MixIn_value_attribute
+StrTerm    ==|> Terminal
+RexExpTerm ==|> Terminal
+Number     ==|> Terminal
+
+abstract Markers #ORANGE
+Markers    ==|> PEG
+annotation EOF #ORANGE
+EOF 	   ==|> Markers
 
 abstract NonTerminal
-NonTerminal  <|== Grammar
-NonTerminal  <|== Rule
-NonTerminal  <|== Expression
-
-class Grammar {
-  rules
-  settings
-}
-Grammar --> "*" Rule : rules
-Grammar --> "*" Setting
-
-class Rule {
- name :ID
- peg_expression
-}
-Rule  -> "*" Expression
+NonTerminal ==|> PEG
+abstract Expression
+Expression  ==|> NonTerminal
 
 class Setting  {
  name  : ID
- value : ...
+ value
 }
+Setting ==|> PEG
+Setting ---> ID
 
-abstract Expression {
- subEexpression Or Terminal
+class Rule {
+  name  :ID
+  expr  :[] Expression
 }
-Expression -->  Terminal
-Expression -->  Expression
+Rule ==|> NonTerminal
+Rule ---> ID
+Rule ---> Expression
+
+interface Rules
+Rules     ==|> PEG
+Rules    ---|> MixIn_children_tuple
+
+ParseRules ==|> Rules
+Settings   ==|> Rules
 
 
-Expression <|== ManyExpression
-Expression <|== Group
-Expression <|== Sequence
-Expression <|== OrderedChoice
-Expression <|== Predicate
-
-abstract ManyExpression
-abstract Predicate
+class Grammar {
+  +all_rules    :Rules
+  -parse_rules  :ParseRules
+  -settings     :Settings
+}
+Grammar ==|> NonTerminal
 
-ManyExpression <== Optional
-ManyExpression <== OneOrMore
-ManyExpression <== ZeroOrMore
 
-Predicate <== AndPredicate
-Predicate <== NotPredicate
+abstract Group
+Group            ==|> Expression
+UnorderedGroup   ==|> Group
+UnorderedGroup  ---|> MixIn_expr_attribute
+abstract Quantity
+Quantity         ==|> Group
+Quantity        ---|> MixIn_expr_attribute
 
+Sequence         ==|> Expression
+Sequence        ---|> MixIn_children_tuple
+
+OrderedChoice    ==|> Expression
+OrderedChoice   ---|> MixIn_children_tuple
+
+'========================
+class Optional   << (?, #0077ff) >>
+Optional	 ==|> Quantity
+class ZeroOrMore << (*, #0077ff) >>
+ZeroOrMore	 ==|> Quantity
+class OneOrMore  << (+, #0077ff) >>
+OneOrMore	 ==|> Quantity
+
+abstract Predicate
+Predicate	 ==|> Expression
+Predicate       ---|> MixIn_expr_attribute
 class AndPredicate << (&, #0077ff) notconsuming >>
+AndPredicate     ==|> Predicate
 class NotPredicate << (! ,#0077ff) not consuming >>
+NotPredicate     ==|> Predicate
 
-class Optional   << (?, #0077ff) >>
-class OneOrMore  << (+, #0077ff) >>
-class ZeroOrMore << (*, #0077ff) >>
+
+
+
 
 }
 @enduml
+
+
+
+
+
+
+
+
+
+
+
+
+
+

diff -r bd6054195c00 -r ecebad1e4f07 Makefile
--- a/Makefile	Mon Apr 11 21:36:29 2022 +0200
+++ b/Makefile	Wed Apr 13 22:53:37 2022 +0200
@@ -1,6 +1,6 @@
 default: all
 
-all: demo test XXX missing
+all: demo test pyanalyse XXX missing
 
 missing: missing_visitor missing_serialization
 
@@ -42,3 +42,18 @@
 clean_caches:
 	find . -type d -name __pycache__    -print0 | xargs -0  rm -r
 	find . -type d -name .pytest_cache  -print0 | xargs -0  rm -r
+
+
+PYREVERSE_DIR=pyreversed
+PYREVERSE_FORMAT=svg
+PYREVERSE_OPTIONS=-kAmy
+PYREVERSE_PRJS= castle.readers castle.ast castle.writers castle
+
+pyanalyse: ${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 ;\
+		echo ".. done. Result-files:" ;\
+		ls -l ${PYREVERSE_DIR}/*$${P}.${PYREVERSE_FORMAT} ;\
+		echo;\
+	done

diff -r bd6054195c00 -r ecebad1e4f07 castle/ast/peg.py
--- a/castle/ast/peg.py	Mon Apr 11 21:36:29 2022 +0200
+++ b/castle/ast/peg.py	Wed Apr 13 22:53:37 2022 +0200
@@ -126,7 +126,6 @@
     """An expression with Quantification; like optional, or repetition. The subclasses defines which Quantification"""
 
 
-#class Sequence(MixIn_value_attribute, Expression):
 class Sequence(MixIn_children_tuple, Expression):
     """A sequence of expressions; can be of length=1"""
     # __init__ (see MixIn) sets self._children; assuming it is a list