diff options
| author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-05-26 20:10:42 +0000 |
|---|---|---|
| committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-05-26 20:10:42 +0000 |
| commit | 5dc0d6134ebb76636f69238201dde15cec972fd0 (patch) | |
| tree | 3f466c13b594ff662ce13454c90ecf35572088ea /regcomp.c | |
| parent | 5bc6513ddd9360f3cbfa6bf29425e38b658230f5 (diff) | |
| parent | 9ed32d99bcab50ff8df392e9741dd3de08a596a4 (diff) | |
| download | perl-5dc0d6134ebb76636f69238201dde15cec972fd0.tar.gz | |
Integrate thrperl 5.003->5.004.
p4raw-id: //depot/perl@24
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 */ @@ -1590,14 +1594,14 @@ regexp *r; - regprop - printable representation of opcode */ void -regprop(sv, op) +regprop(sv, o) SV *sv; -char *op; +char *o; { register char *p = 0; sv_setpv(sv, ":"); - switch (OP(op)) { + switch (OP(o)) { case BOL: p = "BOL"; break; @@ -1659,19 +1663,19 @@ char *op; p = "NBOUNDL"; break; case CURLY: - sv_catpvf(sv, "CURLY {%d,%d}", ARG1(op), ARG2(op)); + sv_catpvf(sv, "CURLY {%d,%d}", ARG1(o), ARG2(o)); break; case CURLYX: - sv_catpvf(sv, "CURLYX {%d,%d}", ARG1(op), ARG2(op)); + sv_catpvf(sv, "CURLYX {%d,%d}", ARG1(o), ARG2(o)); break; case REF: - sv_catpvf(sv, "REF%d", ARG1(op)); + sv_catpvf(sv, "REF%d", ARG1(o)); break; case OPEN: - sv_catpvf(sv, "OPEN%d", ARG1(op)); + sv_catpvf(sv, "OPEN%d", ARG1(o)); break; case CLOSE: - sv_catpvf(sv, "CLOSE%d", ARG1(op)); + sv_catpvf(sv, "CLOSE%d", ARG1(o)); p = NULL; break; case STAR: |