integrated ; into toString method of Assign and Declare

leonardt · Jun 18, 2019 · 0b24e95 · 0b24e95
1 parent 2b22aeb
commit 0b24e95
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/verilogAST.cpp b/src/verilogAST.cpp
@@ -234,12 +234,12 @@ std::string ModuleInstantiation::toString() {
 }
 
 std::string Declaration::toString() {
-  return decl + " " + variant_to_string(value);
+  return decl + " " + variant_to_string(value) + ";";
 }
 
 std::string Assign::toString() {
   return prefix + variant_to_string(target) + " " + symbol + " " +
-         value->toString();
+         value->toString() + ";";
 }
 
 std::string Always::toString() {
@@ -258,7 +258,7 @@ std::string Always::toString() {
   for (auto statement : body) {
     always_str +=
         variant_to_string<BehavioralStatement *, Declaration *>(statement) +
-        ";\n";
+        "\n";
   }
 
   always_str += "end\n";

diff --git a/tests/basic.cpp b/tests/basic.cpp
@@ -236,35 +236,35 @@ TEST(BasicTests, TestModule) {
 TEST(BasicTests, TestDeclaration) {
   vAST::Identifier a("a");
   vAST::Wire wire(&a);
-  EXPECT_EQ(wire.toString(), "wire a");
+  EXPECT_EQ(wire.toString(), "wire a;");
 
   vAST::Reg reg(&a);
-  EXPECT_EQ(reg.toString(), "reg a");
+  EXPECT_EQ(reg.toString(), "reg a;");
 
   vAST::Identifier id("x");
   vAST::NumericLiteral n("0");
   vAST::Index index(&id, &n);
   vAST::Wire wire_index(&index);
-  EXPECT_EQ(wire_index.toString(), "wire x[32'd0]");
+  EXPECT_EQ(wire_index.toString(), "wire x[32'd0];");
 
   vAST::NumericLiteral high("31");
   vAST::NumericLiteral low("0");
   vAST::Slice slice(&id, &high, &low);
   vAST::Reg reg_slice(&slice);
-  EXPECT_EQ(reg_slice.toString(), "reg x[32'd31:32'd0]");
+  EXPECT_EQ(reg_slice.toString(), "reg x[32'd31:32'd0];");
 }
 
 TEST(BasicTests, TestAssign) {
   vAST::Identifier a("a");
   vAST::Identifier b("b");
   vAST::ContinuousAssign cont_assign(&a, &b);
-  EXPECT_EQ(cont_assign.toString(), "assign a = b");
+  EXPECT_EQ(cont_assign.toString(), "assign a = b;");
 
   vAST::BlockingAssign blocking_assign(&a, &b);
-  EXPECT_EQ(blocking_assign.toString(), "a = b");
+  EXPECT_EQ(blocking_assign.toString(), "a = b;");
 
   vAST::NonBlockingAssign non_blocking_assign(&a, &b);
-  EXPECT_EQ(non_blocking_assign.toString(), "a <= b");
+  EXPECT_EQ(non_blocking_assign.toString(), "a <= b;");
 }
 
 TEST(BasicTests, TestAlways) {