Merge faceff5 into 9becbee

leonardt · Jan 6, 2020 · 207c8df · 207c8df
2 parents 9becbee + faceff5
commit 207c8df
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/include/verilogAST.hpp b/include/verilogAST.hpp
@@ -304,9 +304,13 @@ class SingleLineComment : public StructuralStatement,
                           public BehavioralStatement {
  public:
   std::string value;
+  std::unique_ptr<Statement> statement;  // optional
 
-  SingleLineComment(std::string value) : value(value){};
-  std::string toString() { return "// " + value; };
+  SingleLineComment(std::string value)
+      : value(value), statement(std::unique_ptr<Statement>{}){};
+  SingleLineComment(std::string value, std::unique_ptr<Statement> statement)
+      : value(value), statement(std::move(statement)){};
+  std::string toString();
   ~SingleLineComment(){};
 };
 

diff --git a/src/verilogAST.cpp b/src/verilogAST.cpp
@@ -186,19 +186,19 @@ std::string BinaryOp::toString() {
   std::string lstr = left->toString();
   std::string rstr = right->toString();
   // TODO Precedence logic, for now we just insert parens if not symbol or num
-  if (dynamic_cast<Identifier*>(left.get())) {
-  } else if (dynamic_cast<NumericLiteral*>(left.get())) {
-  } else if (dynamic_cast<Index*>(left.get())) {
-  } else if (dynamic_cast<Slice*>(left.get())) {
+  if (dynamic_cast<Identifier *>(left.get())) {
+  } else if (dynamic_cast<NumericLiteral *>(left.get())) {
+  } else if (dynamic_cast<Index *>(left.get())) {
+  } else if (dynamic_cast<Slice *>(left.get())) {
   } else {
-      lstr = "(" + lstr + ")";
+    lstr = "(" + lstr + ")";
   }
-  if (dynamic_cast<Identifier*>(right.get())) {
-  } else if (dynamic_cast<NumericLiteral*>(right.get())) {
-  } else if (dynamic_cast<Index*>(right.get())) {
-  } else if (dynamic_cast<Slice*>(right.get())) {
+  if (dynamic_cast<Identifier *>(right.get())) {
+  } else if (dynamic_cast<NumericLiteral *>(right.get())) {
+  } else if (dynamic_cast<Index *>(right.get())) {
+  } else if (dynamic_cast<Slice *>(right.get())) {
   } else {
-      rstr = "(" + rstr + ")";
+    rstr = "(" + rstr + ")";
   }
   return lstr + ' ' + op_str + ' ' + rstr;
 }
@@ -242,12 +242,12 @@ std::string UnaryOp::toString() {
   }
   std::string operand_str = operand->toString();
   // TODO Precedence logic, for now we just insert parens if not symbol or num
-  if (dynamic_cast<Identifier*>(operand.get())) {
-  } else if (dynamic_cast<NumericLiteral*>(operand.get())) {
-  } else if (dynamic_cast<Index*>(operand.get())) {
-  } else if (dynamic_cast<Slice*>(operand.get())) {
+  if (dynamic_cast<Identifier *>(operand.get())) {
+  } else if (dynamic_cast<NumericLiteral *>(operand.get())) {
+  } else if (dynamic_cast<Index *>(operand.get())) {
+  } else if (dynamic_cast<Slice *>(operand.get())) {
   } else {
-      operand_str = "(" + operand_str + ")";
+    operand_str = "(" + operand_str + ")";
   }
   return op_str + ' ' + operand_str;
 }
@@ -460,4 +460,12 @@ std::unique_ptr<Vector> make_vector(std::unique_ptr<Identifier> id,
                                   std::move(lsb));
 }
 
+std::string SingleLineComment::toString() {
+  std::string result = "";
+  if (this->statement) {
+    result += this->statement->toString() + "  ";
+  }
+  return result + "// " + value;
+}
+
 }  // namespace verilogAST
diff --git a/tests/basic.cpp b/tests/basic.cpp
@@ -394,6 +394,13 @@ TEST(BasicTests, Comment) {
   vAST::BlockComment block_comment("Test comment\non multiple lines");
   EXPECT_EQ(block_comment.toString(),
             "/*\nTest comment\non multiple lines\n*/");
+  std::unique_ptr<vAST::ContinuousAssign> cont_assign =
+      std::make_unique<vAST::ContinuousAssign>(
+          std::make_unique<vAST::Identifier>("a"),
+          std::make_unique<vAST::Identifier>("b"));
+  vAST::SingleLineComment stmt_with_comment("Test comment",
+                                            std::move(cont_assign));
+  EXPECT_EQ(stmt_with_comment.toString(), "assign a = b;  // Test comment");
 }
 TEST(BasicTests, InlineVerilog) {
   vAST::InlineVerilog inline_verilog(