Pre-merge https://github.com/parallaxsw/OpenSTA/pull/198

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

liberty/LibertyParse.yy

@@ -38,11 +38,12 @@
 #define loc_line(loc) loc.begin.line
 %}
 
-%require  "3.0"
+%require  "3.2"
 %skeleton "lalr1.cc"
 %debug
 %define api.namespace {sta}
 %locations
+%define api.location.file "LibertyLocation.hh"
 %define parse.assert
 %parse-param { LibertyScanner *scanner }
 %parse-param { LibertyParser *reader }

liberty/LibertyScanner.hh

@@ -30,7 +30,7 @@
 #include <FlexLexer.h>
 #endif
 
-#include "location.hh"
+#include "LibertyLocation.hh"
 #include "LibertyParse.hh"
 
 namespace sta {

sdf/SdfParse.yy

@@ -35,11 +35,12 @@
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 %}
 
-%require  "3.0"
+%require  "3.2"
 %skeleton "lalr1.cc"
 %debug
 %define api.namespace {sta}
 %locations
+%define api.location.file "SdfLocation.hh"
 %define parse.assert
 %parse-param { SdfScanner *scanner }
 %parse-param { SdfReader *reader }

sdf/SdfScanner.hh

@@ -30,7 +30,7 @@
 #include <FlexLexer.h>
 #endif
 
-#include "location.hh"
+#include "SdfLocation.hh"
 #include "SdfParse.hh"
 
 namespace sta {

verilog/VerilogParse.yy

@@ -48,11 +48,12 @@ sta::VerilogParse::error(const location_type &loc,
 }
 %}
 
-%require  "3.0"
+%require  "3.2"
 %skeleton "lalr1.cc"
 %debug
 %define api.namespace {sta}
 %locations
+%define api.location.file "VerilogLocation.hh"
 %define parse.assert
 %parse-param { VerilogScanner *scanner }
 %parse-param { VerilogReader *reader }

verilog/VerilogScanner.hh

@@ -30,7 +30,7 @@
 #include <FlexLexer.h>
 #endif
 
-#include "location.hh"
+#include "VerilogLocation.hh"
 #include "VerilogParse.hh"
 
 namespace sta {