1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
From 385f248446a63a8e3d2e8417f4e9ee95f6c32a91 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Wed, 30 Jul 2025 12:31:36 +0200
Subject: [PATCH] use Zend/zend_smart_string.h
---
php_mailparse_mime.h | 2 +-
php_mailparse_rfc822.c | 92 ++++++++++++++++++++---------------------
php_mailparse_rfc822.re | 2 +-
3 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/php_mailparse_mime.h b/php_mailparse_mime.h
index 8c3747f..38c5d40 100644
--- a/php_mailparse_mime.h
+++ b/php_mailparse_mime.h
@@ -17,7 +17,7 @@
#ifndef php_mailparse_mime_h
#define php_mailparse_mime_h
-#include "ext/standard/php_smart_string.h"
+#include "Zend/zend_smart_string.h"
typedef struct _php_mimepart php_mimepart;
diff --git a/php_mailparse_rfc822.c b/php_mailparse_rfc822.c
index 6bc29a9..28a001a 100644
--- a/php_mailparse_rfc822.c
+++ b/php_mailparse_rfc822.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 2.1.1 on Fri Oct 4 14:25:00 2024 */
+/* Generated by re2c 3.1 on Wed Jul 30 12:30:59 2025 */
#line 1 "/home/php/git/mailparse/php_mailparse_rfc822.re"
/*
+----------------------------------------------------------------------+
@@ -20,7 +20,7 @@
#include "php_mailparse.h"
#include "php_mailparse_rfc822.h"
#include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_string.h"
+#include "Zend/zend_smart_string.h"
#line 36 "/home/php/git/mailparse/php_mailparse_rfc822.re"
@@ -106,63 +106,63 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
if (yybm[0+yych] & 64) {
- goto yy7;
+ goto yy3;
}
if (yych <= '-') {
if (yych <= '%') {
if (yych <= '!') {
- if (yych <= 0x00) goto yy2;
- if (yych <= 0x1F) goto yy4;
- goto yy10;
+ if (yych <= 0x00) goto yy1;
+ if (yych <= 0x1F) goto yy2;
+ goto yy4;
} else {
- if (yych <= '"') goto yy12;
- if (yych <= '$') goto yy4;
- goto yy10;
+ if (yych <= '"') goto yy5;
+ if (yych <= '$') goto yy2;
+ goto yy4;
}
} else {
if (yych <= ')') {
- if (yych <= '\'') goto yy4;
- if (yych <= '(') goto yy15;
- goto yy17;
+ if (yych <= '\'') goto yy2;
+ if (yych <= '(') goto yy6;
+ goto yy7;
} else {
- if (yych == ',') goto yy10;
- goto yy4;
+ if (yych == ',') goto yy4;
+ goto yy2;
}
}
} else {
if (yych <= '>') {
if (yych <= ';') {
- if (yych <= '/') goto yy10;
- if (yych <= '9') goto yy4;
- goto yy10;
+ if (yych <= '/') goto yy4;
+ if (yych <= '9') goto yy2;
+ goto yy4;
} else {
- if (yych <= '<') goto yy19;
- if (yych <= '=') goto yy10;
- goto yy21;
+ if (yych <= '<') goto yy9;
+ if (yych <= '=') goto yy4;
+ goto yy10;
}
} else {
if (yych <= '[') {
- if (yych <= '@') goto yy10;
- if (yych <= 'Z') goto yy4;
- goto yy10;
- } else {
- if (yych <= '\\') goto yy23;
- if (yych <= ']') goto yy10;
+ if (yych <= '@') goto yy4;
+ if (yych <= 'Z') goto yy2;
goto yy4;
+ } else {
+ if (yych <= '\\') goto yy11;
+ if (yych <= ']') goto yy4;
+ goto yy2;
}
}
}
-yy2:
+yy1:
++YYCURSOR;
#line 86 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ goto stop; }
#line 160 "<stdout>"
-yy4:
+yy2:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 32) {
- goto yy4;
+ goto yy2;
}
#line 140 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("ANY");
@@ -176,30 +176,30 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
goto state_ground;
}
#line 179 "<stdout>"
-yy7:
+yy3:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 64) {
- goto yy7;
+ goto yy3;
}
#line 87 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("SPACE"); goto state_ground; }
#line 189 "<stdout>"
-yy10:
+yy4:
++YYCURSOR;
#line 139 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("ATOM"); ADD_ATOM_TOKEN(); goto state_ground; }
#line 194 "<stdout>"
-yy12:
+yy5:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 128) {
- goto yy12;
+ goto yy5;
}
- if (yych >= 0x01) goto yy24;
-yy15:
+ if (yych >= 0x01) goto yy12;
+yy6:
++YYCURSOR;
#line 89 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("START COMMENT");
@@ -211,15 +211,15 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
goto state_comment;
}
#line 214 "<stdout>"
-yy17:
+yy7:
++YYCURSOR;
-yy18:
+yy8:
#line 88 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ REPORT_ERR("token not valid in ground state"); goto state_ground; }
#line 220 "<stdout>"
-yy19:
+yy9:
yych = *++YYCURSOR;
- if (yych == '>') goto yy26;
+ if (yych == '>') goto yy13;
#line 121 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("LANGLE");
if (in_bracket) {
@@ -231,7 +231,7 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
goto state_ground;
}
#line 234 "<stdout>"
-yy21:
+yy10:
++YYCURSOR;
#line 130 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("RANGLE");
@@ -244,13 +244,13 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
goto state_ground;
}
#line 247 "<stdout>"
-yy23:
+yy11:
yych = *++YYCURSOR;
if (yybm[0+yych] & 32) {
- goto yy4;
+ goto yy2;
}
- goto yy18;
-yy24:
+ goto yy8;
+yy12:
++YYCURSOR;
#line 97 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("QUOTE STRING");
@@ -265,7 +265,7 @@ printf("ground: start=%p limit=%p cursor=%p: [%d] %s\n", start, YYLIMIT, YYCURSO
goto state_ground;
}
#line 268 "<stdout>"
-yy26:
+yy13:
++YYCURSOR;
#line 108 "/home/php/git/mailparse/php_mailparse_rfc822.re"
{ DBG_STATE("NULL <>");
diff --git a/php_mailparse_rfc822.re b/php_mailparse_rfc822.re
index 62dee30..98699ac 100644
--- a/php_mailparse_rfc822.re
+++ b/php_mailparse_rfc822.re
@@ -18,7 +18,7 @@
#include "php_mailparse.h"
#include "php_mailparse_rfc822.h"
#include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_string.h"
+#include "Zend/zend_smart_string.h"
/*!re2c
CHAR = [\000-\177];
ALPHA = [\101-\132]|[\141-\172];
|
