Re-introduce the changes from change 68 (runops becomes a

[p5sagit/p5-mst-13.2.git] / toke.c

diff --git a/toke.c b/toke.c
index dd5e232..78ae386 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -2739,7 +2739,7 @@ yylex()
        case KEY_DESTROY:
        case KEY_BEGIN:
        case KEY_END:
-       case KEY_RESTART:
+       case KEY_INIT:
            if (expect == XSTATE) {
                s = bufptr;
                goto really_sub;
@@ -3931,6 +3931,9 @@ I32 len;
     case 'h':
        if (strEQ(d,"hex"))                     return -KEY_hex;
        break;
+    case 'I':
+       if (strEQ(d,"INIT"))                    return KEY_INIT;
+       break;
     case 'i':
        switch (len) {
        case 2:
@@ -4070,9 +4073,6 @@ I32 len;
        }
        else if (strEQ(d,"quotemeta"))          return -KEY_quotemeta;
        break;
-    case 'R':
-       if (strEQ(d,"RESTART"))                 return KEY_RESTART;
-       break;
     case 'r':
        switch (len) {
        case 3:
@@ -5243,8 +5243,6 @@ U32 flags;
     CvOWNER(compcv) = 0;
     New(666, CvMUTEXP(compcv), 1, perl_mutex);
     MUTEX_INIT(CvMUTEXP(compcv));
-    New(666, CvCONDP(compcv), 1, perl_cond);
-    COND_INIT(CvCONDP(compcv));
 #endif /* USE_THREADS */
 
     comppadlist = newAV();
@@ -5258,8 +5256,6 @@ U32 flags;
     CvOWNER(compcv) = 0;
     New(666, CvMUTEXP(compcv), 1, perl_mutex);
     MUTEX_INIT(CvMUTEXP(compcv));
-    New(666, CvCONDP(compcv), 1, perl_cond);
-    COND_INIT(CvCONDP(compcv));
 #endif /* USE_THREADS */
 
     return oldsavestack_ix;