Change modport separator from . to :: #65

veryl-lang · Jan 16, 2023 · 1815d7a · 1815d7a
1 parent bdbc7b1
commit 1815d7a
Show file tree

Hide file tree

Showing 13 changed files with 2,596 additions and 3,922 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased](https://github.com/dalance/veryl/compare/v0.1.14...Unreleased) - ReleaseDate
 
+* [Changed] modport separator from `.` to `::`
+
 ## [v0.1.14](https://github.com/dalance/veryl/compare/v0.1.13...v0.1.14) - 2023-01-12
 
 ## [v0.1.13](https://github.com/dalance/veryl/compare/v0.1.12...v0.1.13) - 2023-01-10

diff --git a/crates/analyzer/src/symbol.rs b/crates/analyzer/src/symbol.rs
@@ -263,12 +263,6 @@ impl From<&syntax_tree::Type> for Type {
                 }
                 TypeKind::UserDefined(name)
             }
-            syntax_tree::TypeGroup::ModportIdentifier(x) => {
-                let x = &x.modport_identifier;
-                let interface = x.identifier.identifier_token.token.text;
-                let modport = x.identifier0.identifier_token.token.text;
-                TypeKind::Modport(interface, modport)
-            }
         };
         let mut width = Vec::new();
         for x in &value.type_list {

diff --git a/crates/emitter/src/aligner.rs b/crates/emitter/src/aligner.rs
@@ -335,7 +335,6 @@ impl VerylWalker for Aligner {
         match &*arg.type_group {
             TypeGroup::BuiltinType(x) => self.builtin_type(&x.builtin_type),
             TypeGroup::ScopedIdentifier(x) => self.scoped_identifier(&x.scoped_identifier),
-            TypeGroup::ModportIdentifier(x) => self.modport_identifier(&x.modport_identifier),
         };
         let loc = self.aligns[align_kind::TYPE].last_location;
         self.aligns[align_kind::TYPE].finish_item();

diff --git a/crates/emitter/src/emitter.rs b/crates/emitter/src/emitter.rs
@@ -22,6 +22,7 @@ pub struct Emitter {
     in_always_ff: bool,
     in_function: bool,
     in_generate: bool,
+    in_direction_modport: bool,
     reset_signal: Option<String>,
     default_block: Option<String>,
 }
@@ -44,6 +45,7 @@ impl Default for Emitter {
             in_always_ff: false,
             in_function: false,
             in_generate: false,
+            in_direction_modport: false,
             reset_signal: None,
             default_block: None,
         }
@@ -222,7 +224,6 @@ impl Emitter {
                 }
             }
             TypeGroup::ScopedIdentifier(x) => self.scoped_identifier(&x.scoped_identifier),
-            TypeGroup::ModportIdentifier(x) => self.modport_identifier(&x.modport_identifier),
         }
     }
 
@@ -239,7 +240,6 @@ impl Emitter {
                 BuiltinType::F64(_) => true,
             },
             TypeGroup::ScopedIdentifier(_) => true,
-            TypeGroup::ModportIdentifier(_) => true,
         };
         if width {
             self.space(1);
@@ -274,6 +274,19 @@ impl VerylWalker for Emitter {
         self.token(arg);
     }
 
+    /// Semantic action for non-terminal 'ScopedIdentifier'
+    fn scoped_identifier(&mut self, arg: &ScopedIdentifier) {
+        self.identifier(&arg.identifier);
+        for x in &arg.scoped_identifier_list {
+            if self.in_direction_modport {
+                self.str(".");
+            } else {
+                self.colon_colon(&x.colon_colon);
+            }
+            self.identifier(&x.identifier);
+        }
+    }
+
     /// Semantic action for non-terminal 'Expression'
     fn expression(&mut self, arg: &Expression) {
         self.expression01(&arg.expression01);
@@ -1258,13 +1271,15 @@ impl VerylWalker for Emitter {
             PortDeclarationItemGroup::DirectionType(x) => {
                 self.direction(&x.direction);
                 if let Direction::Modport(_) = *x.direction {
+                    self.in_direction_modport = true;
                 } else {
                     self.space(1);
                 }
                 self.r#type_left(&x.r#type);
                 self.space(1);
                 self.identifier(&arg.identifier);
                 self.r#type_right(&x.r#type);
+                self.in_direction_modport = false;
             }
             PortDeclarationItemGroup::Interface(x) => {
                 self.interface(&x.interface);

diff --git a/crates/formatter/src/aligner.rs b/crates/formatter/src/aligner.rs
@@ -345,7 +345,6 @@ impl VerylWalker for Aligner {
         match &*arg.type_group {
             TypeGroup::BuiltinType(x) => self.builtin_type(&x.builtin_type),
             TypeGroup::ScopedIdentifier(x) => self.scoped_identifier(&x.scoped_identifier),
-            TypeGroup::ModportIdentifier(x) => self.modport_identifier(&x.modport_identifier),
         };
         let loc = self.aligns[align_kind::TYPE].last_location;
         self.aligns[align_kind::TYPE].finish_item();

diff --git a/crates/formatter/src/formatter.rs b/crates/formatter/src/formatter.rs
@@ -431,7 +431,6 @@ impl VerylWalker for Formatter {
         match &*arg.type_group {
             TypeGroup::BuiltinType(x) => self.builtin_type(&x.builtin_type),
             TypeGroup::ScopedIdentifier(x) => self.scoped_identifier(&x.scoped_identifier),
-            TypeGroup::ModportIdentifier(x) => self.modport_identifier(&x.modport_identifier),
         };
         self.space(1);
         for x in &arg.type_list {

diff --git a/crates/parser/src/finder.rs b/crates/parser/src/finder.rs
@@ -73,21 +73,6 @@ impl VerylWalker for Finder {
         }
     }
 
-    /// Semantic action for non-terminal 'ModportIdentifier'
-    fn modport_identifier(&mut self, arg: &ModportIdentifier) {
-        self.hit = false;
-        self.in_group = true;
-        self.identifier(&arg.identifier);
-        self.in_group = false;
-        self.dot(&arg.dot);
-        self.in_group = true;
-        self.identifier(&arg.identifier0);
-        self.in_group = false;
-        if !self.hit {
-            self.token_group.clear();
-        }
-    }
-
     /// Semantic action for non-terminal 'ExpressionIdentifier'
     fn expression_identifier(&mut self, arg: &ExpressionIdentifier) {
         self.hit = false;