fx

Author: kroening

src/verilog/verilog_indexer.cpp

@@ -11,6 +11,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/cmdline.h>
 #include <util/suffix.h>
 #include <util/unicode.h>
+#include <util/cout_message.h>
 
 #include "verilog_parser.h"
 #include "verilog_preprocessor.h"
@@ -36,7 +37,16 @@ class verilog_indexer_parsert
 protected:
   using idt = verilog_indexert::idt;
   verilog_indexert &indexer;
-  void rModule();
+
+  // modules, classes, primitives, packages, interfaces
+  void rModule(verilog_indexert::idt::kindt, int end_token);
+
+  void rConstruct(); // always, initial, ...
+  void rDeclaration(); // reg, wire, input, typedef ...
+  void rTaskFunction(); // task ... endtask
+  void rContinuousAssign(); // assign
+  void rGenerate(); // generate ... endgenerate
+  void rModuleInstance(); // module instance(...);
 
   struct tokent
   {
@@ -50,6 +60,8 @@ class verilog_indexer_parsert
     {
       return kind == TOK_NON_TYPE_IDENTIFIER;
     }
+    bool operator==(int other) const { return kind == other; }
+    bool operator!=(int other) const { return kind != other; }
   };
 
   const tokent &next_token()
@@ -94,11 +106,17 @@ std::string verilog_indexert::preprocess(const std::string &file_name)
     return std::string();
   }
 
-  null_message_handlert message_handler;
+  console_message_handlert message_handler;
   verilog_preprocessort preprocessor(
     in_stream, preprocessed, message_handler, file_name);
 
-  preprocessor.preprocessor();
+  try
+  {
+    preprocessor.preprocessor();
+  }
+  catch(...)
+  {
+  }
 
   return preprocessed.str();
 }
@@ -130,26 +148,99 @@ void verilog_indexer_parsert::rDescription()
     auto &token = next_token();
     if(token.is_eof())
       break;
-    if(token.text == "module")
-      rModule();
+    if(token == TOK_MODULE)
+      rModule(verilog_indexert::idt::MODULE, TOK_ENDMODULE);
+    else if(token == TOK_CLASS)
+      rModule(verilog_indexert::idt::CLASS, TOK_ENDCLASS);
+    else if(token == TOK_PRIMITIVE)
+      rModule(verilog_indexert::idt::PRIMITIVE, TOK_ENDPRIMITIVE);
+    else if(token == TOK_INTERFACE)
+      rModule(verilog_indexert::idt::INTERFACE, TOK_ENDINTERFACE);
+    else if(token == TOK_PACKAGE)
+      rModule(verilog_indexert::idt::PACKAGE, TOK_ENDPACKAGE);
+    else if(token == TOK_TYPEDEF)
+      rDeclaration();
   }
 }
 
-void verilog_indexer_parsert::rModule()
+/// Covers the various 'definition-like' constructs in SystemVerilog, i.e.,
+/// modules, interfaces, classes, primitives, packages
+void verilog_indexer_parsert::rModule(verilog_indexert::idt::kindt kind, int end_token)
 {
   auto name = next_token();
-  if(name.is_identifier())
+  if(!name.is_identifier())
+    return; // give up
+
+  idt id;
+  id.kind = verilog_indexert::idt::MODULE;
+  id.name = name.text;
+  id.file_name = verilog_parser.get_file();
+  indexer.add(std::move(id));
+
+  // now look for the 'endmodule', given as end_token
+  while(peek() != YYEOF)
   {
-    idt id;
-    id.kind = verilog_indexert::idt::MODULE;
-    id.name = name.text;
-    id.file_name = verilog_parser.get_file();
-    indexer.add(std::move(id));
+    auto &token = peek();
+    if(token == end_token)
+    {
+      next_token();
+      break; // done with the module
+    }
+    else if(token == TOK_ALWAYS || token == TOK_ALWAYS_FF || token == TOK_ALWAYS_COMB || token == TOK_ALWAYS_LATCH || token == TOK_FINAL)
+      rConstruct();
+    else if(token == TOK_VAR || token == TOK_WIRE || token == TOK_REG || token == TOK_INPUT || token == TOK_INOUT || token == TOK_OUTPUT || token == TOK_GENVAR || token == TOK_TYPEDEF || token == TOK_ENUM)
+      rDeclaration();
+    else if(token == TOK_FUNCTION || token == TOK_TASK)
+      rTaskFunction();
+    else if(token == TOK_ASSIGN)
+      rContinuousAssign();
+    else if(token == TOK_GENERATE)
+      rGenerate();
+    else if(token.is_identifier())
+    {
+      // declaration, label, module instance
+      rModuleInstance();
+    }
+    else
+    {
+      // something else
+      next_token();
+      std::cout << "ELSE: " << token.text << "\n";
+    }
   }
 }
 
-std::vector<std::filesystem::path> verilog_files()
+void verilog_indexer_parsert::rConstruct()
 {
+  next_token();
+}
+
+void verilog_indexer_parsert::rDeclaration()
+{
+  next_token();
+}
+
+void verilog_indexer_parsert::rTaskFunction()
+{
+  next_token();
+}
+
+void verilog_indexer_parsert::rContinuousAssign()
+{
+  next_token();
+}
+
+void verilog_indexer_parsert::rGenerate()
+{
+  next_token();
+}
+
+void verilog_indexer_parsert::rModuleInstance()
+{
+  next_token();
+}
+
+std::vector<std::filesystem::path> verilog_files() {
   std::vector<std::filesystem::path> result;
 
   auto current = std::filesystem::current_path();