diff --git a/ChangeLog b/ChangeLog
index dea489e06..d04e02959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-28 Holger Vogt
+ * inpcom.c, xpressn.c, inpptree.h, spicelib/parser/makefile.am, inpptree.c,
+ ptfuncs.c, inpptree-parser.y: replace parser for B source with BISON generated one.
+ Patch 2 from R. Larice
+
2010-02-27 Holger Vogt
* command.c, gnuplot.c, gnuplot.h, com_gnuplot.c, com_gnuplot.h, plotit.c:
new command 'wrdata file vecs' for simple tabular printout of data
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 76bf2e66b..49ea2cb4f 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -1026,6 +1026,7 @@ inp_fix_ternary_operator( struct line *start_card )
if (found_control) continue;
+ if ( *line == 'B' || *line == 'b' ) continue;
if ( *line == '*' ) continue;
if ( strstr( line, "?" ) && strstr( line, ":" ) ) {
card->li_line = inp_fix_ternary_operator_str( line );
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 63e566167..61fafb49e 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1825,6 +1825,7 @@ nupa_substitute (tdico * dico, char *s, char *r, unsigned char err)
{
i++;
c = s[i - 1];
+
if (c == Pspice)
{ /* try pspice expression syntax */
k = i;
@@ -1860,7 +1861,13 @@ nupa_substitute (tdico * dico, char *s, char *r, unsigned char err)
}
else if (c == Intro)
{
- i++;
+ /* skip "&&" which may occur in B source */
+ if ((i + 1 < ls) && (s[i] == Intro)) {
+ i++;
+ continue;
+ }
+
+ i++;
while ((i < ls) && (s[i - 1] <= ' '))
i++;
diff --git a/src/include/inpptree.h b/src/include/inpptree.h
index 4a01f58f6..26e34fffc 100644
--- a/src/include/inpptree.h
+++ b/src/include/inpptree.h
@@ -98,6 +98,12 @@ typedef struct INPparseNode {
#define PTF_USTEP2 21
#define PTF_PWL 22
#define PTF_PWL_DERIVATIVE 23
+#define PTF_EQ0 24
+#define PTF_NE0 25
+#define PTF_GT0 26
+#define PTF_LT0 27
+#define PTF_GE0 28
+#define PTF_LE0 29
/* The following things are used by the parser -- these are the token types the
@@ -168,6 +174,12 @@ extern double PTpwl();
extern double PTpwl_derivative();
extern double PTuramp();
extern double PTuminus();
+extern double PTeq0(double arg);
+extern double PTne0(double arg);
+extern double PTgt0(double arg);
+extern double PTlt0(double arg);
+extern double PTge0(double arg);
+extern double PTle0(double arg);
/* And in IFeval.c */
diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index 6e195aa30..5f1bfe92b 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -65,6 +65,9 @@ libinp_la_SOURCES = \
sperror.c \
inp.h
+inpptree.c : inpptree-parser.c
+inpptree-parser.c inpptree-parser.h : inpptree-parser.y
+ bison $<
AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
diff --git a/src/spicelib/parser/inpptree-parser.c b/src/spicelib/parser/inpptree-parser.c
new file mode 100644
index 000000000..3cd18bcfd
--- /dev/null
+++ b/src/spicelib/parser/inpptree-parser.c
@@ -0,0 +1,1799 @@
+
+/* A Bison parser, made by GNU Bison 2.4.1. */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ 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 . */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+ simplifying the original so-called "semantic" parser. */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+ infringing on user name space. This should be done even for local
+ variables, as they might otherwise be expanded by user macros.
+ There are some unavoidable exceptions within include files to
+ define necessary library symbols; they are noted "INFRINGES ON
+ USER NAME SPACE" below. */
+
+/* Identify Bison output. */
+#define YYBISON 1
+
+/* Bison version. */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name. */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers. */
+#define YYPURE 1
+
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
+/* Using locations. */
+#define YYLSP_NEEDED 0
+
+/* Substitute the variable and function names. */
+#define yyparse PTparse
+#define yylex PTlex
+#define yyerror PTerror
+#define yylval PTlval
+#define yychar PTchar
+#define yydebug PTdebug
+#define yynerrs PTnerrs
+
+
+/* Copy the first part of user declarations. */
+
+/* Line 189 of yacc.c */
+#line 1 "inpptree-parser.y"
+
+
+ #include
+ #include "inpptree-parser.h"
+
+ extern int PTlex (YYSTYPE *lvalp, char **line);
+ extern int PTparse (char **line, struct INPparseNode **retval);
+
+ static void PTerror (char **line, struct INPparseNode **retval, char const *);
+
+ #if defined (_MSC_VER)
+ # define __func__ __FUNCTION__ /* __func__ is C99, but MSC can't */
+ #endif
+
+
+
+/* Line 189 of yacc.c */
+#line 98 "inpptree-parser.c"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ TOK_NUM = 258,
+ TOK_STR = 259,
+ TOK_LE = 260,
+ TOK_LT = 261,
+ TOK_GE = 262,
+ TOK_GT = 263,
+ TOK_EQ = 264,
+ TOK_NE = 265,
+ TOK_OR = 266,
+ TOK_AND = 267,
+ NEG = 268
+ };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 222 of yacc.c */
+#line 29 "inpptree-parser.y"
+
+ double num;
+ const char *str;
+ struct INPparseNode *pnode;
+
+
+
+/* Line 222 of yacc.c */
+#line 155 "inpptree-parser.c"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+/* Copy the second part of user declarations. */
+
+
+/* Line 264 of yacc.c */
+#line 167 "inpptree-parser.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+# define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+# define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# else
+# define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+# if ENABLE_NLS
+# include /* INFRINGES ON USER NAME SPACE */
+# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# endif
+# endif
+# ifndef YY_
+# define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E. */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions. */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+ int yyi;
+#endif
+{
+ return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
+
+# ifdef YYSTACK_USE_ALLOCA
+# if YYSTACK_USE_ALLOCA
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# elif defined __BUILTIN_VA_ARG_INCR
+# include /* INFRINGES ON USER NAME SPACE */
+# elif defined _AIX
+# define YYSTACK_ALLOC __alloca
+# elif defined _MSC_VER
+# include /* INFRINGES ON USER NAME SPACE */
+# define alloca _alloca
+# else
+# define YYSTACK_ALLOC alloca
+# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
+# endif
+# endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+# ifndef YYSTACK_ALLOC_MAXIMUM
+ /* The OS might guarantee only one guard page at the bottom of the stack,
+ and a page size can be as small as 4096 bytes. So we cannot safely
+ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
+ to allow for a few compiler-allocated temporary stack slots. */
+# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+# endif
+# else
+# define YYSTACK_ALLOC YYMALLOC
+# define YYSTACK_FREE YYFREE
+# ifndef YYSTACK_ALLOC_MAXIMUM
+# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+# endif
+# if (defined __cplusplus && ! defined _STDLIB_H \
+ && ! ((defined YYMALLOC || defined malloc) \
+ && (defined YYFREE || defined free)))
+# include /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# ifndef YYFREE
+# define YYFREE free
+# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+ && (! defined __cplusplus \
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member. */
+union yyalloc
+{
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next. */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+
+/* Relocate STACK from its old location to the new one. The
+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL 12
+/* YYLAST -- Last index in YYTABLE. */
+#define YYLAST 134
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS 25
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS 4
+/* YYNRULES -- Number of rules. */
+#define YYNRULES 24
+/* YYNRULES -- Number of states. */
+#define YYNSTATES 49
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 268
+
+#define YYTRANSLATE(YYX) \
+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+static const yytype_uint8 yytranslate[] =
+{
+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 21, 2, 2, 2, 2, 2, 2,
+ 23, 24, 18, 17, 11, 16, 2, 19, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 13, 2,
+ 2, 2, 2, 12, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 20, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 14, 15, 22
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
+static const yytype_uint8 yyprhs[] =
+{
+ 0, 0, 3, 5, 7, 9, 13, 17, 21, 25,
+ 29, 33, 36, 41, 47, 51, 55, 59, 63, 67,
+ 71, 75, 79, 82, 84
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yytype_int8 yyrhs[] =
+{
+ 26, 0, -1, 27, -1, 3, -1, 4, -1, 27,
+ 17, 27, -1, 27, 16, 27, -1, 27, 18, 27,
+ -1, 27, 19, 27, -1, 27, 20, 27, -1, 23,
+ 27, 24, -1, 16, 27, -1, 4, 23, 28, 24,
+ -1, 27, 12, 27, 13, 27, -1, 27, 9, 27,
+ -1, 27, 10, 27, -1, 27, 8, 27, -1, 27,
+ 6, 27, -1, 27, 7, 27, -1, 27, 5, 27,
+ -1, 27, 14, 27, -1, 27, 15, 27, -1, 21,
+ 27, -1, 27, -1, 28, 11, 27, -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const yytype_uint8 yyrline[] =
+{
+ 0, 57, 57, 61, 62, 64, 65, 66, 67, 68,
+ 70, 72, 74, 76, 81, 82, 83, 84, 85, 86,
+ 88, 92, 96, 101, 102
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+ "$end", "error", "$undefined", "TOK_NUM", "TOK_STR", "TOK_LE", "TOK_LT",
+ "TOK_GE", "TOK_GT", "TOK_EQ", "TOK_NE", "','", "'?'", "':'", "TOK_OR",
+ "TOK_AND", "'-'", "'+'", "'*'", "'/'", "'^'", "'!'", "NEG", "'('", "')'",
+ "$accept", "expression", "exp", "nonempty_arglist", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+ token YYLEX-NUM. */
+static const yytype_uint16 yytoknum[] =
+{
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 44, 63, 58, 266, 267, 45, 43, 42, 47,
+ 94, 33, 268, 40, 41
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
+{
+ 0, 25, 26, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 28, 28
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
+{
+ 0, 2, 1, 1, 1, 3, 3, 3, 3, 3,
+ 3, 2, 4, 5, 3, 3, 3, 3, 3, 3,
+ 3, 3, 2, 1, 3
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+ STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+ means the default is an error. */
+static const yytype_uint8 yydefact[] =
+{
+ 0, 3, 4, 0, 0, 0, 0, 2, 0, 11,
+ 22, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 23, 0, 10,
+ 19, 17, 18, 16, 14, 15, 0, 20, 21, 6,
+ 5, 7, 8, 9, 0, 12, 0, 24, 13
+};
+
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int8 yydefgoto[] =
+{
+ -1, 6, 7, 28
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+#define YYPACT_NINF -21
+static const yytype_int8 yypact[] =
+{
+ 21, -21, -20, 21, 21, 21, 4, 76, 21, -21,
+ -21, 40, -21, 21, 21, 21, 21, 21, 21, 21,
+ 21, 21, 21, 21, 21, 21, 21, 76, 15, -21,
+ 11, 11, 11, 11, 114, 114, 60, 92, 108, -12,
+ -12, -11, -11, -21, 21, -21, 21, 76, 76
+};
+
+/* YYPGOTO[NTERM-NUM]. */
+static const yytype_int8 yypgoto[] =
+{
+ -21, -21, -3, -21
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If zero, do what YYDEFACT says.
+ If YYTABLE_NINF, syntax error. */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+ 9, 10, 11, 8, 12, 27, 24, 25, 26, 26,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 1, 2, 44, 22, 23, 24,
+ 25, 26, 0, 0, 0, 0, 0, 3, 0, 45,
+ 0, 47, 4, 48, 5, 13, 14, 15, 16, 17,
+ 18, 0, 19, 0, 20, 21, 22, 23, 24, 25,
+ 26, 0, 0, 0, 29, 13, 14, 15, 16, 17,
+ 18, 0, 19, 46, 20, 21, 22, 23, 24, 25,
+ 26, 13, 14, 15, 16, 17, 18, 0, 19, 0,
+ 20, 21, 22, 23, 24, 25, 26, 13, 14, 15,
+ 16, 17, 18, 0, 0, 0, 0, 21, 22, 23,
+ 24, 25, 26, 13, 14, 15, 16, 17, 18, 13,
+ 14, 15, 16, 0, 22, 23, 24, 25, 26, 0,
+ 22, 23, 24, 25, 26
+};
+
+static const yytype_int8 yycheck[] =
+{
+ 3, 4, 5, 23, 0, 8, 18, 19, 20, 20,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 3, 4, 11, 16, 17, 18,
+ 19, 20, -1, -1, -1, -1, -1, 16, -1, 24,
+ -1, 44, 21, 46, 23, 5, 6, 7, 8, 9,
+ 10, -1, 12, -1, 14, 15, 16, 17, 18, 19,
+ 20, -1, -1, -1, 24, 5, 6, 7, 8, 9,
+ 10, -1, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 5, 6, 7, 8, 9, 10, -1, 12, -1,
+ 14, 15, 16, 17, 18, 19, 20, 5, 6, 7,
+ 8, 9, 10, -1, -1, -1, -1, 15, 16, 17,
+ 18, 19, 20, 5, 6, 7, 8, 9, 10, 5,
+ 6, 7, 8, -1, 16, 17, 18, 19, 20, -1,
+ 16, 17, 18, 19, 20
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const yytype_uint8 yystos[] =
+{
+ 0, 3, 4, 16, 21, 23, 26, 27, 23, 27,
+ 27, 27, 0, 5, 6, 7, 8, 9, 10, 12,
+ 14, 15, 16, 17, 18, 19, 20, 27, 28, 24,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 11, 24, 13, 27, 27
+};
+
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror. This remains here temporarily
+ to ease the transition to the new meaning of YYERROR, for GCC.
+ Once GCC version 2 has supplanted version 1, this can go. */
+
+#define YYFAIL goto yyerrlab
+
+#define YYRECOVERING() (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ yytoken = YYTRANSLATE (yychar); \
+ YYPOPSTACK (1); \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (line, retval, YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+while (YYID (0))
+
+
+#define YYTERROR 1
+#define YYERRCODE 256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
+ while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+ This macro was not mandated originally: define only if we know
+ we won't break user code: when these are the locations we know. */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+# else
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments. */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval, line)
+#endif
+
+/* Enable debugging if requested. */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+# include /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value, line, retval); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, char **line, struct INPparseNode **retval)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, line, retval)
+ FILE *yyoutput;
+ int yytype;
+ YYSTYPE const * const yyvaluep;
+ char **line;
+ struct INPparseNode **retval;
+#endif
+{
+ if (!yyvaluep)
+ return;
+ YYUSE (line);
+ YYUSE (retval);
+# ifdef YYPRINT
+ if (yytype < YYNTOKENS)
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+ YYUSE (yyoutput);
+# endif
+ switch (yytype)
+ {
+ default:
+ break;
+ }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, char **line, struct INPparseNode **retval)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep, line, retval)
+ FILE *yyoutput;
+ int yytype;
+ YYSTYPE const * const yyvaluep;
+ char **line;
+ struct INPparseNode **retval;
+#endif
+{
+ if (yytype < YYNTOKENS)
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+ else
+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+ yy_symbol_value_print (yyoutput, yytype, yyvaluep, line, retval);
+ YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included). |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
+#endif
+{
+ YYFPRINTF (stderr, "Stack now");
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
+ YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced. |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, char **line, struct INPparseNode **retval)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule, line, retval)
+ YYSTYPE *yyvsp;
+ int yyrule;
+ char **line;
+ struct INPparseNode **retval;
+#endif
+{
+ int yynrhs = yyr2[yyrule];
+ int yyi;
+ unsigned long int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+ yyrule - 1, yylno);
+ /* The symbols being reduced. */
+ for (yyi = 0; yyi < yynrhs; yyi++)
+ {
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ , line, retval);
+ YYFPRINTF (stderr, "\n");
+ }
+}
+
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyvsp, Rule, line, retval); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks. */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+ if the built-in stack extension method is used).
+
+ Do not make this value too large; the results are undefined if
+ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+ evaluated with infinite-precision integer arithmetic. */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+# if defined __GLIBC__ && defined _STRING_H
+# define yystrlen strlen
+# else
+/* Return the length of YYSTR. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+ const char *yystr;
+#endif
+{
+ YYSIZE_T yylen;
+ for (yylen = 0; yystr[yylen]; yylen++)
+ continue;
+ return yylen;
+}
+# endif
+# endif
+
+# ifndef yystpcpy
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+# define yystpcpy stpcpy
+# else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ YYDEST. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+ char *yydest;
+ const char *yysrc;
+#endif
+{
+ char *yyd = yydest;
+ const char *yys = yysrc;
+
+ while ((*yyd++ = *yys++) != '\0')
+ continue;
+
+ return yyd - 1;
+}
+# endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+ quotes and backslashes, so that it's suitable for yyerror. The
+ heuristic is that double-quoting is unnecessary unless the string
+ contains an apostrophe, a comma, or backslash (other than
+ backslash-backslash). YYSTR is taken from yytname. If YYRES is
+ null, do not copy; instead, return the length of what the result
+ would have been. */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+ if (*yystr == '"')
+ {
+ YYSIZE_T yyn = 0;
+ char const *yyp = yystr;
+
+ for (;;)
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
+ do_not_strip_quotes: ;
+ }
+
+ if (! yyres)
+ return yystrlen (yystr);
+
+ return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+ YYCHAR while in state YYSTATE. Return the number of bytes copied,
+ including the terminating null byte. If YYRESULT is null, do not
+ copy anything; just return the number of bytes that would be
+ copied. As a special case, return 0 if an ordinary "syntax error"
+ message will do. Return YYSIZE_MAXIMUM if overflow occurs during
+ size calculation. */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+ int yyn = yypact[yystate];
+
+ if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+ return 0;
+ else
+ {
+ int yytype = YYTRANSLATE (yychar);
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ int yysize_overflow = 0;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ int yyx;
+
+# if 0
+ /* This is so xgettext sees the translatable formats that are
+ constructed on the fly. */
+ YY_("syntax error, unexpected %s");
+ YY_("syntax error, unexpected %s, expecting %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+ char *yyfmt;
+ char const *yyf;
+ static char const yyunexpected[] = "syntax error, unexpected %s";
+ static char const yyexpecting[] = ", expecting %s";
+ static char const yyor[] = " or %s";
+ char yyformat[sizeof yyunexpected
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
+ char const *yyprefix = yyexpecting;
+
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yycount = 1;
+
+ yyarg[0] = yytname[yytype];
+ yyfmt = yystpcpy (yyformat, yyunexpected);
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
+ }
+
+ yyf = YY_(yyformat);
+ yysize1 = yysize + yystrlen (yyf);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+
+ if (yysize_overflow)
+ return YYSIZE_MAXIMUM;
+
+ if (yyresult)
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yyresult;
+ int yyi = 0;
+ while ((*yyp = *yyf) != '\0')
+ {
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
+ }
+ }
+ return yysize;
+ }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol. |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, char **line, struct INPparseNode **retval)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep, line, retval)
+ const char *yymsg;
+ int yytype;
+ YYSTYPE *yyvaluep;
+ char **line;
+ struct INPparseNode **retval;
+#endif
+{
+ YYUSE (yyvaluep);
+ YYUSE (line);
+ YYUSE (retval);
+
+ if (!yymsg)
+ yymsg = "Deleting";
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+ switch (yytype)
+ {
+
+ default:
+ break;
+ }
+}
+
+/* Prevent warnings from -Wmissing-prototypes. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (char **line, struct INPparseNode **retval);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse. |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+ void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (char **line, struct INPparseNode **retval)
+#else
+int
+yyparse (line, retval)
+ char **line;
+ struct INPparseNode **retval;
+#endif
+#endif
+{
+/* The lookahead symbol. */
+int yychar;
+
+/* The semantic value of the lookahead symbol. */
+YYSTYPE yylval;
+
+ /* Number of syntax errors so far. */
+ int yynerrs;
+
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
+
+ YYSIZE_T yystacksize;
+
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+
+ /* The number of symbols on the RHS of the reduced rule.
+ Keep to zero when no symbol should be popped. */
+ int yylen = 0;
+
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
+ YYDPRINTF ((stderr, "Starting parse\n"));
+
+ yystate = 0;
+ yyerrstatus = 0;
+ yynerrs = 0;
+ yychar = YYEMPTY; /* Cause a token to be read. */
+
+ /* Initialize stack pointers.
+ Waste one element of value and location stack
+ so that they stay on the same level as the state stack.
+ The wasted elements are never initialized. */
+ yyssp = yyss;
+ yyvsp = yyvs;
+
+ goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate. |
+`------------------------------------------------------------*/
+ yynewstate:
+ /* In all cases, when you get here, the value and location stacks
+ have just been pushed. So pushing a state here evens the stacks. */
+ yyssp++;
+
+ yysetstate:
+ *yyssp = yystate;
+
+ if (yyss + yystacksize - 1 <= yyssp)
+ {
+ /* Get the current used size of the three stacks, in elements. */
+ YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+ {
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
+
+ yyss = yyss1;
+ yyvs = yyvs1;
+ }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto yyexhaustedlab;
+# else
+ /* Extend the stack our own way. */
+ if (YYMAXDEPTH <= yystacksize)
+ goto yyexhaustedlab;
+ yystacksize *= 2;
+ if (YYMAXDEPTH < yystacksize)
+ yystacksize = YYMAXDEPTH;
+
+ {
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+# undef YYSTACK_RELOCATE
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
+ }
+# endif
+#endif /* no yyoverflow */
+
+ yyssp = yyss + yysize - 1;
+ yyvsp = yyvs + yysize - 1;
+
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+ (unsigned long int) yystacksize));
+
+ if (yyss + yystacksize - 1 <= yyssp)
+ YYABORT;
+ }
+
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
+ goto yybackup;
+
+/*-----------.
+| yybackup. |
+`-----------*/
+yybackup:
+
+ /* Do appropriate processing given the current state. Read a
+ lookahead token if we need one and don't already have one. */
+
+ /* First try to decide what to do without reference to lookahead token. */
+ yyn = yypact[yystate];
+ if (yyn == YYPACT_NINF)
+ goto yydefault;
+
+ /* Not known => get a lookahead token if don't already have one. */
+
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ if (yychar == YYEMPTY)
+ {
+ YYDPRINTF ((stderr, "Reading a token: "));
+ yychar = YYLEX;
+ }
+
+ if (yychar <= YYEOF)
+ {
+ yychar = yytoken = YYEOF;
+ YYDPRINTF ((stderr, "Now at end of input.\n"));
+ }
+ else
+ {
+ yytoken = YYTRANSLATE (yychar);
+ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+ }
+
+ /* If the proper action on seeing token YYTOKEN is to reduce or to
+ detect an error, take that action. */
+ yyn += yytoken;
+ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+ goto yydefault;
+ yyn = yytable[yyn];
+ if (yyn <= 0)
+ {
+ if (yyn == 0 || yyn == YYTABLE_NINF)
+ goto yyerrlab;
+ yyn = -yyn;
+ goto yyreduce;
+ }
+
+ /* Count tokens shifted since error; after three, turn off error
+ status. */
+ if (yyerrstatus)
+ yyerrstatus--;
+
+ /* Shift the lookahead token. */
+ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
+
+ yystate = yyn;
+ *++yyvsp = yylval;
+
+ goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state. |
+`-----------------------------------------------------------*/
+yydefault:
+ yyn = yydefact[yystate];
+ if (yyn == 0)
+ goto yyerrlab;
+ goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction. |
+`-----------------------------*/
+yyreduce:
+ /* yyn is the number of a rule to reduce with. */
+ yylen = yyr2[yyn];
+
+ /* If YYLEN is nonzero, implement the default value of the action:
+ `$$ = $1'.
+
+ Otherwise, the following line sets YYVAL to garbage.
+ This behavior is undocumented and Bison
+ users should not rely upon it. Assigning to YYVAL
+ unconditionally makes the parser a bit smaller, and it avoids a
+ GCC warning that YYVAL may be used uninitialized. */
+ yyval = yyvsp[1-yylen];
+
+
+ YY_REDUCE_PRINT (yyn);
+ switch (yyn)
+ {
+ case 2:
+
+/* Line 1455 of yacc.c */
+#line 57 "inpptree-parser.y"
+ { *retval = (yyvsp[(1) - (1)].pnode); ;}
+ break;
+
+ case 3:
+
+/* Line 1455 of yacc.c */
+#line 61 "inpptree-parser.y"
+ { (yyval.pnode) = mknnode((yyvsp[(1) - (1)].num)); ;}
+ break;
+
+ case 4:
+
+/* Line 1455 of yacc.c */
+#line 62 "inpptree-parser.y"
+ { (yyval.pnode) = mksnode((yyvsp[(1) - (1)].str)); ;}
+ break;
+
+ case 5:
+
+/* Line 1455 of yacc.c */
+#line 64 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode("+", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+ case 6:
+
+/* Line 1455 of yacc.c */
+#line 65 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode("-", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+ case 7:
+
+/* Line 1455 of yacc.c */
+#line 66 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode("*", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+ case 8:
+
+/* Line 1455 of yacc.c */
+#line 67 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode("/", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+ case 9:
+
+/* Line 1455 of yacc.c */
+#line 68 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode("^", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+ case 10:
+
+/* Line 1455 of yacc.c */
+#line 70 "inpptree-parser.y"
+ { (yyval.pnode) = (yyvsp[(2) - (3)].pnode); ;}
+ break;
+
+ case 11:
+
+/* Line 1455 of yacc.c */
+#line 72 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("-",(yyvsp[(2) - (2)].pnode)); ;}
+ break;
+
+ case 12:
+
+/* Line 1455 of yacc.c */
+#line 74 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode((yyvsp[(1) - (4)].str), (yyvsp[(3) - (4)].pnode)); ;}
+ break;
+
+ case 13:
+
+/* Line 1455 of yacc.c */
+#line 76 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("ternary_fcn",
+ mkbnode(",",
+ mkbnode(",", (yyvsp[(1) - (5)].pnode), (yyvsp[(3) - (5)].pnode)),
+ (yyvsp[(5) - (5)].pnode))); ;}
+ break;
+
+ case 14:
+
+/* Line 1455 of yacc.c */
+#line 81 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("eq0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 15:
+
+/* Line 1455 of yacc.c */
+#line 82 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("ne0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 16:
+
+/* Line 1455 of yacc.c */
+#line 83 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("gt0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 17:
+
+/* Line 1455 of yacc.c */
+#line 84 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("lt0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 18:
+
+/* Line 1455 of yacc.c */
+#line 85 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("ge0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 19:
+
+/* Line 1455 of yacc.c */
+#line 86 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("le0", mkbnode("-",(yyvsp[(1) - (3)].pnode),(yyvsp[(3) - (3)].pnode))); ;}
+ break;
+
+ case 20:
+
+/* Line 1455 of yacc.c */
+#line 88 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("ne0",
+ mkbnode("+",
+ mkfnode("ne0", (yyvsp[(1) - (3)].pnode)),
+ mkfnode("ne0", (yyvsp[(3) - (3)].pnode)))); ;}
+ break;
+
+ case 21:
+
+/* Line 1455 of yacc.c */
+#line 92 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("eq0",
+ mkbnode("+",
+ mkfnode("eq0", (yyvsp[(1) - (3)].pnode)),
+ mkfnode("eq0", (yyvsp[(3) - (3)].pnode)))); ;}
+ break;
+
+ case 22:
+
+/* Line 1455 of yacc.c */
+#line 96 "inpptree-parser.y"
+ { (yyval.pnode) = mkfnode("eq0", (yyvsp[(2) - (2)].pnode)); ;}
+ break;
+
+ case 24:
+
+/* Line 1455 of yacc.c */
+#line 102 "inpptree-parser.y"
+ { (yyval.pnode) = mkbnode(",", (yyvsp[(1) - (3)].pnode), (yyvsp[(3) - (3)].pnode)); ;}
+ break;
+
+
+
+/* Line 1455 of yacc.c */
+#line 1578 "inpptree-parser.c"
+ default: break;
+ }
+ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+ YYPOPSTACK (yylen);
+ yylen = 0;
+ YY_STACK_PRINT (yyss, yyssp);
+
+ *++yyvsp = yyval;
+
+ /* Now `shift' the result of the reduction. Determine what state
+ that goes to, based on the state we popped back to and the rule
+ number reduced by. */
+
+ yyn = yyr1[yyn];
+
+ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+ yystate = yytable[yystate];
+ else
+ yystate = yydefgoto[yyn - YYNTOKENS];
+
+ goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+ /* If not already recovering from an error, report this error. */
+ if (!yyerrstatus)
+ {
+ ++yynerrs;
+#if ! YYERROR_VERBOSE
+ yyerror (line, retval, YY_("syntax error"));
+#else
+ {
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ {
+ YYSIZE_T yyalloc = 2 * yysize;
+ if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+ yyalloc = YYSTACK_ALLOC_MAXIMUM;
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+ if (yymsg)
+ yymsg_alloc = yyalloc;
+ else
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ }
+ }
+
+ if (0 < yysize && yysize <= yymsg_alloc)
+ {
+ (void) yysyntax_error (yymsg, yystate, yychar);
+ yyerror (line, retval, yymsg);
+ }
+ else
+ {
+ yyerror (line, retval, YY_("syntax error"));
+ if (yysize != 0)
+ goto yyexhaustedlab;
+ }
+ }
+#endif
+ }
+
+
+
+ if (yyerrstatus == 3)
+ {
+ /* If just tried and failed to reuse lookahead token after an
+ error, discard it. */
+
+ if (yychar <= YYEOF)
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
+ else
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval, line, retval);
+ yychar = YYEMPTY;
+ }
+ }
+
+ /* Else will try to reuse lookahead token after shifting the error
+ token. */
+ goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR. |
+`---------------------------------------------------*/
+yyerrorlab:
+
+ /* Pacify compilers like GCC when the user code never invokes
+ YYERROR and the label yyerrorlab therefore never appears in user
+ code. */
+ if (/*CONSTCOND*/ 0)
+ goto yyerrorlab;
+
+ /* Do not reclaim the symbols of the rule which action triggered
+ this YYERROR. */
+ YYPOPSTACK (yylen);
+ yylen = 0;
+ YY_STACK_PRINT (yyss, yyssp);
+ yystate = *yyssp;
+ goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR. |
+`-------------------------------------------------------------*/
+yyerrlab1:
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
+
+ for (;;)
+ {
+ yyn = yypact[yystate];
+ if (yyn != YYPACT_NINF)
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
+
+ /* Pop the current state because it cannot handle the error token. */
+ if (yyssp == yyss)
+ YYABORT;
+
+
+ yydestruct ("Error: popping",
+ yystos[yystate], yyvsp, line, retval);
+ YYPOPSTACK (1);
+ yystate = *yyssp;
+ YY_STACK_PRINT (yyss, yyssp);
+ }
+
+ *++yyvsp = yylval;
+
+
+ /* Shift the error token. */
+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+ yystate = yyn;
+ goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here. |
+`-------------------------------------*/
+yyacceptlab:
+ yyresult = 0;
+ goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here. |
+`-----------------------------------*/
+yyabortlab:
+ yyresult = 1;
+ goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here. |
+`-------------------------------------------------*/
+yyexhaustedlab:
+ yyerror (line, retval, YY_("memory exhausted"));
+ yyresult = 2;
+ /* Fall through. */
+#endif
+
+yyreturn:
+ if (yychar != YYEMPTY)
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval, line, retval);
+ /* Do not reclaim the symbols of the rule which action triggered
+ this YYABORT or YYACCEPT. */
+ YYPOPSTACK (yylen);
+ YY_STACK_PRINT (yyss, yyssp);
+ while (yyssp != yyss)
+ {
+ yydestruct ("Cleanup: popping",
+ yystos[*yyssp], yyvsp, line, retval);
+ YYPOPSTACK (1);
+ }
+#ifndef yyoverflow
+ if (yyss != yyssa)
+ YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+#endif
+ /* Make sure YYID is used. */
+ return YYID (yyresult);
+}
+
+
+
+/* Line 1675 of yacc.c */
+#line 104 "inpptree-parser.y"
+
+
+
+/* Called by yyparse on error. */
+static void
+PTerror (char **line, struct INPparseNode **retval, char const *s)
+{
+ fprintf (stderr, "%s: %s\n", __func__, s);
+}
+
diff --git a/src/spicelib/parser/inpptree-parser.h b/src/spicelib/parser/inpptree-parser.h
new file mode 100644
index 000000000..84b70da1d
--- /dev/null
+++ b/src/spicelib/parser/inpptree-parser.h
@@ -0,0 +1,81 @@
+
+/* A Bison parser, made by GNU Bison 2.4.1. */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ 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 . */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ TOK_NUM = 258,
+ TOK_STR = 259,
+ TOK_LE = 260,
+ TOK_LT = 261,
+ TOK_GE = 262,
+ TOK_GT = 263,
+ TOK_EQ = 264,
+ TOK_NE = 265,
+ TOK_OR = 266,
+ TOK_AND = 267,
+ NEG = 268
+ };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1740 of yacc.c */
+#line 29 "inpptree-parser.y"
+
+ double num;
+ const char *str;
+ struct INPparseNode *pnode;
+
+
+
+/* Line 1740 of yacc.c */
+#line 73 "inpptree-parser.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+
+
diff --git a/src/spicelib/parser/inpptree-parser.y b/src/spicelib/parser/inpptree-parser.y
new file mode 100644
index 000000000..6ef761d19
--- /dev/null
+++ b/src/spicelib/parser/inpptree-parser.y
@@ -0,0 +1,112 @@
+%{
+
+ #include
+ #include "inpptree-parser.h"
+
+ extern int PTlex (YYSTYPE *lvalp, char **line);
+ extern int PTparse (char **line, struct INPparseNode **retval);
+
+ static void PTerror (char **line, struct INPparseNode **retval, char const *);
+
+ #if defined (_MSC_VER)
+ # define __func__ __FUNCTION__ /* __func__ is C99, but MSC can't */
+ #endif
+
+%}
+
+%name-prefix="PT"
+%output="inpptree-parser.c"
+
+%defines
+
+%pure-parser
+
+%parse-param {char **line}
+%lex-param {char **line}
+
+%parse-param {struct INPparseNode **retval}
+
+%union {
+ double num;
+ const char *str;
+ struct INPparseNode *pnode;
+}
+
+%token TOK_NUM
+%token TOK_STR
+%token TOK_LE TOK_LT TOK_GE TOK_GT TOK_EQ TOK_NE
+
+%type exp nonempty_arglist
+
+// Operator Precedence
+
+%left ','
+%right '?' ':'
+%left TOK_OR
+%left TOK_AND
+%left TOK_EQ TOK_NE
+%left TOK_LE TOK_LT TOK_GE TOK_GT
+%left '-' '+'
+%left '*' '/'
+%left '^' /* exponentiation */
+%left NEG '!' /* negation--unary minus, and boolean not */
+
+%%
+
+expression:
+ exp { *retval = $1; }
+ ;
+
+exp:
+ TOK_NUM { $$ = mknnode($1); }
+ | TOK_STR { $$ = mksnode($1); }
+
+ | exp '+' exp { $$ = mkbnode("+", $1, $3); }
+ | exp '-' exp { $$ = mkbnode("-", $1, $3); }
+ | exp '*' exp { $$ = mkbnode("*", $1, $3); }
+ | exp '/' exp { $$ = mkbnode("/", $1, $3); }
+ | exp '^' exp { $$ = mkbnode("^", $1, $3); }
+
+ | '(' exp ')' { $$ = $2; }
+
+ | '-' exp %prec NEG { $$ = mkfnode("-",$2); }
+
+ | TOK_STR '(' nonempty_arglist ')' { $$ = mkfnode($1, $3); }
+
+ | exp '?' exp ':' exp { $$ = mkfnode("ternary_fcn",
+ mkbnode(",",
+ mkbnode(",", $1, $3),
+ $5)); }
+
+ | exp TOK_EQ exp { $$ = mkfnode("eq0", mkbnode("-",$1,$3)); }
+ | exp TOK_NE exp { $$ = mkfnode("ne0", mkbnode("-",$1,$3)); }
+ | exp TOK_GT exp { $$ = mkfnode("gt0", mkbnode("-",$1,$3)); }
+ | exp TOK_LT exp { $$ = mkfnode("lt0", mkbnode("-",$1,$3)); }
+ | exp TOK_GE exp { $$ = mkfnode("ge0", mkbnode("-",$1,$3)); }
+ | exp TOK_LE exp { $$ = mkfnode("le0", mkbnode("-",$1,$3)); }
+
+ | exp TOK_OR exp { $$ = mkfnode("ne0",
+ mkbnode("+",
+ mkfnode("ne0", $1),
+ mkfnode("ne0", $3))); }
+ | exp TOK_AND exp { $$ = mkfnode("eq0",
+ mkbnode("+",
+ mkfnode("eq0", $1),
+ mkfnode("eq0", $3))); }
+ | '!' exp { $$ = mkfnode("eq0", $2); }
+
+ ;
+
+nonempty_arglist:
+ exp
+ | nonempty_arglist ',' exp { $$ = mkbnode(",", $1, $3); }
+
+%%
+
+
+/* Called by yyparse on error. */
+static void
+PTerror (char **line, struct INPparseNode **retval, char const *s)
+{
+ fprintf (stderr, "%s: %s\n", __func__, s);
+}
diff --git a/src/spicelib/parser/inpptree.c b/src/spicelib/parser/inpptree.c
index 5db3690ec..467f3fd3b 100644
--- a/src/spicelib/parser/inpptree.c
+++ b/src/spicelib/parser/inpptree.c
@@ -16,15 +16,14 @@ static INPparseNode *mkb(int type, INPparseNode * left,
INPparseNode * right);
static INPparseNode *mkf(int type, INPparseNode * arg);
static int PTcheck(INPparseNode * p);
-static INPparseNode *PTparse(char **line);
-static INPparseNode *makepnode(PTelement * elem);
-static INPparseNode *mkbnode(int opnum, INPparseNode * arg1,
+static INPparseNode *mkbnode(const char *opstr, INPparseNode * arg1,
INPparseNode * arg2);
-static INPparseNode *mkfnode(char *fname, INPparseNode * arg);
+static INPparseNode *mkfnode(const char *fname, INPparseNode * arg);
static INPparseNode *mknnode(double number);
-static INPparseNode *mksnode(char *string);
+static INPparseNode *mksnode(const char *string);
static INPparseNode *PTdifferentiate(INPparseNode * p, int varnum);
-static PTelement *PTlexer(char **line);
+
+#include "inpptree-parser.c"
static IFvalue *values = NULL;
static int *types;
@@ -85,7 +84,13 @@ static struct func {
/* MW. cif function added */
{ "u2", PTF_USTEP2, PTustep2},
{ "pwl", PTF_PWL, PTpwl},
- { "pwl_derivative", PTF_PWL_DERIVATIVE, PTpwl_derivative}
+ { "pwl_derivative", PTF_PWL_DERIVATIVE, PTpwl_derivative},
+ { "eq0", PTF_EQ0, PTeq0},
+ { "ne0", PTF_NE0, PTne0},
+ { "gt0", PTF_GT0, PTgt0},
+ { "lt0", PTF_LT0, PTlt0},
+ { "ge0", PTF_GE0, PTge0},
+ { "le0", PTF_LE0, PTle0},
} ;
#define NUM_FUNCS (sizeof (funcs) / sizeof (struct func))
@@ -112,7 +117,7 @@ void
INPgetTree(char **line, INPparseTree ** pt, void *ckt, INPtables * tab)
{
INPparseNode *p;
- int i;
+ int i, rv;
values = NULL;
types = NULL;
@@ -121,9 +126,13 @@ INPgetTree(char **line, INPparseTree ** pt, void *ckt, INPtables * tab)
circuit = ckt;
tables = tab;
- p = PTparse(line);
+#ifdef TRACE
+ fprintf(stderr,"%s, line = \"%s\"\n", __func__, *line);
+#endif
- if (!p || !PTcheck(p)) {
+ rv = PTparse(line, &p);
+
+ if (rv || !PTcheck(p)) {
*pt = NULL;
return;
}
@@ -390,6 +399,12 @@ static INPparseNode *PTdifferentiate(INPparseNode * p, int varnum)
break;
case PTF_USTEP:
+ case PTF_EQ0:
+ case PTF_NE0:
+ case PTF_GT0:
+ case PTF_LT0:
+ case PTF_GE0:
+ case PTF_LE0:
arg1 = mkcon((double) 0.0);
break;
@@ -615,182 +630,25 @@ static int PTcheck(INPparseNode * p)
}
}
-/* The operator-precedence table for the parser. */
-
-#define G 1 /* Greater than. */
-#define L 2 /* Less than. */
-#define E 3 /* Equal. */
-#define R 4 /* Error. */
-
-static char prectable[11][11] = {
- /* $ + - * / ^ u- ( ) v , */
-/* $ */ {R, L, L, L, L, L, L, L, R, L, R},
-/* + */ {G, G, G, L, L, L, L, L, G, L, G},
-/* - */ {G, G, G, L, L, L, L, L, G, L, G},
-/* * */ {G, G, G, G, G, L, L, L, G, L, G},
-/* / */ {G, G, G, G, G, L, L, L, G, L, G},
-/* ^ */ {G, G, G, G, G, L, L, L, G, L, G},
-/* u-*/ {G, G, G, G, G, G, G, L, G, L, G},
-/* ( */ {R, L, L, L, L, L, L, L, E, L, L},
-/* ) */ {G, G, G, G, G, G, G, R, G, R, G},
-/* v */ {G, G, G, G, G, G, G, G, G, R, G},
-/* , */ {G, L, L, L, L, L, L, L, G, L, G}
-
-};
-
-/* Return an expr. */
-
-static INPparseNode *PTparse(char **line)
-{
- PTelement stack[PT_STACKSIZE];
- int sp = 0, st, i;
- PTelement *top, *next;
- INPparseNode *pn, *lpn, *rpn;
-
- stack[0].token = TOK_END;
- next = PTlexer(line);
-
- while ((sp > 1) || (next->token != TOK_END)) {
- /* Find the top-most terminal. */
- i = sp;
- do {
- top = &stack[i--];
- } while (top->token == TOK_VALUE);
-
-
- switch (prectable[top->token][next->token]) {
- case L:
- case E:
- /* Push the token read. */
- if (sp == (PT_STACKSIZE - 1)) {
- fprintf(stderr, "Error: stack overflow\n");
- return (NULL);
- }
- bcopy((char *) next, (char *) &stack[++sp], sizeof(PTelement));
- next = PTlexer(line);
- continue;
-
- case R:
- fprintf(stderr, "Syntax error.\n");
- return (NULL);
-
- case G:
- /* Reduce. Make st and sp point to the elts on the
- * stack at the end and beginning of the junk to
- * reduce, then try and do some stuff. When scanning
- * back for a <, ignore VALUES.
- */
- st = sp;
- if (stack[sp].token == TOK_VALUE)
- sp--;
- while (sp > 0) {
- if (stack[sp - 1].token == TOK_VALUE)
- i = 2; /* No 2 pnodes together... */
- else
- i = 1;
- if (prectable[stack[sp - i].token]
- [stack[sp].token] == L)
- break;
- else
- sp = sp - i;
- }
- if (stack[sp - 1].token == TOK_VALUE)
- sp--;
- /* Now try and see what we can make of this.
- * The possibilities are: - node
- * node op node
- * ( node )
- * func ( node )
- * func ( node, node, node, ... ) <- new
- * node
- */
- if (st == sp) {
- pn = makepnode(&stack[st]);
- if (pn == NULL)
- goto err;
- } else if ((stack[sp].token == TOK_UMINUS) && (st == sp + 1)) {
- lpn = makepnode(&stack[st]);
- if (lpn == NULL)
- goto err;
- pn = mkfnode("-", lpn);
- } else if ((stack[sp].token == TOK_LPAREN) &&
- (stack[st].token == TOK_RPAREN)) {
- pn = makepnode(&stack[sp + 1]);
- if (pn == NULL)
- goto err;
- } else if ((stack[sp + 1].token == TOK_LPAREN) &&
- (stack[st].token == TOK_RPAREN)) {
- lpn = makepnode(&stack[sp + 2]);
- if ((lpn == NULL) || (stack[sp].type != TYP_STRING))
- goto err;
- if (!(pn = mkfnode(stack[sp].value.string, lpn)))
- return (NULL);
- } else { /* node op node */
- lpn = makepnode(&stack[sp]);
- rpn = makepnode(&stack[st]);
- if ((lpn == NULL) || (rpn == NULL))
- goto err;
- pn = mkbnode(stack[sp + 1].token, lpn, rpn);
- }
- stack[sp].token = TOK_VALUE;
- stack[sp].type = TYP_PNODE;
- stack[sp].value.pnode = pn;
- continue;
- }
- }
- pn = makepnode(&stack[1]);
- if (pn)
- return (pn);
- err:
- fprintf(stderr, "Syntax error.\n");
- return (NULL);
-}
-
-/* Given a pointer to an element, make a pnode out of it (if it already
- * is one, return a pointer to it). If it isn't of type VALUE, then return
- * NULL.
- */
-
-static INPparseNode *makepnode(PTelement * elem)
-{
- if (elem->token != TOK_VALUE)
- return (NULL);
-
- switch (elem->type) {
- case TYP_STRING:
- return (mksnode(elem->value.string));
-
- case TYP_NUM:
- return (mknnode(elem->value.real));
-
- case TYP_PNODE:
- return (elem->value.pnode);
-
- default:
- fprintf(stderr, "Internal Error: bad token type\n");
- return (NULL);
- }
-}
-
/* Binop node. */
-static INPparseNode *mkbnode(int opnum, INPparseNode * arg1,
+static INPparseNode *mkbnode(const char *opstr, INPparseNode * arg1,
INPparseNode * arg2)
{
INPparseNode *p;
int i;
for (i = 0; i < NUM_OPS; i++)
- if (ops[i].number == opnum)
+ if (!strcmp(ops[i].name, opstr))
break;
if (i == NUM_OPS) {
- fprintf(stderr, "Internal Error: no such op num %d\n", opnum);
+ fprintf(stderr, "Internal Error: no such op num %s\n", opstr);
return (NULL);
}
p = (INPparseNode *) MALLOC(sizeof(INPparseNode));
- p->type = opnum;
+ p->type = ops[i].number;
p->funcname = ops[i].name;
p->function = ops[i].funcptr;
p->left = arg1;
@@ -885,7 +743,7 @@ static INPparseNode *prepare_PTF_PWL(INPparseNode *p)
}
-static INPparseNode *mkfnode(char *fname, INPparseNode * arg)
+static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
{
int i;
INPparseNode *p;
@@ -1033,7 +891,7 @@ static INPparseNode *mknnode(double number)
/* String node. */
-static INPparseNode *mksnode(char *string)
+static INPparseNode *mksnode(const char *string)
{
int i, j;
char buf[128], *s;
@@ -1083,7 +941,7 @@ static INPparseNode *mksnode(char *string)
if (i == NUM_CONSTANTS) {
/* We'd better save this in case it's part of i(something). */
p->type = PT_PLACEHOLDER;
- p->funcname = string;
+ p->funcname = (/*nonconst*/ char *) string;
} else {
p->type = PT_CONSTANT;
p->constant = constants[i].value;
@@ -1094,110 +952,142 @@ static INPparseNode *mksnode(char *string)
/* The lexical analysis routine. */
-static PTelement *PTlexer(char **line)
+int PTlex (YYSTYPE *lvalp, char **line)
{
double td;
int err;
- static PTelement el;
static char *specials = " \t()^+-*/,";
- static int lasttoken = TOK_END, lasttype;
char *sbuf, *s;
+ int token;
sbuf = *line;
#ifdef TRACE
- printf("entering lexer, sbuf = '%s', lastoken = %d, lasttype = %d\n",
- sbuf, lasttoken, lasttype);
+// printf("entering lexer, sbuf = '%s', lastoken = %d, lasttype = %d\n",
+// sbuf, lasttoken, lasttype);
#endif
- while ((*sbuf == ' ') || (*sbuf == '\t') || (*sbuf == '='))
+ while ((*sbuf == ' ') || (*sbuf == '\t'))
sbuf++;
switch (*sbuf) {
case '\0':
- el.token = TOK_END;
+ token = 0;
break;
+ case '?':
+ case ':':
case ',':
- el.token = TOK_COMMA;
- sbuf++;
- break;
-
case '-':
- if ((lasttoken == TOK_VALUE) || (lasttoken == TOK_RPAREN))
- el.token = TOK_MINUS;
- else
- el.token = TOK_UMINUS;
- sbuf++;
- break;
-
case '+':
- el.token = TOK_PLUS;
- sbuf++;
+ case '/':
+ case '^':
+ case '(':
+ case ')':
+ token = *sbuf++;
break;
case '*':
- el.token = TOK_TIMES;
- sbuf++;
- break;
+ if(sbuf[1] == '*') {
+ sbuf += 2;
+ token = '^'; /* `**' is exponentiation */
+ break;
+ } else {
+ token = *sbuf++;
+ break;
+ }
- case '/':
- el.token = TOK_DIVIDE;
- sbuf++;
- break;
+ case '&':
+ if(sbuf[1] == '&') {
+ sbuf += 2;
+ token = TOK_AND;
+ break;
+ } else {
+ token = *sbuf++;
+ break;
+ }
- case '^':
- el.token = TOK_POWER;
- sbuf++;
- break;
+ case '|':
+ if(sbuf[1] == '|') {
+ sbuf += 2;
+ token = TOK_OR;
+ break;
+ } else {
+ token = *sbuf++;
+ break;
+ }
- case '(':
- if (((lasttoken == TOK_VALUE) && ((lasttype == TYP_NUM))) ||
- (lasttoken == TOK_RPAREN)) {
- el.token = TOK_END;
- } else {
- el.token = TOK_LPAREN;
- sbuf++;
- }
- break;
+ case '=':
+ if(sbuf[1] == '=') {
+ sbuf += 2;
+ token = TOK_EQ;
+ break;
+ } else {
+ token = *sbuf++;
+ break;
+ }
- case ')':
- el.token = TOK_RPAREN;
- sbuf++;
- break;
+ case '!':
+ if(sbuf[1] == '=') {
+ sbuf += 2;
+ token = TOK_NE;
+ break;
+ } else {
+ token = *sbuf++;
+ break;
+ }
+
+ case '>':
+ if(sbuf[1] == '=') {
+ sbuf += 2;
+ token = TOK_GE;
+ break;
+ } else {
+ sbuf += 1;
+ token = TOK_GT;
+ break;
+ }
+
+ case '<':
+ if(sbuf[1] == '>') {
+ sbuf += 2;
+ token = TOK_NE;
+ break;
+ }
+ else if(sbuf[1] == '=') {
+ sbuf += 2;
+ token = TOK_LE;
+ break;
+ } else {
+ sbuf += 1;
+ token = TOK_LT;
+ break;
+ }
default:
- if ((lasttoken == TOK_VALUE) || (lasttoken == TOK_RPAREN)) {
- el.token = TOK_END;
- break;
- }
-
td = INPevaluate(&sbuf, &err, 1);
if (err == OK) {
- el.token = TOK_VALUE;
- el.type = TYP_NUM;
- el.value.real = td;
+ token = TOK_NUM;
+ lvalp->num = td;
} else {
- el.token = TOK_VALUE;
- el.type = TYP_STRING;
+ char *tmp;
+ token = TOK_STR;
for (s = sbuf; *s; s++)
if (index(specials, *s))
break;
- el.value.string = MALLOC(s - sbuf + 1);
- strncpy(el.value.string, sbuf, s - sbuf);
- el.value.string[s - sbuf] = '\0';
+ tmp = MALLOC(s - sbuf + 1);
+ strncpy(tmp, sbuf, s - sbuf);
+ tmp[s - sbuf] = '\0';
+ lvalp->str = tmp;
sbuf = s;
}
}
- lasttoken = el.token;
- lasttype = el.type;
-
*line = sbuf;
#ifdef TRACE
- printf("PTlexer: token = %d, type = %d, left = '%s'\n",
- el.token, el.type, sbuf);
+// printf("PTlexer: token = %d, type = %d, left = '%s'\n",
+// el.token, el.type, sbuf); */
#endif
- return (&el);
+ return (token);
}
#ifdef TRACE
diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c
index 6bf767a64..6fd075863 100644
--- a/src/spicelib/parser/ptfuncs.c
+++ b/src/spicelib/parser/ptfuncs.c
@@ -162,6 +162,41 @@ PTustep2(double arg)
return 1.0;
}
+double
+PTeq0(double arg)
+{
+ return (arg == 0.0) ? 1.0 : 0.0;
+}
+
+double
+PTne0(double arg)
+{
+ return (arg != 0.0) ? 1.0 : 0.0;
+}
+
+double
+PTgt0(double arg)
+{
+ return (arg > 0.0) ? 1.0 : 0.0;
+}
+
+double
+PTlt0(double arg)
+{
+ return (arg < 0.0) ? 1.0 : 0.0;
+}
+
+double
+PTge0(double arg)
+{
+ return (arg >= 0.0) ? 1.0 : 0.0;
+}
+
+double
+PTle0(double arg)
+{
+ return (arg <= 0.0) ? 1.0 : 0.0;
+}
double
PTuramp(double arg)