Skip to content

Commit 882bbf6

Browse files
zsuraskizsuraski
committed
Win32 patches
1 parent 694d949 commit 882bbf6

File tree

12 files changed

+299
-2
lines changed

12 files changed

+299
-2
lines changed

‎ext/ereg/regex/debug.ih

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* ========= begin header generated by ./mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === debug.c === */
7+
void regprint(regex_t *r, FILE *d);
8+
static void s_print(register struct re_guts *g, FILE *d);
9+
static char *regchar(int ch);
10+
11+
#ifdef __cplusplus
12+
}
13+
#endif
14+
/* ========= end header generated by ./mkh ========= */

‎ext/ereg/regex/engine.ih

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/engine.c === */
7+
static int matcher(register struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
8+
static char *dissect(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
9+
static char *backref(register struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
10+
static char *fast(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
11+
static char *slow(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
12+
static states step(register struct re_guts *g, sopno start, sopno stop, register states bef, int ch, register states aft);
13+
#define BOL (OUT+1)
14+
#define EOL (BOL+1)
15+
#define BOLEOL (BOL+2)
16+
#define NOTHING (BOL+3)
17+
#define BOW (BOL+4)
18+
#define EOW (BOL+5)
19+
#define CODEMAX (BOL+5) /* highest code used */
20+
#define NONCHAR(c) ((c) > CHAR_MAX)
21+
#define NNONCHAR (CODEMAX-CHAR_MAX)
22+
#ifdef REDEBUG
23+
static void print(struct match *m, char *caption, states st, int ch, FILE *d);
24+
#endif
25+
#ifdef REDEBUG
26+
static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
27+
#endif
28+
#ifdef REDEBUG
29+
static char *pchar(int ch);
30+
#endif
31+
32+
#ifdef __cplusplus
33+
}
34+
#endif
35+
/* ========= end header generated by ../../regex/mkh ========= */

‎ext/ereg/regex/main.ih

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* ========= begin header generated by ./mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === main.c === */
7+
void regress(FILE *in);
8+
void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
9+
int options(int type, char *s);
10+
int opt(int c, char *s);
11+
void fixstr(register char *p);
12+
char *check(char *str, regmatch_t sub, char *should);
13+
static char *eprint(int err);
14+
static int efind(char *name);
15+
16+
#ifdef __cplusplus
17+
}
18+
#endif
19+
/* ========= end header generated by ./mkh ========= */

‎ext/ereg/regex/regcomp.ih

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/regcomp.c === */
7+
static void p_ere(register struct parse *p, int stop);
8+
static void p_ere_exp(register struct parse *p);
9+
static void p_str(register struct parse *p);
10+
static void p_bre(register struct parse *p, register int end1, register int end2);
11+
static int p_simp_re(register struct parse *p, int starordinary);
12+
static int p_count(register struct parse *p);
13+
static void p_bracket(register struct parse *p);
14+
static void p_b_term(register struct parse *p, register cset *cs);
15+
static void p_b_cclass(register struct parse *p, register cset *cs);
16+
static void p_b_eclass(register struct parse *p, register cset *cs);
17+
static char p_b_symbol(register struct parse *p);
18+
static char p_b_coll_elem(register struct parse *p, int endc);
19+
static char othercase(int ch);
20+
static void bothcases(register struct parse *p, int ch);
21+
static void ordinary(register struct parse *p, register int ch);
22+
static void nonnewline(register struct parse *p);
23+
static void repeat(register struct parse *p, sopno start, int from, int to);
24+
static int seterr(register struct parse *p, int e);
25+
static cset *allocset(register struct parse *p);
26+
static void freeset(register struct parse *p, register cset *cs);
27+
static int freezeset(register struct parse *p, register cset *cs);
28+
static int firstch(register struct parse *p, register cset *cs);
29+
static int nch(register struct parse *p, register cset *cs);
30+
static void mcadd(register struct parse *p, register cset *cs, register char *cp);
31+
static void mcinvert(register struct parse *p, register cset *cs);
32+
static void mccase(register struct parse *p, register cset *cs);
33+
static int isinsets(register struct re_guts *g, int c);
34+
static int samesets(register struct re_guts *g, int c1, int c2);
35+
static void categorize(struct parse *p, register struct re_guts *g);
36+
static sopno dupl(register struct parse *p, sopno start, sopno finish);
37+
static void doemit(register struct parse *p, sop op, size_t opnd);
38+
static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
39+
static void dofwd(register struct parse *p, sopno pos, sop value);
40+
static void enlarge(register struct parse *p, sopno size);
41+
static void stripsnug(register struct parse *p, register struct re_guts *g);
42+
static void findmust(register struct parse *p, register struct re_guts *g);
43+
static sopno pluscount(register struct parse *p, register struct re_guts *g);
44+
45+
#ifdef __cplusplus
46+
}
47+
#endif
48+
/* ========= end header generated by ../../regex/mkh ========= */

‎ext/ereg/regex/regerror.ih

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/regerror.c === */
7+
static char *regatoi(const regex_t *preg, char *localbuf);
8+
9+
#ifdef __cplusplus
10+
}
11+
#endif
12+
/* ========= end header generated by ../../regex/mkh ========= */

‎php4.dsp

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎php4.dsw

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Microsoft Developer Studio Workspace File, Format Version 6.00
2+
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
3+
4+
###############################################################################
5+
6+
Project: "libzend"=..\libzend\libzend.dsp - Package Owner=<4>
7+
8+
Package=<5>
9+
{{{
10+
}}}
11+
12+
Package=<4>
13+
{{{
14+
}}}
15+
16+
###############################################################################
17+
18+
Project: "php4"=.\php4.dsp - Package Owner=<4>
19+
20+
Package=<5>
21+
{{{
22+
}}}
23+
24+
Package=<4>
25+
{{{
26+
}}}
27+
28+
###############################################################################
29+
30+
Global:
31+
32+
Package=<5>
33+
{{{
34+
}}}
35+
36+
Package=<3>
37+
{{{
38+
}}}
39+
40+
###############################################################################
41+

‎regex/debug.ih

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* ========= begin header generated by ./mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === debug.c === */
7+
void regprint(regex_t *r, FILE *d);
8+
static void s_print(register struct re_guts *g, FILE *d);
9+
static char *regchar(int ch);
10+
11+
#ifdef __cplusplus
12+
}
13+
#endif
14+
/* ========= end header generated by ./mkh ========= */

‎regex/engine.ih

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/engine.c === */
7+
static int matcher(register struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
8+
static char *dissect(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
9+
static char *backref(register struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
10+
static char *fast(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
11+
static char *slow(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
12+
static states step(register struct re_guts *g, sopno start, sopno stop, register states bef, int ch, register states aft);
13+
#define BOL (OUT+1)
14+
#define EOL (BOL+1)
15+
#define BOLEOL (BOL+2)
16+
#define NOTHING (BOL+3)
17+
#define BOW (BOL+4)
18+
#define EOW (BOL+5)
19+
#define CODEMAX (BOL+5) /* highest code used */
20+
#define NONCHAR(c) ((c) > CHAR_MAX)
21+
#define NNONCHAR (CODEMAX-CHAR_MAX)
22+
#ifdef REDEBUG
23+
static void print(struct match *m, char *caption, states st, int ch, FILE *d);
24+
#endif
25+
#ifdef REDEBUG
26+
static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
27+
#endif
28+
#ifdef REDEBUG
29+
static char *pchar(int ch);
30+
#endif
31+
32+
#ifdef __cplusplus
33+
}
34+
#endif
35+
/* ========= end header generated by ../../regex/mkh ========= */

‎regex/main.ih

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* ========= begin header generated by ./mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === main.c === */
7+
void regress(FILE *in);
8+
void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
9+
int options(int type, char *s);
10+
int opt(int c, char *s);
11+
void fixstr(register char *p);
12+
char *check(char *str, regmatch_t sub, char *should);
13+
static char *eprint(int err);
14+
static int efind(char *name);
15+
16+
#ifdef __cplusplus
17+
}
18+
#endif
19+
/* ========= end header generated by ./mkh ========= */

‎regex/regcomp.ih

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/regcomp.c === */
7+
static void p_ere(register struct parse *p, int stop);
8+
static void p_ere_exp(register struct parse *p);
9+
static void p_str(register struct parse *p);
10+
static void p_bre(register struct parse *p, register int end1, register int end2);
11+
static int p_simp_re(register struct parse *p, int starordinary);
12+
static int p_count(register struct parse *p);
13+
static void p_bracket(register struct parse *p);
14+
static void p_b_term(register struct parse *p, register cset *cs);
15+
static void p_b_cclass(register struct parse *p, register cset *cs);
16+
static void p_b_eclass(register struct parse *p, register cset *cs);
17+
static char p_b_symbol(register struct parse *p);
18+
static char p_b_coll_elem(register struct parse *p, int endc);
19+
static char othercase(int ch);
20+
static void bothcases(register struct parse *p, int ch);
21+
static void ordinary(register struct parse *p, register int ch);
22+
static void nonnewline(register struct parse *p);
23+
static void repeat(register struct parse *p, sopno start, int from, int to);
24+
static int seterr(register struct parse *p, int e);
25+
static cset *allocset(register struct parse *p);
26+
static void freeset(register struct parse *p, register cset *cs);
27+
static int freezeset(register struct parse *p, register cset *cs);
28+
static int firstch(register struct parse *p, register cset *cs);
29+
static int nch(register struct parse *p, register cset *cs);
30+
static void mcadd(register struct parse *p, register cset *cs, register char *cp);
31+
static void mcinvert(register struct parse *p, register cset *cs);
32+
static void mccase(register struct parse *p, register cset *cs);
33+
static int isinsets(register struct re_guts *g, int c);
34+
static int samesets(register struct re_guts *g, int c1, int c2);
35+
static void categorize(struct parse *p, register struct re_guts *g);
36+
static sopno dupl(register struct parse *p, sopno start, sopno finish);
37+
static void doemit(register struct parse *p, sop op, size_t opnd);
38+
static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
39+
static void dofwd(register struct parse *p, sopno pos, sop value);
40+
static void enlarge(register struct parse *p, sopno size);
41+
static void stripsnug(register struct parse *p, register struct re_guts *g);
42+
static void findmust(register struct parse *p, register struct re_guts *g);
43+
static sopno pluscount(register struct parse *p, register struct re_guts *g);
44+
45+
#ifdef __cplusplus
46+
}
47+
#endif
48+
/* ========= end header generated by ../../regex/mkh ========= */

‎regex/regerror.ih

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* ========= begin header generated by ../../regex/mkh ========= */
2+
#ifdef __cplusplus
3+
extern "C" {
4+
#endif
5+
6+
/* === ../../regex/regerror.c === */
7+
static char *regatoi(const regex_t *preg, char *localbuf);
8+
9+
#ifdef __cplusplus
10+
}
11+
#endif
12+
/* ========= end header generated by ../../regex/mkh ========= */

0 commit comments

Comments
 (0)