Patch from Philippe Lhoste to regular expressions adds \d, \D, \s, \S, \w, \W, and \xHH.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/RESearch.h b/src/RESearch.h
index aa8557918..befd36790 100644
--- a/src/RESearch.h
+++ b/src/RESearch.h
@@ -34,9 +34,9 @@ public:
 	int Execute(CharacterIndexer &ci, int lp, int endp);
 	int Substitute(CharacterIndexer &ci, char *src, char *dst);
 
-	enum {MAXTAG=10};
-	enum {MAXNFA=2048};
-	enum {NOTFOUND=-1};
+	enum { MAXTAG=10 };
+	enum { MAXNFA=2048 };
+	enum { NOTFOUND=-1 };
 
 	int bopat[MAXTAG];
 	int eopat[MAXTAG];
@@ -45,16 +45,17 @@ public:
 private:
 	void Init();
 	void Clear();
-	void ChSet(char c);
-	void ChSetWithCase(char c, bool caseSensitive);
+	void ChSet(unsigned char c);
+	void ChSetWithCase(unsigned char c, bool caseSensitive);
+	int GetBackslashExpression(const char *pat, int &incr);
 
 	int PMatch(CharacterIndexer &ci, int lp, int endp, char *ap);
 
 	int bol;
-	int  tagstk[MAXTAG]; /* subpat tag stack */
+	int tagstk[MAXTAG];  /* subpat tag stack */
 	char nfa[MAXNFA];    /* automaton */
 	int sta;
-	char bittab[BITBLK]; /* bit table for CCL pre-set bits */
+	unsigned char bittab[BITBLK]; /* bit table for CCL pre-set bits */
 	int failure;
 	CharClassify *charClass;
 	bool iswordc(unsigned char x) {
@@ -63,3 +64,4 @@ private:
 };
 
 #endif
+