[asperl] integrate mainline changes

p4raw-id: //depot/asperl@607

1 files changed, 3 insertions, 28 deletions

diff --git a/regcomp.c b/regcomp.c
index fc6b131256..ae2b02ee75 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -319,7 +319,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32
 		    scan = next;
 		    if (data_fake.flags & (SF_HAS_PAR|SF_IN_PAR))
 			pars++;
-		    if (data_fake.flags & SF_HAS_EVAL)
+		    if (data && (data_fake.flags & SF_HAS_EVAL))
 			data->flags |= SF_HAS_EVAL;
 		    if (code == SUSPEND) 
 			break;
@@ -565,7 +565,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32
 			data->longest = &(data->longest_float);
 		    }
 		}
-		if (fl & SF_HAS_EVAL)
+		if (data && (fl & SF_HAS_EVAL))
 		    data->flags |= SF_HAS_EVAL;
 	      optimize_curly_tail:
 #ifdef REGALIGN
@@ -614,7 +614,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32
 	    }
 	    if (data && data_fake.flags & (SF_HAS_PAR|SF_IN_PAR))
 		pars++;
-	    if (data_fake.flags & SF_HAS_EVAL)
+	    if (data && (data_fake.flags & SF_HAS_EVAL))
 		data->flags |= SF_HAS_EVAL;
 	} else if (OP(scan) == OPEN) {
 	    pars++;
@@ -2025,12 +2025,7 @@ nextchar(void)
 - reg_node - emit a node
 */
 STATIC regnode *			/* Location. */
-#ifdef CAN_PROTOTYPE
 reg_node(U8 op)
-#else
-reg_node(op)
-U8 op;
-#endif
 {
     register regnode *ret;
     register regnode *ptr;
@@ -2058,13 +2053,7 @@ U8 op;
 - reganode - emit a node with an argument
 */
 STATIC regnode *			/* Location. */
-#ifdef CAN_PROTOTYPE
 reganode(U8 op, U32 arg)
-#else
-reganode(op, arg)
-U8 op;
-U32 arg;
-#endif
 {
     register regnode *ret;
     register regnode *ptr;
@@ -2091,15 +2080,8 @@ U32 arg;
 /*
 - regc - emit (if appropriate) a byte of code
 */
-#ifdef CAN_PROTOTYPE
 STATIC void
 regc(U8 b, char* s)
-#else
-static void
-regc(b, s)
-U8 b;
-char *s;
-#endif
 {
     if (!SIZE_ONLY)
 	*s = b;
@@ -2110,15 +2092,8 @@ char *s;
 *
 * Means relocating the operand.
 */
-#ifdef CAN_PROTOTYPE
 STATIC void
 reginsert(U8 op, regnode *opnd)
-#else
-static void
-reginsert(op, opnd)
-U8 op;
-regnode *opnd;
-#endif
 {
     register regnode *src;
     register regnode *dst;