Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 51e8a1d

Browse files
Jan WieckJan Wieck
Jan Wieck
authored and
Jan Wieck
committed
New prebuilt versions of gram.c and scan.c for the mixed case
identifier support. Jan
1 parent c42b959 commit 51e8a1d

File tree

2 files changed

+243
-265
lines changed

2 files changed

+243
-265
lines changed

src/pl/plpgsql/src/gram.c

+22-8
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
* procedural language
6666
*
6767
* IDENTIFICATION
68-
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/gram.c,v 1.2 1998/12/18 19:45:38 momjian Exp $
68+
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/gram.c,v 1.3 1999/01/28 11:50:41 wieck Exp $
6969
*
7070
* This software is copyrighted by Jan Wieck - Hamburg.
7171
*
@@ -414,7 +414,7 @@ static const short yycheck[] = { 21,
414414
152, 62
415415
};
416416
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
417-
#line 3 "/usr/local/bison/bison.simple"
417+
#line 3 "/usr/share/bison.simple"
418418

419419
/* Skeleton output parser for bison,
420420
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -467,6 +467,16 @@ void *alloca ();
467467
#endif /* not GNU C. */
468468
#endif /* alloca not defined. */
469469

470+
#ifdef __cplusplus
471+
extern "C" {
472+
void yyerror(char *);
473+
int yylex();
474+
};
475+
#else
476+
extern void yyerror(char *);
477+
extern int yylex();
478+
#endif
479+
470480
/* This is the parser code that is written into each bison parser
471481
when the %semantic_parser declaration is not specified in the grammar.
472482
It was written by Richard Stallman by simplifying the hairy parser
@@ -563,9 +573,13 @@ int yydebug; /* nonzero means print parse trace */
563573
#define YYMAXDEPTH 10000
564574
#endif
565575

576+
#ifndef YYPARSE_RETURN_TYPE
577+
#define YYPARSE_RETURN_TYPE int
578+
#endif
579+
566580
/* Prevent warning if -Wstrict-prototypes. */
567581
#ifdef __GNUC__
568-
int yyparse (void);
582+
YYPARSE_RETURN_TYPE yyparse (void);
569583
#endif
570584

571585
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
@@ -607,7 +621,7 @@ __yy_memcpy (char *to, char *from, int count)
607621
#endif
608622
#endif
609623

610-
#line 196 "/usr/local/bison/bison.simple"
624+
#line 196 "/usr/share/bison.simple"
611625

612626
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
613627
into yyparse. The argument should have type void *.
@@ -628,7 +642,7 @@ __yy_memcpy (char *to, char *from, int count)
628642
#define YYPARSE_PARAM_DECL
629643
#endif /* not YYPARSE_PARAM */
630644

631-
int
645+
YYPARSE_RETURN_TYPE
632646
yyparse(YYPARSE_PARAM_ARG)
633647
YYPARSE_PARAM_DECL
634648
{
@@ -1086,7 +1100,7 @@ case 23:
10861100
char *name;
10871101

10881102
plpgsql_ns_setlocal(false);
1089-
name = plpgsql_tolower(pstrdup(yytext));
1103+
name = plpgsql_tolower(yytext);
10901104
if (name[0] != '$') {
10911105
elog(ERROR, "can only alias positional parameters");
10921106
}
@@ -1116,7 +1130,7 @@ case 25:
11161130
case 26:
11171131
#line 376 "gram.y"
11181132
{
1119-
yyval.str = plpgsql_tolower(pstrdup(yytext));
1133+
yyval.str = plpgsql_tolower(yytext);
11201134
;
11211135
break;}
11221136
case 27:
@@ -1891,7 +1905,7 @@ case 105:
18911905
break;}
18921906
}
18931907
/* the action file gets copied in in place of this dollarsign */
1894-
#line 498 "/usr/local/bison/bison.simple"
1908+
#line 498 "/usr/share/bison.simple"
18951909

18961910
yyvsp -= yylen;
18971911
yyssp -= yylen;

0 commit comments

Comments
 (0)