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

Commit 030a283

Browse files
committed
Move parse2.pl to parse.pl
We have a SCM, so we don't need to keep old versions of files around.
1 parent 2fccc88 commit 030a283

File tree

5 files changed

+590
-1089
lines changed

5 files changed

+590
-1089
lines changed

src/interfaces/ecpg/preproc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ else
5757
@$(missing) flex $< $@
5858
endif
5959

60-
preproc.y: ../../../backend/parser/gram.y parse2.pl ecpg.addons ecpg.header ecpg.tokens ecpg.trailer ecpg.type
61-
$(PERL) $(srcdir)/parse2.pl $(srcdir) < $< > $@
60+
preproc.y: ../../../backend/parser/gram.y parse.pl ecpg.addons ecpg.header ecpg.tokens ecpg.trailer ecpg.type
61+
$(PERL) $(srcdir)/parse.pl $(srcdir) < $< > $@
6262
$(PERL) $(srcdir)/check_rules.pl $(srcdir) $<
6363

6464
ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h

src/interfaces/ecpg/preproc/README.parser

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ECPG modifies and extends the core grammar in a way that
33
defined in ecpg.tokens, types are defined in ecpg.type
44
2) most tokens from the core grammar are simply converted
55
to literals concatenated together to form the SQL string
6-
passed to the server, this is done by parse2.pl.
6+
passed to the server, this is done by parse.pl.
77
3) some rules need side-effects, actions are either added
88
or completely overridden (compared to the basic token
99
concatenation) for them, these are defined in ecpg.addons,
@@ -20,7 +20,7 @@ rules concatenated together. e.g. if gram.y has this:
2020
ruleA: tokenA tokenB tokenC {...}
2121
then "dumpedtokens" is "ruleAtokenAtokenBtokenC".
2222
"postfix" above can be:
23-
a) "block" - the automatic rule created by parse2.pl is completely
23+
a) "block" - the automatic rule created by parse.pl is completely
2424
overridden, the code block has to be written completely as
2525
it were in a plain bison grammar
2626
b) "rule" - the automatic rule is extended on, so new syntaxes

src/interfaces/ecpg/preproc/ecpg.trailer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ ECPGCKeywords: S_AUTO { $$ = mm_strdup("auto"); }
15911591
* CONNECTION can be added back in all_unreserved_keyword, but CURRENT and
15921592
* INPUT are reserved for ecpg purposes.
15931593
*
1594-
* The mentioned exclusions are done by $replace_line settings in parse2.pl.
1594+
* The mentioned exclusions are done by $replace_line settings in parse.pl.
15951595
*/
15961596
all_unreserved_keyword: unreserved_keyword { $$ = $1; }
15971597
| ECPGunreserved_interval { $$ = $1; }

0 commit comments

Comments
 (0)