Merge pull request #873 from diffblue/vlindex-attributes

vlindex: parse attributes

Author: tautschnig

src/vlindex/vlindex_parser.cpp

@@ -114,6 +114,9 @@ void verilog_indexer_parsert::rModule(
 
 void verilog_indexer_parsert::rItem()
 {
+  // Attribute before item?
+  rAttribute();
+
   auto &token = peek();
 
   if(token == TOK_MODULE)
@@ -603,6 +606,39 @@ void verilog_indexer_parsert::rModport()
   skip_until(';');
 }
 
+void verilog_indexer_parsert::rAttribute()
+{
+  // (* attr_name = constant, ... *)
+  if(peek() == TOK_PARENASTERIC)
+  {
+    while(true)
+    {
+      rAttrSpec();
+      if(peek() != ',')
+        break;
+      next_token(); // eat ,
+    }
+
+    if(peek() == TOK_ASTERICPAREN)
+      next_token(); // eat *)
+  }
+}
+
+void verilog_indexer_parsert::rAttrSpec()
+{
+  // attr_name = constant
+  auto name = next_token();
+  if(!name.is_identifier())
+    return; // give up
+
+  auto eq = next_token();
+  if(eq != '=')
+    return; // give up
+
+  rExpression([](const tokent &token)
+              { return token == ',' || token == TOK_ASTERICPAREN; });
+}
+
 void verilog_indexer_parsert::rCell()
 {
   next_token(); // cell
@@ -695,6 +731,23 @@ void verilog_indexer_parsert::rParenExpression()
   }
 }
 
+void verilog_indexer_parsert::rExpression(
+  std::function<bool(const tokent &)> stopping_condition)
+{
+  std::size_t count = 0;
+
+  while(count != 0 || !stopping_condition(peek()))
+  {
+    auto token = next_token();
+    if(token.is_eof())
+      return;
+    else if(token == '(')
+      count++;
+    else if(token == ')')
+      count--;
+  }
+}
+
 void verilog_indexer_parsert::rDeclaration()
 {
   if(peek() == TOK_PROTECTED)

src/vlindex/vlindex_parser.h

@@ -38,6 +38,32 @@ class verilog_indexer_parsert
   verilog_indexert &indexer;
   irep_idt current_module;
 
+  struct tokent
+  {
+    int kind;
+    std::string text;
+    bool is_eof() const
+    {
+      return kind == 0; // EOF, flex magic number
+    }
+    bool is_identifier() const
+    {
+      return kind == TOK_NON_TYPE_IDENTIFIER || kind == TOK_TYPE_IDENTIFIER;
+    }
+    bool is_system_identifier() const
+    {
+      return kind == TOK_SYSIDENT;
+    }
+    bool operator==(int other) const
+    {
+      return kind == other;
+    }
+    bool operator!=(int other) const
+    {
+      return kind != other;
+    }
+  };
+
   // modules, classes, primitives, packages, interfaces, configurations
   void rModule(verilog_indexert::idt::kindt, int end_token);
   void rImport();
@@ -46,6 +72,8 @@ class verilog_indexer_parsert
   void rItem();
   void rBind();
 
+  void rAttribute();
+  void rAttrSpec();
   void rCell();
   void rDesign();
   void rInterconnect();
@@ -69,6 +97,7 @@ class verilog_indexer_parsert
   void rCaseLabel();
   void rUniquePriority();
   void rParenExpression(); // (expression)
+  void rExpression(std::function<bool(const tokent &)>); // expression
   void rDeclaration();     // var, reg, wire, input, typedef, defparam ...
   void rType();
   void rTypeOpt();
@@ -92,32 +121,6 @@ class verilog_indexer_parsert
   void rSpecify();
   void skip_until(int token);
 
-  struct tokent
-  {
-    int kind;
-    std::string text;
-    bool is_eof() const
-    {
-      return kind == 0; // EOF, flex magic number
-    }
-    bool is_identifier() const
-    {
-      return kind == TOK_NON_TYPE_IDENTIFIER || kind == TOK_TYPE_IDENTIFIER;
-    }
-    bool is_system_identifier() const
-    {
-      return kind == TOK_SYSIDENT;
-    }
-    bool operator==(int other) const
-    {
-      return kind == other;
-    }
-    bool operator!=(int other) const
-    {
-      return kind != other;
-    }
-  };
-
   static bool may_be_type(const tokent &);
 
   // consume a token, returned as rvalue