Add support for nd-vector

leonardt · Jul 30, 2020 · de572f2 · de572f2
1 parent 311b34e
commit de572f2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/include/verilogAST.hpp b/include/verilogAST.hpp
@@ -487,6 +487,22 @@ class Vector : public Node {
   ~Vector(){};
 };
 
+class NDVector : public Vector {
+ public:
+  std::unique_ptr<Identifier> id;
+  std::unique_ptr<Expression> msb;
+  std::unique_ptr<Expression> lsb;
+  std::vector<std::unique_ptr<Expression>> dims;
+
+  NDVector(std::unique_ptr<Identifier> id, std::unique_ptr<Expression> msb,
+           std::unique_ptr<Expression> lsb,
+           std::vector<std::unique_ptr<Expression>> dims)
+      : Vector(std::move(id), std::move(msb), std::move(lsb)),
+        dims(std::move(dims)){};
+  std::string toString() override;
+  ~NDVector(){};
+};
+
 class Port : public AbstractPort {
  public:
   // Required

diff --git a/src/verilogAST.cpp b/src/verilogAST.cpp
@@ -151,6 +151,15 @@ std::string Vector::toString() {
   return "[" + msb->toString() + ':' + lsb->toString() + "] " + id->toString();
 }
 
+std::string NDVector::toString() {
+  std::string base_str = Vector::toString();
+  base_str += " ";
+  for (auto &dim : dims) {
+    base_str += "[" + dim->toString() + "]";
+  }
+  return base_str;
+}
+
 std::string BinaryOp::toString() {
   std::string op_str;
   switch (op) {

diff --git a/tests/basic.cpp b/tests/basic.cpp
@@ -122,6 +122,15 @@ TEST(BasicTests, TestVector) {
   EXPECT_EQ(slice.toString(), "[31:0] x");
 }
 
+TEST(BasicTests, TestNDVector) {
+  std::vector<std::unique_ptr<vAST::Expression>> dims;
+  dims.push_back(vAST::make_num("8"));
+  dims.push_back(vAST::make_num("32"));
+  vAST::NDVector slice(vAST::make_id("x"), vAST::make_num("31"),
+                       vAST::make_num("0"), std::move(dims));
+  EXPECT_EQ(slice.toString(), "[31:0] x [8][32]");
+}
+
 TEST(BasicTests, TestBinaryOp) {
   std::vector<std::pair<vAST::BinOp::BinOp, std::string>> ops;
   ops.push_back(std::make_pair(vAST::BinOp::LSHIFT, "<<"));