summaryrefslogtreecommitdiff
path: root/proto.h
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2013-08-14 11:19:18 -0600
committerKarl Williamson <public@khwilliamson.com>2013-09-24 11:36:13 -0600
commit557bd3fbbb79c932d6c63b4e37201c2ae13c700d (patch)
tree4f771d558da24c7f42c154e00f1f78241b7f94fa /proto.h
parentd2b7f31e8368e71f4af425b35407d3c0db9c61cf (diff)
downloadperl-557bd3fbbb79c932d6c63b4e37201c2ae13c700d.tar.gz
regcomp.c: Change names of some static functions
The term 'class' is very overloaded in regex code and documentation. perlrecharclass.pod calls the dot (matching any char) a class, and calls the [] form "bracketed character classes". There are other meanings as well. This is the first commit in a short series that removes some of those overloadings. One instance of class is the "synthetic start class", generated by the regex optimizer to be a list of all the code points a sucessful match could possibly start with. This is useful in more quickly finding where to start looking in matching against a target string. Prior to this commit, the routines that referred to this began with 'cl_', and the formal parameters were 'cl', which could mean any class. This commit changes those instances of 'cl' to 'ssc' to indicate this is the only type of class that is being handled.
Diffstat (limited to 'proto.h')
-rw-r--r--proto.h62
1 files changed, 31 insertions, 31 deletions
diff --git a/proto.h b/proto.h
index 81fb87ff74..f791985208 100644
--- a/proto.h
+++ b/proto.h
@@ -6548,37 +6548,6 @@ PERL_STATIC_INLINE void S_alloc_maybe_populate_EXACT(pTHX_ struct RExC_state_t *
#define PERL_ARGS_ASSERT_ALLOC_MAYBE_POPULATE_EXACT \
assert(pRExC_state); assert(node); assert(flagp)
-STATIC void S_cl_and(regnode_ssc *cl, const regnode_ssc *and_with)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_CL_AND \
- assert(cl); assert(and_with)
-
-STATIC void S_cl_anything(const struct RExC_state_t *pRExC_state, regnode_ssc *cl)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_CL_ANYTHING \
- assert(pRExC_state); assert(cl)
-
-STATIC void S_cl_init(const struct RExC_state_t *pRExC_state, regnode_ssc *cl)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_CL_INIT \
- assert(pRExC_state); assert(cl)
-
-STATIC int S_cl_is_anything(const regnode_ssc *cl)
- __attribute__warn_unused_result__
- __attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_CL_IS_ANYTHING \
- assert(cl)
-
-STATIC void S_cl_or(const struct RExC_state_t *pRExC_state, regnode_ssc *cl, const regnode_ssc *or_with)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3);
-#define PERL_ARGS_ASSERT_CL_OR \
- assert(pRExC_state); assert(cl); assert(or_with)
-
PERL_STATIC_INLINE U8 S_compute_EXACTish(pTHX_ struct RExC_state_t *pRExC_state)
__attribute__nonnull__(pTHX_1);
#define PERL_ARGS_ASSERT_COMPUTE_EXACTISH \
@@ -6841,6 +6810,37 @@ STATIC void S_set_ANYOF_arg(pTHX_ struct RExC_state_t* const pRExC_state, regnod
#define PERL_ARGS_ASSERT_SET_ANYOF_ARG \
assert(pRExC_state); assert(node)
+STATIC void S_ssc_and(regnode_ssc *ssc, const regnode_ssc *and_with)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+#define PERL_ARGS_ASSERT_SSC_AND \
+ assert(ssc); assert(and_with)
+
+STATIC void S_ssc_anything(const struct RExC_state_t *pRExC_state, regnode_ssc *ssc)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+#define PERL_ARGS_ASSERT_SSC_ANYTHING \
+ assert(pRExC_state); assert(ssc)
+
+STATIC void S_ssc_init(const struct RExC_state_t *pRExC_state, regnode_ssc *ssc)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+#define PERL_ARGS_ASSERT_SSC_INIT \
+ assert(pRExC_state); assert(ssc)
+
+STATIC int S_ssc_is_anything(const regnode_ssc *ssc)
+ __attribute__warn_unused_result__
+ __attribute__nonnull__(1);
+#define PERL_ARGS_ASSERT_SSC_IS_ANYTHING \
+ assert(ssc)
+
+STATIC void S_ssc_or(const struct RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_ssc *or_with)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3);
+#define PERL_ARGS_ASSERT_SSC_OR \
+ assert(pRExC_state); assert(ssc); assert(or_with)
+
STATIC SSize_t S_study_chunk(pTHX_ struct RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U8* recursed, regnode_ssc *and_withp, U32 flags, U32 depth)
__attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_2)