mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Merge alpha100 branch back to main trunk
This commit is contained in:
parent
2979b01ff8
commit
b6775db241
176 changed files with 5302 additions and 3668 deletions
|
@ -22,11 +22,9 @@ Free Software Foundation.
|
|||
Emacs-specific code and syntax table code is almost directly borrowed
|
||||
from GNU regexp.
|
||||
|
||||
$Header$
|
||||
|
||||
*/
|
||||
|
||||
#include "PROTO.h" /* For PROTO macro --Guido */
|
||||
#include "myproto.h" /* For PROTO macro --Guido */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
@ -116,6 +114,7 @@ enum regexp_syntax_op /* syntax codes for plain and quoted characters */
|
|||
|
||||
static int re_compile_initialized = 0;
|
||||
static int regexp_syntax = 0;
|
||||
int re_syntax = 0; /* Exported copy of regexp_syntax */
|
||||
static unsigned char regexp_plain_ops[256];
|
||||
static unsigned char regexp_quoted_ops[256];
|
||||
static unsigned char regexp_precedences[Rnum_ops];
|
||||
|
@ -256,6 +255,7 @@ int syntax;
|
|||
|
||||
ret = regexp_syntax;
|
||||
regexp_syntax = syntax;
|
||||
re_syntax = syntax; /* Exported copy */
|
||||
re_compile_initialize();
|
||||
return ret;
|
||||
}
|
||||
|
@ -644,7 +644,7 @@ regexp_t bufp;
|
|||
}
|
||||
if (range)
|
||||
{
|
||||
for (a = prev; a <= ch; a++)
|
||||
for (a = prev; a <= (int)ch; a++)
|
||||
SETBIT(pattern, offset, a);
|
||||
prev = -1;
|
||||
range = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue