diff options
author | Andy Dougherty <doughera@lafcol.lafayette.edu> | 1995-03-31 00:56:10 +0000 |
---|---|---|
committer | Andy Dougherty <doughera@lafcol.lafayette.edu> | 1995-03-31 00:56:10 +0000 |
commit | 56febc5ef28a2ff414c466231d08046390ce0f59 (patch) | |
tree | 160c3ab5de4440c084383be3699ccdd933f9fac5 /x2p/walk.c | |
parent | 8bb9dbe4584e4740e744f2e392c02dc263a7baee (diff) | |
download | perl-56febc5ef28a2ff414c466231d08046390ce0f59.tar.gz |
perl5.001 patch.1b: [byacc deps fix, set*id fixes, x2p/walk.c emit_split()
fix]
This is my patch patch.1b for perl5.001.
[Actually, that's a lie. This is just a reposting of two of my
patches (removing some byacc dependencies and fixing some set*id
stuff) + one version of the x2p/walk.c emit_split() patch.
I've just usurped the letter 'b' to fit in my patch sequence.
You probably have already applied these as well, but again here they
are all packaged up nice and neatly for storage on ftp sites.]
Here's one possible solution to the byacc problem. Short summary:
make will think your perly.[ch] are out of date because perly.c.diff
has changed. They aren't really out of date, but the ordering of the
timestamps in the distribution fools make. I had put some traps in
perly.fixer to check to make sure that everything got run only if
you ran the same version of byacc (1.8) as Larry, but the traps aren't good
enough: There's a Cygnus version of byacc out there that also calls
itself 1.8 (with a +Cygnus xxx note attached). I don't think I'll
ever be able to reliably detect all mutant byacc's, so the safest
course of action seems to be to never run byacc.
(Yes, the perly.fixer check could be a _lot_ smarter. Volunteers?)
This simple-minded fix just puts in a
perly.c: perly.y
- touch perly.c
perly.h: perly.y
- touch perly.h
to bring perly.[ch] up to date, if needed.
The '-' are in case your source is read-only.
It also does the same trick in x2p/Makefile.SH.
WARNING! Danger! Larry, if you do this, it means you have to
explicitly call
make run_byacc
whenever you change perly.y, perly.c.diff, or
cd x2p; make run_byacc
if you change x2p/a2p.y.
However, it might be worth it. I leave it up to you.
Diffstat (limited to 'x2p/walk.c')
-rw-r--r-- | x2p/walk.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/x2p/walk.c b/x2p/walk.c index 6f425a4845..403d686e39 100644 --- a/x2p/walk.c +++ b/x2p/walk.c @@ -12,12 +12,6 @@ #include "a2p.h" #include "util.h" -static void tab(); -static void fixtab(); -static void addsemi(); -static void emit_split(); -static void numericize(); - bool exitval = FALSE; bool realexit = FALSE; bool saw_getline = FALSE; @@ -32,12 +26,13 @@ char *limit; STR *subs; STR *curargs = Nullstr; -void addsemi _(( STR *str )); -void emit_split _(( STR *str, int level )); -void fixtab _(( STR *str, int lvl )); -void numericize _(( int node )); +static void addsemi _(( STR *str )); +static void emit_split _(( STR *str, int level )); +static void fixtab _(( STR *str, int lvl )); +static void numericize _(( int node )); +static void tab _(( STR *str, int lvl )); + int prewalk _(( int numit, int level, int node, int *numericptr )); -void tab _(( STR *str, int lvl )); STR * walk _(( int useval, int level, int node, int *numericptr, int minprec )); @@ -1606,7 +1601,7 @@ register STR *str; str_cat(str,";"); } -void +static void emit_split(str,level) register STR *str; int level; |