simplify matchplus and matchstar

kokke/tiny-regex-c/pull/63
matyalatte · Jul 4, 2024 · d95b944 · d95b944
1 parent ba559b4
commit d95b944
Showing 1 changed file with 5 additions and 17 deletions.
diff --git a/src/re.c b/src/re.c
@@ -343,20 +343,7 @@ static int matchone(regex_t p, char c) {
 }
 
 static int matchstar(regex_t p, regex_t* pattern, const char* text, int* matchlength) {
-    int prelen = *matchlength;
-    const char* prepoint = text;
-    while ((text[0] != '\0') && matchone(p, *text)) {
-        text++;
-        (*matchlength)++;
-    }
-    while (text >= prepoint) {
-        if (matchpattern(pattern, text--, matchlength))
-            return 1;
-        (*matchlength)--;
-    }
-
-    *matchlength = prelen;
-    return 0;
+    return matchplus(p, pattern, text, matchlength) || matchpattern(pattern, text, matchlength);
 }
 
 static int matchplus(regex_t p, regex_t* pattern, const char* text, int* matchlength) {
@@ -365,10 +352,11 @@ static int matchplus(regex_t p, regex_t* pattern, const char* text, int* matchle
         text++;
         (*matchlength)++;
     }
-    while (text > prepoint) {
-        if (matchpattern(pattern, text--, matchlength))
+    for (; text > prepoint; text--) {
+        if (matchpattern(pattern, text, matchlength)) {
+            *matchlength += text - prepoint;
             return 1;
-        (*matchlength)--;
+        }
     }
 
     return 0;