Browse Source

drop yyparse() prototypes, require bison >= 2.7 which emits them

pre-master-46
rlar 11 years ago
parent
commit
45117c94fd
  1. 1
      src/frontend/parse-bison-y.h
  2. 1
      src/frontend/parse-bison.y
  3. 2
      src/frontend/parse.c
  4. 1
      src/spicelib/parser/inpptree-parser-y.h
  5. 1
      src/spicelib/parser/inpptree-parser.y
  6. 2
      src/spicelib/parser/inpptree.c

1
src/frontend/parse-bison-y.h

@ -3,7 +3,6 @@ struct PPltype {
}; };
extern int PPlex(YYSTYPE *lvalp, struct PPltype *llocp, char **line); extern int PPlex(YYSTYPE *lvalp, struct PPltype *llocp, char **line);
extern int PPdebug;
extern struct pnode *PP_mkunode(int op, struct pnode *arg); extern struct pnode *PP_mkunode(int op, struct pnode *arg);
extern struct pnode *PP_mkfnode(const char *func, struct pnode *arg); extern struct pnode *PP_mkfnode(const char *func, struct pnode *arg);

1
src/frontend/parse-bison.y

@ -29,6 +29,7 @@
static void PPerror (YYLTYPE *locp, char **line, struct pnode **retval, char const *); static void PPerror (YYLTYPE *locp, char **line, struct pnode **retval, char const *);
%} %}
%require "2.7"
%name-prefix "PP" %name-prefix "PP"
%defines %defines

2
src/frontend/parse.c

@ -22,8 +22,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
static bool checkvalid(struct pnode *pn); static bool checkvalid(struct pnode *pn);
extern int PPparse(char **, struct pnode **);
void db_print_pnode_tree(struct pnode *p, char *print); void db_print_pnode_tree(struct pnode *p, char *print);

1
src/spicelib/parser/inpptree-parser-y.h

@ -3,7 +3,6 @@ struct PTltype {
}; };
extern int PTlex(YYSTYPE *lvalp, struct PTltype *llocp, char **line); extern int PTlex(YYSTYPE *lvalp, struct PTltype *llocp, char **line);
extern int PTdebug;
extern INPparseNode *PT_mkbnode(const char *opstr, INPparseNode *arg1, INPparseNode *arg2); extern INPparseNode *PT_mkbnode(const char *opstr, INPparseNode *arg1, INPparseNode *arg2);
extern INPparseNode *PT_mkfnode(const char *fname, INPparseNode *arg); extern INPparseNode *PT_mkfnode(const char *fname, INPparseNode *arg);

1
src/spicelib/parser/inpptree-parser.y

@ -28,6 +28,7 @@
static void PTerror (YYLTYPE *locp, char **line, struct INPparseNode **retval, void *ckt, char const *); static void PTerror (YYLTYPE *locp, char **line, struct INPparseNode **retval, void *ckt, char const *);
%} %}
%require "2.7"
%name-prefix "PT" %name-prefix "PT"
%defines %defines

2
src/spicelib/parser/inpptree.c

@ -14,8 +14,6 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group
#include "inpptree-parser.h" #include "inpptree-parser.h"
#include "inpptree-parser-y.h" #include "inpptree-parser-y.h"
int PTparse(char **line, INPparseNode **p, CKTcircuit *ckt);
static INPparseNode *mkcon(double value); static INPparseNode *mkcon(double value);
static INPparseNode *mkb(int type, INPparseNode * left, static INPparseNode *mkb(int type, INPparseNode * left,
INPparseNode * right); INPparseNode * right);

Loading…
Cancel
Save