Add vendor drop for XDM 2.6.0

Author: tvrusso

CMakeLists.txt

@@ -20,7 +20,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 # Process the Version Numbers
 #------------------------------------
 set(XDM_MAJOR_VERSION "2")
-set(XDM_MINOR_VERSION "5")
+set(XDM_MINOR_VERSION "6")
 set(XDM_PATCH_VERSION "0")
 if( NOT XDM_MAJOR_VERSION MATCHES "[0-9]+" )
   set( XDM_MAJOR_VERSION "X" CACHE STRING "The major version number for this build." )
@@ -366,16 +366,6 @@ if(PYINSTALLER_PATH)
     )
 endif()
 
-#------------------------------------
-# Build Test Cases
-#------------------------------------
-option( BUILD_TESTS "GTests for expression parser." OFF )
-if( BUILD_TESTS )
-  enable_testing()
-  find_package(GTest REQUIRED)
-  add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
-endif()
-
 #------------------------------------
 # Installation Details
 #------------------------------------

RELEASE_NOTES.md

@@ -1,44 +1,37 @@
 # Xyce(TM) XDM Netlist Translator
+Xyce(TM) XDM Netlist Translator
 Copyright 2002-2020 National Technology & Engineering Solutions of
 Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 NTESS, the U.S. Government retains certain rights in this software.
-
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
-
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see http://www.gnu.org/licenses/.
 
-
-# XDM 2.5.0 Release Notes
+# XDM 2.6.0 Release Notes
 
 ## General
 
-- Translations of netlists using binned models will no longer have the
-\texttt{.OPTION PARSER MODEL\_BINNING=TRUE} statement. This option is
-turned on by default in \Xyce{} now and therefore no longer needs to be 
-explicitly declared.
-
-- Duplicate output variables will now be removed from the \texttt{.PRINT} 
-line.
-
-- The expression and function pre-processing capabilities have been 
-removed from XDM.
-
-## spectre
-      
-- The \texttt{else} conditional block in \texttt{if-else} statments will 
-now be commented out by XDM, since conditional statement support is not 
-fully mature yet in \Xyce{}.
-
-## PSpice
-
-- Fixed bug where instance parameters for temperature coefficients for 
-resistors were not translated.
+\item XDM now allows models to be redefined within the same scope
+        without raising an exception. Previously, the code would exit out
+        if a model was redefined. Now, it will just emit a warning.
+        
+## HSpice
+
+\item HSPICE expressions can be delimited by double quotes. XDM would
+    either let this pass through without making any changes (which
+    would cause problems with the resultant Xyce netlist), or comment
+    it out in some cases (mostly, in expressions in sources). This was
+    fixed by adding a HSPICE grammar rule that defines expressions
+    delimited by double quotes, and then adding code in the parser
+    interface to change the expression delimiters to curly braces.
+    
+## SPECTRE
+
+\item XDM now tranlates the SPECTRE model parameter "VERSION" to "version".

src/c_boost/xyce/HSPICEGrammar.hpp

@@ -66,9 +66,9 @@ struct hspice_parser : qi::grammar<Iterator, std::vector<netlist_statement_objec
         measure_param_name, measure_param_value, variable_expr_or_value, vol_type, cur_type, standalone_param, data_table_name, data_param_name, data_param_value, if_dir_type, else_dir_type, elseif_dir_type, endif_dir_type,
         IF_COND;
 
-    qi::rule<Iterator, std::string()> identifier, math_expression, math_expression_single_quote_delimiter, math_expression_no_delimiter, composite_math_expression, output_variable_expression,
-        simple_v_output_expression, inline_comment_str, comment_str, filename_str, param_with_comma, raw_identifier, no_curly_brace_expression, any, node_identifier, raw_node_identifier,
-        parenthetical_expression, numeric, number;
+    qi::rule<Iterator, std::string()> identifier, math_expression, math_expression_single_quote_delimiter, math_expression_double_quote_delimiter, math_expression_no_delimiter, composite_math_expression,
+        output_variable_expression, simple_v_output_expression, inline_comment_str, comment_str, filename_str, param_with_comma, raw_identifier, no_curly_brace_expression, any, node_identifier,
+        raw_node_identifier, parenthetical_expression, numeric, number;
 
     qi::rule<Iterator> white_space, par_name;
 
@@ -131,12 +131,16 @@ struct hspice_parser : qi::grammar<Iterator, std::vector<netlist_statement_objec
             char_("'") >> +(parenthetical_expression | +char_("a-zA-Z0-9.+/*^,_=<> \t!|$&?:~-")) >> char_("'")
             ;
 
+        math_expression_double_quote_delimiter =
+            char_("\"") >> +(parenthetical_expression | +char_("a-zA-Z0-9.+/*^,_=<> \t!|$&?:~-")) >> char_("\"")
+            ;
+
         math_expression_no_delimiter =
             parenthetical_expression | char_("a-zA-Z0-9.+,_=<>!|&:~-") >> *(parenthetical_expression | +char_("a-zA-Z0-9.+/*^,_=<>'!|$&?:~-"))
             ;
 
         math_expression =
-            math_expression_single_quote_delimiter | math_expression_no_delimiter
+            math_expression_single_quote_delimiter | math_expression_double_quote_delimiter | math_expression_no_delimiter
             ;
 
         simple_v_output_expression =

src/python/xdm/index/NAME_SCOPE_INDEX.py

@@ -208,25 +208,38 @@ def add_model(self, m, case_insensitive=False):
 
         # If MASTER_MODEL already exists
         model_name = m.name
+
+
         if case_insensitive:
             model_name = m.name.upper()
 
+
         if ("__MODELDEF__" + model_name) in self._statements and isinstance(
                 self._statements[("__MODELDEF__" + model_name)], MASTER_MODEL):
             master = self._statements[("__MODELDEF__" + model_name)]
+
         else:
             d = self.get_object("__LAZYSTATEMENT__" + model_name)
             master = MASTER_MODEL(m.name)
+
             if isinstance(d, LAZY_STATEMENT):
                 d.bind(master, case_insensitive)
                 self.remove_statement(d)
-            if self._lib_command is None:
+
+
+            if self._subckt_command is not None:
+                if self.scope_contains("__MODELDEF__" + model_name):
+                    logging.warning(model_name + " has already been used in this scope")
+
+            elif self._lib_command is None:
                 if self.scope_contains("__MODELDEF__" + model_name):
                     raise NameConflictException(model_name + " has already been used in this scope")
+
             else:
                 if self.local_scope_contains("__MODELDEF__" + model_name):
                     raise NameConflictException(model_name + " has already been used in this scope")
 
+
             self._statements["__MODELDEF__" + model_name] = master
             # Put MASTER_MODEL in indexes (if any care to see it)
             self._add_to_indexes(master)

src/python/xdm/inout/readers/HSPICENetlistBoostParserInterface.py

@@ -547,6 +547,12 @@ def convert_next_token(self, parsed_object, parsed_object_iter, pnl, synthesized
                         self._np = -1
 
 
+        elif parsed_object.types[0] == SpiritCommon.data_model_type.EXPRESSION:
+            processed_value = self.curly_braces_for_expressions(parsed_object.value)
+            pnl.add_known_object(processed_value, BoostParserInterface.boost_xdm_map_dict[parsed_object.types[0]])
+            
+
+
         else:
             XyceNetlistBoostParserInterface.convert_next_token(parsed_object, parsed_object_iter, pnl, synthesized_pnls)
 
@@ -624,6 +630,10 @@ def curly_braces_for_expressions(in_expression):
         if in_expression.startswith("'") and in_expression.endswith("'"):
             return in_expression
 
+        # check if expression is enclosed in double quotes
+        if in_expression.startswith('"') and in_expression.endswith('"'):
+            in_expression = in_expression[1:-1]
+
         # remove single quotes that may be around function arguments
         expression_fields = in_expression.split("'")
         out_expression = "".join(expression_fields)

src/python/xdm/inout/readers/XDMFactory.py

@@ -923,7 +923,8 @@ def build_model(parsed_netlist_line, reader_state, language_definition):
 
     if parsed_netlist_line.params_dict.get("VERSION"):
         version = parsed_netlist_line.params_dict["VERSION"]
-        del parsed_netlist_line.params_dict["VERSION"]
+        if language_definition.language != "hspice":
+            del parsed_netlist_line.params_dict["VERSION"]
 
     language_device_types = language_definition.get_devices_by_local_name(model_device_type)
     language_device_type = None