A few gtest cases for PSA (#459)

p4lang · Apr 9, 2017 · 1297646 · 1297646
1 parent bbf177c
commit 1297646
Show file tree

Hide file tree

Showing 10 changed files with 392 additions and 86 deletions.
diff --git a/frontends/p4/p4-parse.ypp b/frontends/p4/p4-parse.ypp
@@ -1035,13 +1035,14 @@ const IR::P4Program *parse_P4_16_file(const char *name, FILE *in) {
 
 const IR::P4Program *parse_string(const std::string &pgm) {
     int errors = 0;
+    Util::InputSources::reset();
     clearErrorReporter();
+    structure.clear();
+    allErrors = nullptr;
     declarations = new IR::IndexedVector<IR::Node>();
     YY_BUFFER_STATE state = yy_scan_string(pgm.c_str());
     errors |= yyparse();
     yy_delete_buffer(state);
-    structure.clear();
-    allErrors = nullptr;
     if (errors) {
         return nullptr;
     }

diff --git a/frontends/p4/symbol_table.cpp b/frontends/p4/symbol_table.cpp
@@ -244,5 +244,7 @@ cstring ProgramStructure::toString() const {
 
 void ProgramStructure::clear() {
     rootNamespace->clear();
+    currentNamespace = rootNamespace;
+    debugStream = stderr;
 }
 }  // namespace Util
diff --git a/lib/source_file.cpp b/lib/source_file.cpp
@@ -62,6 +62,11 @@ InputSources::InputSources() :
     this->contents.push_back("");
 }
 
+/* static */
+void InputSources::reset() {
+    instance = new InputSources;
+}
+
 // prevent further changes
 void InputSources::seal() {
     if (this->sealed)

diff --git a/lib/source_file.h b/lib/source_file.h
@@ -271,6 +271,9 @@ class InputSources final {
 
     cstring toDebugString() const;
 
+    // Reset all source information, so that a new file can be parsed.
+    static void reset();
+
     static InputSources* instance;
 
  private:

diff --git a/test/gtest/Makefile.am b/test/gtest/Makefile.am
@@ -15,9 +15,10 @@
 # General GTest unit tests. Add tests here if they don't have a logical home
 # elsewhere in the codebase.
 gtest_unittest_UNIFIED = \
+	test/gtest/helpers.cpp \
 	test/gtest/opeq_test.cpp \
-	test/gtest/typecheck_test.cpp \
-	test/gtest/midend_test.cpp
+	test/gtest/midend_test.cpp \
+	test/gtest/arch_test.cpp
 
 cpplint_FILES += $(gtest_unittest_UNIFIED)
 gtest_SOURCES += $(gtest_unittest_SOURCES)