Fix for class prefix walking, add node enum.

Signed-off-by: James Goppert <james.goppert@gmail.com>

Author: jgoppert

Cargo.lock

@@ -2,7 +2,7 @@
 name = "rumoca_parser"
 authors = ["James Goppert", "Benjamin Perseghetti"]
 description = "A Modelica parser leveraging LALRPOP"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 license = "Apache-2.0"
 

Cargo.toml

@@ -4,6 +4,88 @@ derive_alias! {
     #[derive(CommonTraits!)] = #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)];
 }
 
+#[derive(CommonTraits!, Default)]
+pub enum Node {
+    #[default]
+    Empty,
+    StoredDefinition(StoredDefinition),
+    ClassDefinition(ClassDefinition),
+    ClassSpecifier(ClassSpecifier),
+    CompositionPart(CompositionPart),
+    Element(Element),
+    ComponentDeclaration(ComponentDeclaration),
+    ClassPrefixes(ClassPrefixes),
+    ComponentClause(ComponentClause),
+    ComponentClause1(ComponentClause1),
+    Declaration(Declaration),
+    TypeSpecifier(TypeSpecifier),
+    Equation(Equation),
+    IfEquationBlock(IfEquationBlock),
+    Statement(Statement),
+    IfStatementBlock(IfStatementBlock),
+    Expression(Expression),
+    IfExpressionBlock(IfExpressionBlock),
+    ComponentReference(ComponentReference),
+    RefPart(RefPart),
+    Subscript(Subscript),
+    Argument(Argument),
+    Modification(Modification),
+    ModExpr(ModExpr),
+    Description(Description),
+    TypePrefix(TypePrefix),
+    ForIndex(ForIndex),
+    Span(Span),
+    ElementFlags(ElementFlags),
+    Causality(Causality),
+    Variability(Variability),
+    Visibility(Visibility),
+    Connection(Connection),
+    UnaryOp(UnaryOp),
+    BinaryOp(BinaryOp),
+    ClassType(ClassType),
+}
+
+#[derive(Default, Clone, Debug, PartialEq, Eq, Hash)]
+pub enum NodeRef<'a> {
+    #[default]
+    Empty,
+    StoredDefinition(& 'a StoredDefinition),
+    ClassDefinition(& 'a ClassDefinition),
+    ClassSpecifier(& 'a ClassSpecifier),
+    CompositionPart(& 'a CompositionPart),
+    Element(& 'a Element),
+    ComponentDeclaration(& 'a ComponentDeclaration),
+    ClassPrefixes(& 'a ClassPrefixes),
+    ComponentClause(& 'a ComponentClause),
+    ComponentClause1(& 'a ComponentClause1),
+    Declaration(& 'a Declaration),
+    TypeSpecifier(& 'a TypeSpecifier),
+    Equation(& 'a Equation),
+    IfEquationBlock(& 'a IfEquationBlock),
+    Statement(& 'a Statement),
+    IfStatementBlock(& 'a IfStatementBlock),
+    Expression(& 'a Expression),
+    IfExpressionBlock(& 'a IfExpressionBlock),
+    ComponentReference(& 'a ComponentReference),
+    RefPart(& 'a RefPart),
+    Subscript(& 'a Subscript),
+    Argument(& 'a Argument),
+    Modification(& 'a Modification),
+    ModExpr(& 'a ModExpr),
+    Description(& 'a Description),
+    TypePrefix(& 'a TypePrefix),
+    ForIndex(& 'a ForIndex),
+    Span(& 'a Span),
+    ElementFlags(& 'a ElementFlags),
+    Causality(& 'a Causality),
+    Variability(& 'a Variability),
+    Visibility(& 'a Visibility),
+    Connection(& 'a Connection),
+    UnaryOp(& 'a UnaryOp),
+    BinaryOp(& 'a BinaryOp),
+    ClassType(& 'a ClassType),
+}
+
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 // File Level Nodes
 

src/s1_parser/ast.rs

@@ -28,6 +28,7 @@ impl<'a> Visitable<'a> for ast::ClassDefinition {
     fn accept<V: Visitor<'a> + ?Sized>(&'a self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_class_definition(self);
+        self.prefixes.accept(visitor);
         self.specifier.accept(visitor);
         visitor.exit_class_definition(self);
         visitor.exit_any();

src/s2_analysis/visitable.rs

@@ -28,6 +28,7 @@ impl VisitableMut for ast::ClassDefinition {
     fn accept_mut<V: VisitorMut + ?Sized>(&mut self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_class_definition_mut(self);
+        self.prefixes.accept_mut(visitor);
         self.specifier.accept_mut(visitor);
         visitor.exit_class_definition_mut(self);
         visitor.exit_any();