Add unpacked concat logic

leonardt · Aug 1, 2020 · fde8c53 · fde8c53
1 parent 2635197
commit fde8c53
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/include/verilogAST.hpp b/include/verilogAST.hpp
@@ -383,11 +383,13 @@ class Concat : public Expression {
 
  public:
   std::vector<std::unique_ptr<Expression>> args;
+  bool unpacked;
 
-  Concat(std::vector<std::unique_ptr<Expression>> args)
-      : args(std::move(args)){};
+  Concat(std::vector<std::unique_ptr<Expression>> args, bool unpacked = false)
+      : args(std::move(args)), unpacked(unpacked){};
   Concat(const Concat& rhs) {
     for (const auto& arg : rhs.args) args.push_back(arg->clone());
+    this->unpacked = rhs.unpacked;
   };
 
   std::string toString() override;

diff --git a/src/verilogAST.cpp b/src/verilogAST.cpp
@@ -282,7 +282,11 @@ std::string Concat::toString() {
   for (auto &arg : args) {
     arg_strs.push_back(arg->toString());
   }
-  return "{" + join(arg_strs, ",") + "}";
+  std::string prefix = "";
+  if (this->unpacked) {
+    prefix = "'";
+  }
+  return prefix + "{" + join(arg_strs, ",") + "}";
 }
 
 std::string Replicate::toString() {

diff --git a/tests/basic.cpp b/tests/basic.cpp
@@ -207,6 +207,12 @@ TEST(BasicTests, TestConcat) {
   args.push_back(vAST::make_id("y"));
   vAST::Concat concat(std::move(args));
   EXPECT_EQ(concat.toString(), "{x,y}");
+
+  std::vector<std::unique_ptr<vAST::Expression>> args2;
+  args2.push_back(vAST::make_id("x"));
+  args2.push_back(vAST::make_id("y"));
+  vAST::Concat concat2(std::move(args2), true);
+  EXPECT_EQ(concat2.toString(), "'{x,y}");
 }
 
 TEST(BasicTests, TestReplicate) {