Upd pcre2

ChangeLog

@@ -1,3 +1,9 @@
+ibcleri (0.9.4)
+
+  * Replaced pcre with pcre2.
+
+ -- Jeroen van der Heijden <jeroen@transceptor.technology> 28 Nov 2017
+
 libcleri (0.9.3)
 
   * Fixed compiler warnings.

inc/cleri/grammar.h

@@ -39,6 +39,7 @@ struct cleri_grammar_s
 {
     cleri_t * start;
     pcre2_code * re_keywords;
+    pcre2_match_data * match_data;
 };
 
 #endif /* CLERI_GRAMMAR_H_ */

inc/cleri/parse.h

@@ -61,6 +61,7 @@ struct cleri_parse_s
     const cleri_olist_t * expect;
     cleri_expecting_t * expecting;
     pcre2_code * re_keywords;
+    pcre2_match_data * match_data;
     cleri_kwcache_t * kwcache;
 };
 

inc/cleri/regex.h

@@ -38,6 +38,7 @@ cleri_t * cleri_regex(uint32_t gid, const char * pattern);
 struct cleri_regex_s
 {
     pcre2_code * regex;
+    pcre2_match_data * match_data;
 };
 
 #endif /* CLERI_REGEX_H_ */

inc/cleri/version.h

@@ -9,7 +9,7 @@
 
 #define LIBCLERI_VERSION_MAJOR 0
 #define LIBCLERI_VERSION_MINOR 9
-#define LIBCLERI_VERSION_PATCH 3
+#define LIBCLERI_VERSION_PATCH 4
 
 #define LIBCLERI_STRINGIFY(num) #num
 #define LIBCLERI_VERSION_STR(major,minor,patch)    \

makefile.init

@@ -1,4 +1,4 @@
 MAJOR := 0
 MINOR := 9
-PATCH := 3
+PATCH := 4
 VERSION := $(MAJOR).$(MINOR).$(PATCH)

src/grammar.c

@@ -66,6 +66,17 @@ cleri_grammar_t * cleri_grammar(cleri_t * start, const char * re_keywords)
         return NULL;
     }
 
+    grammar->match_data = \
+        pcre2_match_data_create_from_pattern(grammar->re_keywords, NULL);
+
+    if (grammar->match_data == NULL)
+    {
+        pcre2_code_free(grammar->re_keywords);
+        fprintf(stderr, "error: cannot create matsch data\n");
+        free(grammar);
+        return NULL;
+    }
+
     /* bind root element and increment the reference counter */
     grammar->start = start;
     cleri_incref(start);
@@ -75,6 +86,7 @@ cleri_grammar_t * cleri_grammar(cleri_t * start, const char * re_keywords)
 
 void cleri_grammar_free(cleri_grammar_t * grammar)
 {
+    pcre2_match_data_free(grammar->match_data);
     pcre2_code_free(grammar->re_keywords);
     cleri_free(grammar->start);
     free(grammar);

src/kwcache.c

@@ -99,27 +99,25 @@ static void KWCACHE_kw_match(
         const char * str)
 {
     int pcre_exec_ret;
-    pcre2_match_data * match_data;
+
     PCRE2_SIZE * ovector;
 
-    match_data = pcre2_match_data_create_from_pattern(pr->re_keywords, NULL);
     pcre_exec_ret = pcre2_match(
                 pr->re_keywords,
                 (PCRE2_SPTR8) str,
                 strlen(str),
                 0,                     // start looking at this point
                 0,                     // OPTIONS
-                match_data,
+                pr->match_data,
                 NULL);
 
     if (pcre_exec_ret < 0)
     {
-        pcre2_match_data_free(match_data);
         return;
     }
 
-    ovector = pcre2_get_ovector_pointer(match_data);
+    ovector = pcre2_get_ovector_pointer(pr->match_data);
     kwcache->len = ovector[1];
 
-    pcre2_match_data_free(match_data);
+
 }

src/parse.c

@@ -49,6 +49,7 @@ cleri_parse_t * cleri_parse(cleri_grammar_t * grammar, const char * str)
     }
 
     pr->re_keywords = grammar->re_keywords;
+    pr->match_data = grammar->match_data;
 
     /* do the actual parsing */
     cleri__parse_walk(

src/regex.c

@@ -81,6 +81,20 @@ cleri_t * cleri_regex(uint32_t gid, const char * pattern)
         return NULL;
     }
 
+    cl_object->via.regex->match_data = pcre2_match_data_create_from_pattern(
+            cl_object->via.regex->regex,
+            NULL);
+
+    if (cl_object->via.regex->match_data == NULL)
+    {
+        pcre2_code_free(cl_object->via.regex->regex);
+        fprintf(stderr, "error: cannot create matsch data\n");
+        free(cl_object->via.regex);
+        free(cl_object);
+        return NULL;
+        return NULL;
+    }
+
     return cl_object;
 }
 
@@ -89,6 +103,7 @@ cleri_t * cleri_regex(uint32_t gid, const char * pattern)
  */
 static void REGEX_free(cleri_t * cl_object)
 {
+    pcre2_match_data_free(cl_object->via.regex->match_data);
     pcre2_code_free(cl_object->via.regex->regex);
     free(cl_object->via.regex);
 }
@@ -103,11 +118,7 @@ static cleri_node_t *  REGEX_parse(
         cleri_rule_store_t * rule __attribute__((unused)))
 {
     int pcre_exec_ret;
-    pcre2_match_data * match_data;
     PCRE2_SIZE * ovector;
-    match_data = pcre2_match_data_create_from_pattern(
-        cl_obj->via.regex->regex,
-        NULL);
     const char * str = parent->str + parent->len;
     cleri_node_t * node;
 
@@ -117,19 +128,18 @@ static cleri_node_t *  REGEX_parse(
             strlen(str),
             0,                     // start looking at this point
             0,                     // OPTIONS
-            match_data,
+            cl_obj->via.regex->match_data,
             NULL);
 
     if (pcre_exec_ret < 0)
     {
-        pcre2_match_data_free(match_data);
         if (cleri__expecting_update(pr->expecting, cl_obj, str) == -1)
         {
             pr->is_valid = -1; /* error occurred */
         }
         return NULL;
     }
-    ovector = pcre2_get_ovector_pointer(match_data);
+    ovector = pcre2_get_ovector_pointer(cl_obj->via.regex->match_data);
 
     /* since each regex pattern should start with ^ we now sub_str_vec[0]
      * should be 0. sub_str_vec[1] contains the end position in the sting
@@ -151,6 +161,5 @@ static cleri_node_t *  REGEX_parse(
         pr->is_valid = -1; /* error occurred */
     }
 
-    pcre2_match_data_free(match_data);
     return node;
 }