diff options
| author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-03-28 18:40:44 +0000 |
|---|---|---|
| committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-03-28 18:40:44 +0000 |
| commit | 11343788cbaaede18e3146b5219d2fbdaeaf516e (patch) | |
| tree | ef2be09ece0508b3408a222a86980d39e20bcd42 /regcomp.c | |
| parent | a4f68e9b64464684b732bc17fd65ed4a1aa4708c (diff) | |
| download | perl-11343788cbaaede18e3146b5219d2fbdaeaf516e.tar.gz | |
Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.
p4raw-id: //depot/thrperl@4
Diffstat (limited to 'regcomp.c')
| -rw-r--r-- | regcomp.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -58,6 +58,10 @@ #include "INTERN.h" #include "regcomp.h" +#ifdef USE_THREADS +#undef op +#endif /* USE_THREADS */ + #ifdef MSDOS # if defined(BUGGY_MSC6) /* MSC 6.00A breaks on op/regexp.t test 85 unless we turn this off */ @@ -1498,14 +1502,14 @@ regexp *r; - regprop - printable representation of opcode */ char * -regprop(op) -char *op; +regprop(o) +char *o; { register char *p = 0; (void) strcpy(buf, ":"); - switch (OP(op)) { + switch (OP(o)) { case BOL: p = "BOL"; break; @@ -1573,23 +1577,23 @@ char *op; p = "NDIGIT"; break; case CURLY: - (void)sprintf(buf+strlen(buf), "CURLY {%d,%d}", ARG1(op),ARG2(op)); + (void)sprintf(buf+strlen(buf), "CURLY {%d,%d}", ARG1(o),ARG2(o)); p = NULL; break; case CURLYX: - (void)sprintf(buf+strlen(buf), "CURLYX {%d,%d}", ARG1(op),ARG2(op)); + (void)sprintf(buf+strlen(buf), "CURLYX {%d,%d}", ARG1(o),ARG2(o)); p = NULL; break; case REF: - (void)sprintf(buf+strlen(buf), "REF%d", ARG1(op)); + (void)sprintf(buf+strlen(buf), "REF%d", ARG1(o)); p = NULL; break; case OPEN: - (void)sprintf(buf+strlen(buf), "OPEN%d", ARG1(op)); + (void)sprintf(buf+strlen(buf), "OPEN%d", ARG1(o)); p = NULL; break; case CLOSE: - (void)sprintf(buf+strlen(buf), "CLOSE%d", ARG1(op)); + (void)sprintf(buf+strlen(buf), "CLOSE%d", ARG1(o)); p = NULL; break; case STAR: |