Merge pull request #866 from diffblue/vlindex-property-sequence

vlindex: properties and sequences

Author: kroening

src/vlindex/verilog_indexer.cpp

@@ -1160,12 +1160,54 @@ void verilog_indexer_parsert::rGenerateBegin()
 
 void verilog_indexer_parsert::rProperty()
 {
+  next_token(); // property
+
+  auto name = next_token(); // name
+
+  {
+    idt id;
+    id.kind = idt::PROPERTY;
+    id.name = name.text;
+    id.module = current_module;
+    id.file_name = verilog_parser.get_file();
+    id.line_number = verilog_parser.get_line_no();
+    indexer.add(std::move(id));
+  }
+
   skip_until(TOK_ENDPROPERTY);
+
+  // optional label
+  if(peek() == TOK_COLON)
+  {
+    next_token(); // :
+    next_token(); // identifier
+  }
 }
 
 void verilog_indexer_parsert::rSequence()
 {
-  skip_until(TOK_ENDSEQUENCE);
+  next_token(); // sequence
+
+  auto name = next_token(); // name
+
+  {
+    idt id;
+    id.kind = idt::SEQUENCE;
+    id.name = name.text;
+    id.module = current_module;
+    id.file_name = verilog_parser.get_file();
+    id.line_number = verilog_parser.get_line_no();
+    indexer.add(std::move(id));
+  }
+
+  skip_until(TOK_ENDPROPERTY);
+
+  // optional label
+  if(peek() == TOK_COLON)
+  {
+    next_token(); // :
+    next_token(); // identifier
+  }
 }
 
 void verilog_indexer_parsert::rSpecify()
@@ -1452,6 +1494,16 @@ int verilog_index(const cmdlinet &cmdline)
     // Show the module instances.
     show_kind(verilog_indexert::idt::kindt::TASK, indexer);
   }
+  else if(cmdline.isset("sequences"))
+  {
+    // Show the sequences.
+    show_kind(verilog_indexert::idt::kindt::SEQUENCE, indexer);
+  }
+  else if(cmdline.isset("properties"))
+  {
+    // Show the properties.
+    show_kind(verilog_indexert::idt::kindt::PROPERTY, indexer);
+  }
   else
   {
     auto total_number_of = indexer.total_number_of();
@@ -1476,6 +1528,10 @@ int verilog_index(const cmdlinet &cmdline)
               << total_number_of[idt::FUNCTION] << '\n';
     std::cout << "Number of tasks...........: " << total_number_of[idt::TASK]
               << '\n';
+    std::cout << "Number of properties......: "
+              << total_number_of[idt::PROPERTY] << '\n';
+    std::cout << "Number of sequences.......: "
+              << total_number_of[idt::SEQUENCE] << '\n';
     std::cout << "Number of module instances: "
               << total_number_of[idt::INSTANCE] << '\n';
     std::cout << "Number of configurations..: " << total_number_of[idt::CONFIG]

src/vlindex/verilog_indexer.h

@@ -35,6 +35,8 @@ class verilog_indexert
       TYPEDEF,
       FUNCTION,
       TASK,
+      PROPERTY,
+      SEQUENCE,
       INSTANCE,
       BLOCK,
       NET,

src/vlindex/vlindex_parse_options.cpp

@@ -113,6 +113,8 @@ void vlindex_parse_optionst::help()
     " {y--udps}                      \t show a list of the UPDs\n"
     " {y--tasks}                     \t show a list of the tasks\n"
     " {y--functions}                 \t show a list of the functions\n"
+    " {y--properties}                \t show a list of the properties\n"
+    " {y--sequences}                 \t show a list of the sequences\n"
     " {y--hierarchy}                 \t show the hierarchy of module instantiations\n"
     " {y--verbosity} {u#}            \t verbosity level, from 0 (silent) to 10 (everything)\n"
     // clang-format on

src/vlindex/vlindex_parse_options.h

@@ -26,6 +26,7 @@ class vlindex_parse_optionst : public parse_options_baset
         "(hierarchy)"
         "(modules)"
         "(packages)(classes)(interfaces)(udps)(instances)(tasks)(functions)"
+        "(sequences)(properties)"
         "(symlinks)(files)"
         "(1800-2017)(1800-2012)(1800-2009)(1800-2005)"
         "(1364-2005)(1364-2001)(1364-2001-noconfig)(1364-1995)"