From 22c35a8c2392967a5ba6b5370695be464bd7012c Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Fri, 30 Oct 1998 02:51:39 +0000 Subject: phase 1 of somewhat major rearrangement of PERL_OBJECT stuff (objpp.h is gone, embed.pl now does some of that); objXSUB.h should soon be automated also; the global variables that escaped the PL_foo conversion are now reined in; renamed MAGIC in regcomp.h to REG_MAGIC to avoid collision with the type of same name; duplicated lists of pp_things in various places is now gone; result has only been tested on win32 p4raw-id: //depot/perl@2133 --- regcomp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'regcomp.h') diff --git a/regcomp.h b/regcomp.h index 38b15acc69..fef317a2ac 100644 --- a/regcomp.h +++ b/regcomp.h @@ -150,7 +150,7 @@ struct regnode_2 { #define FILL_ADVANCE_NODE_ARG(ptr, op, arg) STMT_START { \ ARG_SET(ptr, arg); FILL_ADVANCE_NODE(ptr, op); (ptr) += 1; } STMT_END -#define MAGIC 0234 +#define REG_MAGIC 0234 #define SIZE_ONLY (PL_regcode == &PL_regdummy) @@ -200,9 +200,9 @@ struct regnode_2 { /* The following have no fixed length. char* since we do strchr on it. */ #ifndef DOINIT -EXTCONST char varies[]; +EXTCONST char PL_varies[]; #else -EXTCONST char varies[] = { +EXTCONST char PL_varies[] = { BRANCH, BACK, STAR, PLUS, CURLY, CURLYX, REF, REFF, REFFL, WHILEM, CURLYM, CURLYN, BRANCHJ, IFTHEN, SUSPEND, CLUMP, 0 }; @@ -211,10 +211,10 @@ EXTCONST char varies[] = { /* The following always have a length of 1. char* since we do strchr on it. */ /* (Note that lenght 1 means "one character" under UTF8, not "one octet".) */ #ifndef DOINIT -EXTCONST char simple[]; +EXTCONST char PL_simple[]; #else -EXTCONST char simple[] = { - ANY, ANYUTF8, SANY, SANYUTF8, ANYOF, ANYOFUTF8, +EXTCONST char PL_simple[] = { + REG_ANY, ANYUTF8, SANY, SANYUTF8, ANYOF, ANYOFUTF8, ALNUM, ALNUMUTF8, ALNUML, ALNUMLUTF8, NALNUM, NALNUMUTF8, NALNUML, NALNUMLUTF8, SPACE, SPACEUTF8, SPACEL, SPACELUTF8, -- cgit v1.2.1