Remove ArraySubscripts, replace with Vec<Subscript>

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.8.0"
+version = "0.9.0"
 edition = "2021"
 license = "Apache-2.0"
 

Cargo.toml

@@ -40,7 +40,7 @@ pub enum ClassSpecifier {
     },
     Extends {
         name: String,
-        modification: Option<Vec<Argument>>,
+        modification: Vec<Argument>,
         description: Vec<String>,
         composition: Vec<CompositionPart>,
         name_end: String,
@@ -111,7 +111,7 @@ pub struct ClassPrefixes {
 pub struct ComponentClause {
     pub type_prefix: TypePrefix,
     pub type_specifier: TypeSpecifier,
-    pub array_subscripts: Option<ArraySubscripts>,
+    pub array_subscripts: Vec<Subscript>,
     pub components: Vec<ComponentDeclaration>,
 }
 
@@ -125,7 +125,7 @@ pub struct ComponentClause1 {
 #[derive(CommonTraits!, Default)]
 pub struct Declaration {
     pub name: String,
-    pub array_subscripts: Option<ArraySubscripts>,
+    pub array_subscripts: Vec<Subscript>,
     pub modification: Option<Modification>,
 }
 
@@ -265,12 +265,7 @@ pub struct ComponentReference {
 #[derive(CommonTraits!, Default)]
 pub struct RefPart {
     pub name: String,
-    pub array_subscripts: Option<ArraySubscripts>,
-}
-
-#[derive(CommonTraits!, Default)]
-pub struct ArraySubscripts {
-    pub sub: Vec<Subscript>,
+    pub array_subscripts: Vec<Subscript>,
 }
 
 #[derive(CommonTraits!, Default)]

src/s1_parser/ast.rs

@@ -255,7 +255,7 @@ pub LongClassSpecifier: ast::ClassSpecifier = {
     "end" <name_end: IDENT> => {
         ast::ClassSpecifier::Extends {
             name,
-            modification,
+            modification: modification.unwrap_or(Vec::new()),
             description,
             composition,
             name_end,
@@ -465,7 +465,7 @@ pub ComponentClause: ast::ComponentClause = {
         ast::ComponentClause {
             type_prefix,
             type_specifier,
-            array_subscripts,
+            array_subscripts: array_subscripts.unwrap_or(Vec::new()),
             components,
         }
     }
@@ -533,7 +533,7 @@ pub Declaration: ast::Declaration = {
     <modification:Modification?> => {
         ast::Declaration {
             name,
-            array_subscripts,
+            array_subscripts: array_subscripts.unwrap_or(Vec::new()),
             modification,
         }
     }
@@ -1202,7 +1202,7 @@ pub RefPart: ast::RefPart = {
     <name:IDENT> <array_subscripts:ArraySubscripts?> => {
         ast::RefPart {
             name,
-            array_subscripts,
+            array_subscripts: array_subscripts.unwrap_or(Vec::new()),
         }
     }
 }
@@ -1250,12 +1250,8 @@ pub FunctionCallArguments: Vec<ast::Expression> = {
 
 //✅ array-subscripts :
 //✅    "[" subscript { "," subscript } "]"
-pub ArraySubscripts: ast::ArraySubscripts = {
-    "[" <sub: SeparatedList<Subscript, ",">> "]" => {
-        ast::ArraySubscripts {
-            sub,
-        }
-    },
+pub ArraySubscripts: Vec<ast::Subscript> = {
+    "[" <sub: SeparatedList<Subscript, ",">> "]" => sub,
 }
 //✅ subscript :
 //✅    ":" | expression

src/s1_parser/modelica.lalrpop

@@ -49,10 +49,8 @@ impl<'a> Visitable<'a> for ast::ClassSpecifier {
                 composition,
                 ..
             } => {
-                if let Some(modifs) = modification {
-                    for modif in modifs.iter() {
-                        (*modif).accept(visitor);
-                    }
+                for modif in modification.iter() {
+                    (*modif).accept(visitor);
                 }
                 for part in composition.iter() {
                     part.accept(visitor);
@@ -169,8 +167,8 @@ impl<'a> Visitable<'a> for ast::ComponentClause {
         visitor.enter_component_clause(self);
         self.type_prefix.accept(visitor);
         self.type_specifier.accept(visitor);
-        if let Some(subs) = self.array_subscripts.as_ref() {
-            subs.accept(visitor);
+        for sub in self.array_subscripts.iter() {
+            sub.accept(visitor);
         }
         for comp in self.components.iter() {
             comp.accept(visitor);
@@ -196,8 +194,8 @@ impl<'a> Visitable<'a> for ast::Declaration {
     fn accept<V: Visitor<'a> + ?Sized>(&'a self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_declaration(self);
-        if let Some(subs) = self.array_subscripts.as_ref() {
-            subs.accept(visitor);
+        for sub in self.array_subscripts.iter() {
+            sub.accept(visitor);
         }
         if let Some(modif) = self.modification.as_ref() {
             modif.accept(visitor);
@@ -435,22 +433,10 @@ impl<'a> Visitable<'a> for ast::RefPart {
     fn accept<V: Visitor<'a> + ?Sized>(&'a self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_ref_part(self);
-        if let Some(subs) = self.array_subscripts.as_ref() {
-            subs.accept(visitor);
-        }
-        visitor.exit_ref_part(self);
-        visitor.exit_any();
-    }
-}
-
-impl<'a> Visitable<'a> for ast::ArraySubscripts {
-    fn accept<V: Visitor<'a> + ?Sized>(&'a self, visitor: &mut V) {
-        visitor.enter_any();
-        visitor.enter_array_subscripts(self);
-        for sub in self.sub.iter() {
+        for sub in self.array_subscripts.iter() {
             sub.accept(visitor);
         }
-        visitor.exit_array_subscripts(self);
+        visitor.exit_ref_part(self);
         visitor.exit_any();
     }
 }

src/s2_analysis/visitable.rs

@@ -49,10 +49,8 @@ impl VisitableMut for ast::ClassSpecifier {
                 composition,
                 ..
             } => {
-                if let Some(modifs) = modification {
-                    for modif in modifs.iter_mut() {
-                        (*modif).accept_mut(visitor);
-                    }
+                for modif in modification.iter_mut() {
+                    (*modif).accept_mut(visitor);
                 }
                 for part in composition.iter_mut() {
                     part.accept_mut(visitor);
@@ -169,8 +167,8 @@ impl VisitableMut for ast::ComponentClause {
         visitor.enter_component_clause_mut(self);
         self.type_prefix.accept_mut(visitor);
         self.type_specifier.accept_mut(visitor);
-        if let Some(subs) = self.array_subscripts.as_mut() {
-            subs.accept_mut(visitor);
+        for sub in self.array_subscripts.iter_mut() {
+            sub.accept_mut(visitor);
         }
         for comp in self.components.iter_mut() {
             comp.accept_mut(visitor);
@@ -196,8 +194,8 @@ impl VisitableMut for ast::Declaration {
     fn accept_mut<V: VisitorMut + ?Sized>(&mut self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_declaration_mut(self);
-        if let Some(subs) = self.array_subscripts.as_mut() {
-            subs.accept_mut(visitor);
+        for sub in self.array_subscripts.iter_mut() {
+            sub.accept_mut(visitor);
         }
         if let Some(modif) = self.modification.as_mut() {
             modif.accept_mut(visitor);
@@ -435,22 +433,10 @@ impl VisitableMut for ast::RefPart {
     fn accept_mut<V: VisitorMut + ?Sized>(&mut self, visitor: &mut V) {
         visitor.enter_any();
         visitor.enter_ref_part_mut(self);
-        if let Some(subs) = self.array_subscripts.as_mut() {
-            subs.accept_mut(visitor);
-        }
-        visitor.exit_ref_part_mut(self);
-        visitor.exit_any();
-    }
-}
-
-impl VisitableMut for ast::ArraySubscripts {
-    fn accept_mut<V: VisitorMut + ?Sized>(&mut self, visitor: &mut V) {
-        visitor.enter_any();
-        visitor.enter_array_subscripts_mut(self);
-        for sub in self.sub.iter_mut() {
+        for sub in self.array_subscripts.iter_mut() {
             sub.accept_mut(visitor);
         }
-        visitor.exit_array_subscripts_mut(self);
+        visitor.exit_ref_part_mut(self);
         visitor.exit_any();
     }
 }

src/s2_analysis/visitable_mut.rs

@@ -38,7 +38,6 @@ pub trait Visitor<'a> {
         IfExpressionBlock,
         ComponentReference,
         RefPart,
-        ArraySubscripts,
         Subscript,
         Argument,
         Modification,

src/s2_analysis/visitor.rs

@@ -38,7 +38,6 @@ pub trait VisitorMut {
         IfExpressionBlock,
         ComponentReference,
         RefPart,
-        ArraySubscripts,
         Subscript,
         Argument,
         Modification,