Merge pull request #1135 from taichi-ishitani/remove_trading_comma_fr…

…om_concacation Remove trailing comma from concatenation and array literal
veryl-lang · Dec 9, 2024 · b200061 · b200061
2 parents 3016778 + 48a2b51
commit b200061
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/crates/emitter/src/emitter.rs b/crates/emitter/src/emitter.rs
@@ -1419,9 +1419,6 @@ impl VerylWalker for Emitter {
             self.space(1);
             self.concatenation_item(&x.concatenation_item);
         }
-        if let Some(ref x) = arg.concatenation_list_opt {
-            self.comma(&x.comma);
-        }
     }
 
     /// Semantic action for non-terminal 'ConcatenationItem'
@@ -1446,9 +1443,6 @@ impl VerylWalker for Emitter {
             self.space(1);
             self.array_literal_item(&x.array_literal_item);
         }
-        if let Some(ref x) = arg.array_literal_list_opt {
-            self.comma(&x.comma);
-        }
     }
 
     /// Semantic action for non-terminal 'ArrayLiteralItem'

diff --git a/testcases/map/testcases/sv/18_concatenation.sv.map b/testcases/map/testcases/sv/18_concatenation.sv.map
diff --git a/testcases/map/testcases/sv/51_array_literal.sv.map b/testcases/map/testcases/sv/51_array_literal.sv.map
diff --git a/testcases/veryl/18_concatenation.veryl b/testcases/veryl/18_concatenation.veryl
@@ -3,6 +3,6 @@ module Module18 {
     var b: logic;
     let c: logic = 1;
 
-    assign a = {a[10:0], c};
+    assign a = {a[10:0], c,};
     assign b = {a[10:0] repeat 10, c repeat 4};
 }
diff --git a/testcases/veryl/51_array_literal.veryl b/testcases/veryl/51_array_literal.veryl
@@ -1,5 +1,5 @@
 module Module51 {
-    let _a: logic [2] = '{1, 1};
+    let _a: logic [2] = '{1, 1,};
     let _b: logic [2] = '{1 repeat 2};
     let _c: logic [2] = '{default: 1};
 }