flush

diff --git a/.gitignore b/.gitignore
index 70680cf0df90f2d9d888415f779c31339cb3fe4c..0e802ee694df402d851ece3aa356a6f14359d5c8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,7 @@ tests/*/*.php
 tests/*/*.exp
 tests/*/*.log
 tests/*/*.sh
+/compiler.h
+/parser.h
+/parser_proc.h
+/validator.h

diff --git a/Makefile.frag b/Makefile.frag
index fbf6c9c66dd499241a1ecadd87a9f57dedfecc51..79af1be30d759bc6147f83426290a480754da552 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -23,8 +23,8 @@ lemon.c:
 
 ./lemon: lemon.c | lempar.c
 
-$(PHP_PSI_BUILDDIR)/src/parser_proc.c: $(PHP_PSI_SRCDIR)/src/parser_proc.y $(LEMON)
+$(PHP_PSI_SRCDIR)/src/parser_proc.c: $(PHP_PSI_SRCDIR)/src/parser_proc.y $(LEMON)
        $(LEMON) -c $<
 
-$(PHP_PSI_BUILDDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
+$(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
        $(RE2C) -o $@ $<

diff --git a/config.m4 b/config.m4
index 999f61c851d0c48eddac05b0fcd681cec1c898a6..991550584e99eef07506cf760d61c1c102323964 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -29,6 +29,7 @@ if test "$PHP_PSI" != "no"; then
 
        PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
        PHP_PSI_SOURCES=`(cd $PHP_PSI_SRCDIR && echo src/*.c)`
+       PHP_PSI_SOURCES="src/parser.c src/parser_proc.c"
 
        PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
        PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)

diff --git a/idl/Makefile b/idl/Makefile
index 6534ffe3677185790d468845b3e90d7648f39fcf..450905ed66a09b8d0b730a2c6e18a8a739839208 100644 (file)
--- a/idl/Makefile
+++ b/idl/Makefile
@@ -1,4 +1,9 @@
-CFLAGS += -g -D$(shell uname | tr a-z A-Z)
+PHP_INCLUDES := -I/Users/Mike/Sources/php-src.git/{.,main,includes,Zend,TSRM,ext}
+JIT_INCLUDES := -I/usr/local/include
+UNAME := $(shell uname | tr a-z A-Z)
+INCLUDES += $(PHP_INCLUDES) $(JIT_INCLUDES)
+CFLAGS += -g -D$(UNAME) $(INCLUDES)
+LDFLAGS += -ljit -ljitdynamic /usr/local/php7/lib/libphp7.dylib -Xlinker -rpath -Xlinker /usr/local/php7/lib
 SOURCES := parser_proc.c parser.c validator.c compiler.c main.c
 
 GENERATED_FILES := $(addsuffix .h, $(basename $(SOURCES)))
@@ -23,6 +28,8 @@ lemon: lemon.c | lempar.c
 ##
 # Main test program
 ##
+$(SOURCES): Makefile
+
 GENERATED_FILES += main
 main: $(SOURCES)
 

diff --git a/idl/main.c b/idl/main.c
index b4eb459004a3974f731f49704fa30647d17f1e3c..db88740e2ef5be487836dc0ebbef2769713e0561 100644 (file)
--- a/idl/main.c
+++ b/idl/main.c
@@ -5,16 +5,17 @@
 #include "parser.h"
 #include "validator.h"
 
-static int TRACE;
-
 int main(int argc, char *argv[])
 {
        PSI_Parser P;
        PSI_Validator V;
+       unsigned flags = 0;
 
-       TRACE = !!getenv("TRACE");
+       if (getenv("TRACE")) {
+               flags |= PSI_PARSER_DEBUG;
+       }
 
-       if (!PSI_ParserInit(&P, argv[1])) {
+       if (!PSI_ParserInit(&P, argv[1], flags)) {
                perror("Failer to init parser");
                return 1;
        }

diff --git a/src/module.c b/src/module.c
index c45ddb0014ec0908c55c795b151aea6b3a9b285a..31bd2df0441260ef79f3721fb7b32475f13c22fc 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -35,10 +35,10 @@ PHP_MINIT_FUNCTION(psi)
 }
 PHP_MSHUTDOWN_FUNCTION(psi)
 {
-       jit_context_t *ctx = PSI_G(context);
+       jit_context_t ctx = PSI_G(context);
 
        jit_context_destroy(ctx);
-       
+
        UNREGISTER_INI_ENTRIES();
 
        return SUCCESS;