Small bugfixes for broken old style use of the syntax table. AMK, of

gvanrossum · gvanrossum · commit e59d3f8ae1bd · 1997-12-02T20:39:23.000Z
course.
diff --git a/Modules/regexpr.c b/Modules/regexpr.c
@@ -611,15 +611,15 @@ static void re_compile_fastmap_aux(code,
 		{
 			syntaxcode = code[pos++];
 			for (a = 0; a < 256; a++)
-				if (SYNTAX(a) == syntaxcode)
+				if (SYNTAX(a) & syntaxcode) 
 					fastmap[a] = 1;
 			return;
 		}
 		case Cnotsyntaxspec:
 		{
 			syntaxcode = code[pos++];
 			for (a = 0; a < 256; a++)
-				if (SYNTAX(a) != syntaxcode)
+				if (!(SYNTAX(a) & syntaxcode) )
 					fastmap[a] = 1;
 			return;
 		}
@@ -1866,12 +1866,12 @@ int re_match(bufp,
 			if (translate)
 			{
 				while (text < textend &&
-				       translate[SYNTAX(*text)] == a)
+				       (SYNTAX(translate[*text]) & a) )
 					text++;
 			}
 			else
 			{
-				while (text < textend && SYNTAX(*text) == a)
+				while (text < textend && (SYNTAX(*text) & a) )
 					text++;
 			}
 			break;
@@ -1882,12 +1882,12 @@ int re_match(bufp,
 			if (translate)
 			{
 				while (text < textend &&
-				       translate[SYNTAX(*text)] != a)
+				       !(SYNTAX(translate[*text]) & a) )
 					text++;
 			}
 			else
 			{
-				while (text < textend && SYNTAX(*text) != a)
+				while (text < textend && !(SYNTAX(*text) & a) )
 					text++;
 			}
 			break;

Original file line number	Diff line number	Diff line change
`@@ -611,15 +611,15 @@ static void re_compile_fastmap_aux(code,`
`611`	`611`	`{`
`612`	`612`	`syntaxcode = code[pos++];`
`613`	`613`	`for (a = 0; a < 256; a++)`
`614`		`- if (SYNTAX(a) == syntaxcode)`
	`614`	`+ if (SYNTAX(a) & syntaxcode)`
`615`	`615`	`fastmap[a] = 1;`
`616`	`616`	`return;`
`617`	`617`	`}`
`618`	`618`	`case Cnotsyntaxspec:`
`619`	`619`	`{`
`620`	`620`	`syntaxcode = code[pos++];`
`621`	`621`	`for (a = 0; a < 256; a++)`
`622`		`- if (SYNTAX(a) != syntaxcode)`
	`622`	`+ if (!(SYNTAX(a) & syntaxcode) )`
`623`	`623`	`fastmap[a] = 1;`
`624`	`624`	`return;`
`625`	`625`	`}`
`@@ -1866,12 +1866,12 @@ int re_match(bufp,`
`1866`	`1866`	`if (translate)`
`1867`	`1867`	`{`
`1868`	`1868`	`while (text < textend &&`
`1869`		`- translate[SYNTAX(*text)] == a)`
	`1869`	`+ (SYNTAX(translate[*text]) & a) )`
`1870`	`1870`	`text++;`
`1871`	`1871`	`}`
`1872`	`1872`	`else`
`1873`	`1873`	`{`
`1874`		`- while (text < textend && SYNTAX(*text) == a)`
	`1874`	`+ while (text < textend && (SYNTAX(*text) & a) )`
`1875`	`1875`	`text++;`
`1876`	`1876`	`}`
`1877`	`1877`	`break;`
`@@ -1882,12 +1882,12 @@ int re_match(bufp,`
`1882`	`1882`	`if (translate)`
`1883`	`1883`	`{`
`1884`	`1884`	`while (text < textend &&`
`1885`		`- translate[SYNTAX(*text)] != a)`
	`1885`	`+ !(SYNTAX(translate[*text]) & a) )`
`1886`	`1886`	`text++;`
`1887`	`1887`	`}`
`1888`	`1888`	`else`
`1889`	`1889`	`{`
`1890`		`- while (text < textend && SYNTAX(*text) != a)`
	`1890`	`+ while (text < textend && !(SYNTAX(*text) & a) )`
`1891`	`1891`	`text++;`
`1892`	`1892`	`}`
`1893`	`1893`	`break;`