Skip to content

Commit 59f5298

Browse files
zsuraskizsuraski
committed
Make the C++less scanner compile under UNIX
1 parent 8d963b1 commit 59f5298

File tree

5 files changed

+10
-33
lines changed

5 files changed

+10
-33
lines changed

‎Zend/Makefile.am

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,30 @@
33
#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output
44

55
AUTOMAKE_OPTIONS=foreign
6-
EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
7-
noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
8-
9-
libZend_cc_la_SOURCES=zend_language_scanner_cc.cc zend_ini_scanner_cc.cc
10-
libZend_c_la_SOURCES=zend_language_scanner.c zend_ini_scanner.c
6+
noinst_LTLIBRARIES=libZend.la
117

128
libZend_la_SOURCES=\
13-
zend_language_parser.y \
14-
zend_ini_parser.y \
9+
zend_language_parser.y zend_language_scanner.l \
10+
zend_ini_parser.y zend_ini_scanner.l \
1511
zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
1612
zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
1713
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
1814
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
1915
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
2016
zend_ini.c
2117

22-
libZend_la_LIBADD = $(ZEND_SCANNER)
2318
libZend_la_LDFLAGS = @EXTRA_LIBS@
24-
libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
2519

2620
# automake isn't too clever about "non-standard" use of lex and yacc
2721

28-
$(libZend_la_OBJECTS) zend_language_scanner.lo zend_language_scanner_cc.lo: zend_language_parser.h
22+
$(libZend_la_OBJECTS): zend_language_parser.h
2923

30-
zend_ini_scanner.lo zend_ini_scanner_cc.lo: zend_ini_parser.h
24+
zend_ini_scanner.lo: zend_ini_parser.h
3125

3226
# Language parser/scanner rules
3327

3428
zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
35-
$(LEX) -Pzend -o$@ -i $(srcdir)/zend_language_scanner.l
36-
37-
zend_language_scanner_cc.cc: $(srcdir)/zend_language_scanner.l
38-
$(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $(srcdir)/zend_language_scanner.l
29+
$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
3930

4031
zend_language_parser.h: zend_language_parser.c
4132
zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -47,10 +38,8 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
4738
$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
4839

4940
zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
50-
$(LEX) -Pini_ -o$@ -i $(srcdir)/zend_ini_scanner.l
41+
$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
5142

52-
zend_ini_scanner_cc.cc: $(srcdir)/zend_ini_scanner.l
53-
$(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pini_ -o$@ $(srcdir)/zend_ini_scanner.l
5443
zend_ini_parser.h: zend_ini_parser.c
5544

5645
depend:

‎Zend/Zend.m4

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ AC_CHECK_FUNCS(finite isfinite isinf isnan)
7070
7171
ZEND_FP_EXCEPT
7272
73-
AC_SUBST(ZEND_SCANNER)
74-
7573
])
7674

7775

@@ -153,15 +151,10 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
153151
154152
if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
155153
AC_DEFINE(ZTS,1,[ ])
156-
ZEND_SCANNER_TYPE=cc
157-
CPPFLAGS="$CPPFLAGS -I../TSRM"
154+
CFLAGS="$CFLAGS -DZTS"
158155
LIBZEND_CPLUSPLUS_CHECKS
159-
else
160-
ZEND_SCANNER_TYPE=c
161156
fi
162157
163-
ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la"
164-
165158
if test "$ZEND_MEMORY_LIMIT" = "yes"; then
166159
AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
167160
else

‎Zend/flex.skl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ class istream;
107107

108108
typedef struct yy_buffer_state *YY_BUFFER_STATE;
109109

110-
//FIXextern int yyleng;
111110
%-
112-
//FIX extern FILE *yyin, *yyout;
113111
%*
114112

115113

@@ -214,7 +212,6 @@ struct yy_buffer_state
214212
};
215213

216214
%- Standard (non-C++) definition
217-
//FIXstatic YY_BUFFER_STATE yy_current_buffer = 0;
218215
#define yy_current_buffer SCNG(current_buffer)
219216
%*
220217

@@ -232,8 +229,6 @@ static char yy_hold_char;
232229
static int yy_n_chars; /* number of characters read into yy_ch_buf */
233230

234231

235-
//FIXint yyleng;
236-
237232
/* Points to current character in buffer. */
238233
#define yy_c_buf_p SCNG(c_buf_p)
239234
#define yy_init SCNG(init)

‎Zend/zend_ini_scanner.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "zend_ini_parser.h"
2323
#include "zend_ini_scanner.h"
2424

25-
#ifdef ZTS
25+
#ifdef __cplusplus
2626
# ifdef HAVE_STDIOSTR_H
2727
# include <stdiostr.h>
2828
# endif

‎Zend/zend_language_scanner.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include "zend_variables.h"
5050
#include "zend_operators.h"
5151

52-
#ifdef ZTS
52+
#ifdef __cplusplus
5353
# include <fstream.h>
5454
# ifdef HAVE_STDIOSTR_H
5555
# include <stdiostr.h>

0 commit comments

Comments
 (0)