reg char classes

reg.c

@@ -14,6 +14,7 @@ void reg_match(Reg*r,char*p,char*s)
 	// Iterate through pattern
 	for(size_t j=0;p[j];++j)
 	{
+
 		//printf("((%lu))\n",j);
 		if(strcmp(p+j,"\\d")==0)
 		{
@@ -28,6 +29,102 @@ void reg_match(Reg*r,char*p,char*s)
 	}
 }
 
+void reg_match2(Reg*r,char*p,char*s)
+{
+	// Return if pointers are NULL
+	if(!r||!p||!s)
+		return;
+
+	const size_t string_len=strlen(s);
+	const size_t pat_len=strlen(p);
+	bool found=false;
+	bool done=false;
+	size_t pat_idx=0;
+	size_t string_idx=0;
+
+	if(!pat_len||!string_len)
+		return;
+
+	//puts("begin");
+	while(!done)
+	{
+		//printf("sz=%lu (%lu/%lu)\n",r->matches.unitsize,r->matches.size,r->matches.capacity);
+		if(pat_idx>=pat_len||string_idx>=string_len)
+			break;
+
+		// Check for magic chars
+		if(p[pat_idx]=='\\')
+		{
+			//puts("magic");
+			++pat_idx;
+
+			// Digit
+			if(p[pat_idx]=='d' )
+			{
+				if(isdigit(s[string_idx]))
+				{
+					if(!found)
+					{
+						found=true;
+						Match mm={.length=1,
+							.str=s+string_idx};
+						vec_push(&(r->matches),&mm);
+					}
+
+					else
+					{
+						((Match*)r->matches.buffer)[r->matches.size-1]
+							.length++;
+					}
+				}
+
+				else
+					vec_pop(&r->matches);
+			}
+
+			// Alphabetical
+			else if(p[pat_idx]=='c')
+			{
+
+				if(isalpha(s[string_idx]))
+				{
+					if(!found)
+					{
+						found=true;
+						Match mm={.length=1,
+							.str=s+string_idx};
+						vec_push(&(r->matches),&mm);
+					}
+
+					else
+					{
+						((Match*)r->matches.buffer)[r->matches.size-1]
+							.length++;
+					}
+				}
+
+				else
+				{
+					if(found)
+						vec_pop(&r->matches);
+				}
+			}
+		}
+
+		// NOMAGIC
+		else
+		{
+			if(s[string_idx]==p[pat_idx])
+				((Match*)r->matches.buffer)[r->matches.size-1]
+					.length++;
+		}
+
+		++pat_idx;
+		++string_idx;
+	}
+	//puts("done");
+}
+
 void reg_print(Reg*r)
 {
 	if(!r)return;
@@ -37,10 +134,10 @@ void reg_print(Reg*r)
 		Match*m=((Match*)r->matches.buffer)+i;
 		//char*string=m->str;
 
-		printf("(%lu/",m->length);
+		printf("(%lu'",m->length);
 		for(size_t j=0;j<m->length;++j)
 			printf("%c",m->str[j]);
-		printf(")");
+		printf("')");
 		if(i<r->matches.size-1)
 			printf(", ");
 	}

reg.h

@@ -21,4 +21,5 @@ typedef struct Reg
 Reg reg_new(void);
 void reg_free(Reg*r);
 void reg_match(Reg*r,char*p,char*s);
+void reg_match2(Reg*r,char*p,char*s);
 void reg_print(Reg*r);