diff options
| -rw-r--r-- | embed.fnc | 1 | ||||
| -rw-r--r-- | embed.h | 2 | ||||
| -rw-r--r-- | embedvar.h | 4 | ||||
| -rw-r--r-- | intrpvar.h | 5 | ||||
| -rw-r--r-- | perl.h | 6 | ||||
| -rw-r--r-- | perlapi.h | 4 | ||||
| -rw-r--r-- | proto.h | 1 | ||||
| -rw-r--r-- | sv.c | 5 | ||||
| -rw-r--r-- | toke.c | 23 |
9 files changed, 6 insertions, 45 deletions
@@ -1541,7 +1541,6 @@ s |int |intuit_more |NN char *s s |I32 |lop |I32 f|int x|NN char *s rs |void |missingterm |NULLOK char *s s |void |no_op |NN const char *what|NULLOK char *s -s |void |set_csh sR |I32 |sublex_done sR |I32 |sublex_push sR |I32 |sublex_start @@ -1520,7 +1520,6 @@ #define lop S_lop #define missingterm S_missingterm #define no_op S_no_op -#define set_csh S_set_csh #define sublex_done S_sublex_done #define sublex_push S_sublex_push #define sublex_start S_sublex_start @@ -3802,7 +3801,6 @@ #define lop(a,b,c) S_lop(aTHX_ a,b,c) #define missingterm(a) S_missingterm(aTHX_ a) #define no_op(a,b) S_no_op(aTHX_ a,b) -#define set_csh() S_set_csh(aTHX) #define sublex_done() S_sublex_done(aTHX) #define sublex_push() S_sublex_push(aTHX) #define sublex_start() S_sublex_start(aTHX) diff --git a/embedvar.h b/embedvar.h index 15057bce69..26d58210d5 100644 --- a/embedvar.h +++ b/embedvar.h @@ -95,8 +95,6 @@ #define PL_comppad_name_floor (vTHX->Icomppad_name_floor) #define PL_cop_seqmax (vTHX->Icop_seqmax) #define PL_cryptseen (vTHX->Icryptseen) -#define PL_cshlen (vTHX->Icshlen) -#define PL_cshname (vTHX->Icshname) #define PL_curcop (vTHX->Icurcop) #define PL_curcopdb (vTHX->Icurcopdb) #define PL_curpad (vTHX->Icurpad) @@ -409,8 +407,6 @@ #define PL_Icomppad_name_floor PL_comppad_name_floor #define PL_Icop_seqmax PL_cop_seqmax #define PL_Icryptseen PL_cryptseen -#define PL_Icshlen PL_cshlen -#define PL_Icshname PL_cshname #define PL_Icurcop PL_curcop #define PL_Icurcopdb PL_curcopdb #define PL_Icurpad PL_curpad diff --git a/intrpvar.h b/intrpvar.h index a6a4a1c641..36e8030786 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -256,11 +256,6 @@ PERLVAR(Istatusvalue_vms,U32) PERLVAR(Istatusvalue_posix,I32) #endif -#ifdef CSH -PERLVARI(Icshlen, I32, 0) -PERLVARI(Icshname, const char *, CSH) -#endif - /* shortcuts to various I/O objects */ PERLVAR(Istdingv, GV *) PERLVAR(Istderrgv, GV *) @@ -4113,6 +4113,12 @@ EXTCONST char PL_no_localize_ref[] EXTCONST char PL_memory_wrap[] INIT("panic: memory wrap"); +#ifdef CSH +EXTCONST char PL_cshname[] + INIT(CSH); +# define PL_cshlen (sizeof(CSH "") - 1) +#endif + EXTCONST char PL_uuemap[65] INIT("`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"); @@ -226,10 +226,6 @@ END_EXTERN_C #define PL_cop_seqmax (*Perl_Icop_seqmax_ptr(aTHX)) #undef PL_cryptseen #define PL_cryptseen (*Perl_Icryptseen_ptr(aTHX)) -#undef PL_cshlen -#define PL_cshlen (*Perl_Icshlen_ptr(aTHX)) -#undef PL_cshname -#define PL_cshname (*Perl_Icshname_ptr(aTHX)) #undef PL_curcop #define PL_curcop (*Perl_Icurcop_ptr(aTHX)) #undef PL_curcopdb @@ -4103,7 +4103,6 @@ STATIC void S_missingterm(pTHX_ char *s) STATIC void S_no_op(pTHX_ const char *what, char *s) __attribute__nonnull__(pTHX_1); -STATIC void S_set_csh(pTHX); STATIC I32 S_sublex_done(pTHX) __attribute__warn_unused_result__; @@ -11271,11 +11271,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_runops = proto_perl->Irunops; -#ifdef CSH - PL_cshlen = proto_perl->Icshlen; - PL_cshname = proto_perl->Icshname; /* XXX never deallocated */ -#endif - PL_parser = parser_dup(proto_perl->Iparser, param); PL_subline = proto_perl->Isubline; @@ -2969,9 +2969,6 @@ S_readpipe_override(pTHX) newSVOP(OP_CONST, 0, &PL_sv_undef), /* value will be read later */ newCVREF(0, newGVOP(OP_GV, 0, gv_readpipe)))); } - else { - set_csh(); - } } #ifdef PERL_MAD @@ -5928,7 +5925,6 @@ Perl_yylex(pTHX) UNI(OP_EACH); case KEY_exec: - set_csh(); LOP(OP_EXEC,XREF); case KEY_endhostent: @@ -6093,7 +6089,6 @@ Perl_yylex(pTHX) OPERATOR(GIVEN); case KEY_glob: - set_csh(); LOP(OP_GLOB,XTERM); case KEY_hex: @@ -6435,11 +6430,9 @@ Perl_yylex(pTHX) UNI(OP_READDIR); case KEY_readline: - set_csh(); UNIDOR(OP_READLINE); case KEY_readpipe: - set_csh(); UNIDOR(OP_BACKTICK); case KEY_rewinddir: @@ -6758,7 +6751,6 @@ Perl_yylex(pTHX) } case KEY_system: - set_csh(); LOP(OP_SYSTEM,XREF); case KEY_symlink: @@ -11396,7 +11388,6 @@ S_scan_inputsymbol(pTHX_ char *start) if (d - PL_tokenbuf != len) { yylval.ival = OP_GLOB; - set_csh(); s = scan_str(start,!!PL_madskills,FALSE); if (!s) Perl_croak(aTHX_ "Glob not terminated"); @@ -12398,20 +12389,6 @@ S_scan_formline(pTHX_ register char *s) return s; } -STATIC void -S_set_csh(pTHX) -{ -#ifdef CSH - dVAR; - if (!PL_cshlen) - PL_cshlen = strlen(PL_cshname); -#else -#if defined(USE_ITHREADS) - PERL_UNUSED_CONTEXT; -#endif -#endif -} - I32 Perl_start_subparse(pTHX_ I32 is_format, U32 flags) { |