From 4d2c075c160bbc1ff49c3499f8fdd07d9c447a12 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 20 Feb 2017 20:40:05 +0100
Subject: [PATCH] build: fixes

---
 .gitignore          |   5 +-
 Makefile.frag       |   6 +-
 config.m4           |   5 ++
 m4/psi/psi.m4       |  11 +--
 m4/psi/psi_const.m4 |   2 +-
 m4/psi/psi_macro.m4 |   2 +-
 m4/psi/psi_type.m4  |   8 +-
 src/parser.c        | 212 ++++++++++++++++++++++----------------------
 8 files changed, 130 insertions(+), 121 deletions(-)

diff --git a/.gitignore b/.gitignore
index 98279a6..93a5b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ tests/*/*.sh
 /token.h
 /types.h
 /src/parser_proc.out
-/src/php_psi_stdinc.h
-/src/php_psi_posix.h
+/php_psi_stdinc.h
+/php_psi_posix.h
 /types/
+/calc/
\ No newline at end of file
diff --git a/Makefile.frag b/Makefile.frag
index 9e33c50..c30e694 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -34,7 +34,7 @@ $(PHP_PSI_SRCDIR)/src/parser.re: $(PHP_PSI_SRCDIR)/src/parser_proc.h
 	touch $@
 $(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
 	# trickery needed for relative #line directives
-	cd $(PHP_PSI_SRCDIR) && $(RE2C) -o $@ $(patsubst $(PHP_PSI_SRCDIR)/%,%,$<)
+	cd $(PHP_PSI_SRCDIR) && $(RE2C) -o $(patsubst $(PHP_PSI_SRCDIR)/%,%,$@) $(patsubst $(PHP_PSI_SRCDIR)/%,%,$<)
 
 $(PHP_PSI_SRCDIR)/src/calc/basic.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_basic.php
 	$(PHP_EXECUTABLE) $< >$@
@@ -49,12 +49,14 @@ $(PHP_PSI_SRCDIR)/src/calc/cmp.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_cmp.php
 $(PHP_PSI_SRCDIR)/src/calc/oper.h: $(PHP_PSI_SRCDIR)/scripts/gen_calc_oper.php
 	$(PHP_EXECUTABLE) $< >$@
 
+$(PHP_PSI_SRCDIR)/src/calc.h: | $(PHP_PSI_SRCDIR)/src/calc/basic.h $(PHP_PSI_SRCDIR)/src/calc/bin.h $(PHP_PSI_SRCDIR)/src/calc/bool.h $(PHP_PSI_SRCDIR)/src/calc/cast.h $(PHP_PSI_SRCDIR)/src/calc/cmp.h $(PHP_PSI_SRCDIR)/src/calc/oper.h
+
 .PHONY: psi-generated
 psi-generated: $(PHP_PSI_GENERATED)
 
 PHP_PSI_DEPEND = $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(PHP_PSI_SOURCES:.c=.dep))
 
-$(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c
+$(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c | $(PHP_PSI_GENERATED)
 	$(CC) -MM -MG -MF $@ -MT $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(@:.dep=.lo)) \
 		$(CPPFLAGS) $(DEFS) $(INCLUDES) $< \
 			|| touch $@
diff --git a/config.m4 b/config.m4
index 76c1066..5c8ed57 100644
--- a/config.m4
+++ b/config.m4
@@ -86,6 +86,11 @@ if test "$PHP_PSI" != no; then
 		AC_MSG_RESULT([already defined])
 	])
 
+	AC_MSG_CHECKING([psi source dir])
+	AC_MSG_RESULT([$PHP_PSI_SRCDIR])
+	AC_MSG_CHECKING([psi build dir])
+	AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
+	
 	PSI_LEMON
 	PSI_CHECK_LIBJIT
 	PSI_CHECK_LIBFFI
diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index d9dd4c4..f99d582 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -7,6 +7,8 @@ AC_DEFUN(PSI_CONFIG_INIT, [
 	psi_save_LIBS=$LIBS
 	LIBS=
 
+	ac_includes_default="AC_INCLUDES_DEFAULT"
+	
 	AC_PROG_AWK
 	AC_PATH_PROG(NM, nm)
 	AC_CACHE_CHECK(for libc start main symbol, psi_cv_libc_main, [
@@ -200,16 +202,15 @@ AC_DEFUN(PSI_PTHREAD, [
 
 dnl PSI_INCLUDES()
 dnl Expands to a complete list of include statements including
-dnl AC_INCLUDES_DEFAULT().
-AC_DEFUN(PSI_INCLUDES, [dnl
-#define PSI_INCLUDES
+dnl autoconf's defaults.
+AC_DEFUN(PSI_INCLUDES, [
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
 #ifndef _REENTRANT
 # define _REENTRANT
 #endif
-AC_INCLUDES_DEFAULT()
+$ac_includes_default
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
@@ -383,7 +384,7 @@ AC_DEFUN(PSI_CHECK_OFFSETOF, [
 		[offset of $2 in $1],
 		[AS_TR_SH([ac_cv_offsetof_$1_$2])],
 		[(long int) (offsetof ($1, $2))],
-		[PSI_INCLUDES],
+		PSI_INCLUDES,
 		[AC_MSG_FAILURE([cannot compute offsetof ($1, $2)])]
 	)
 	AC_DEFINE_UNQUOTED(
diff --git a/m4/psi/psi_const.m4 b/m4/psi/psi_const.m4
index e98561d..98aeed4 100644
--- a/m4/psi/psi_const.m4
+++ b/m4/psi/psi_const.m4
@@ -25,5 +25,5 @@ AC_DEFUN(PSI_CONST, [
 			psi_add_int_const "$1"
 			;;
 		esac
-	],, [PSI_INCLUDES])
+	],, PSI_INCLUDES)
 ])
diff --git a/m4/psi/psi_macro.m4 b/m4/psi/psi_macro.m4
index d156389..9ff8fd9 100644
--- a/m4/psi/psi_macro.m4
+++ b/m4/psi/psi_macro.m4
@@ -48,7 +48,7 @@ AC_DEFUN(PSI_MACRO, [
 		$3
 		psi_add_macro "$macro_return _psi_${macro_action}_$macro_name$macro_decl { $macro_body }"
 		PSI_REDIR($macro_name, _psi_${macro_action}_$macro_name)
-	], [], [PSI_INCLUDES])
+	], [], PSI_INCLUDES)
 ])
 
 dnl PSI_EXTVAR(type var)
diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index 28aa580..27aeeac 100644
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -52,7 +52,7 @@ AC_DEFUN(PSI_TYPE, [
 	psi_basic_type=AS_TR_SH($2)
 	case $psi_basic_type in
 	int)
-		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], [PSI_INCLUDES])
+		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], PSI_INCLUDES)
 		;;
 	sint)
 		psi_basic_type=int
@@ -74,7 +74,7 @@ AC_DEFUN(PSI_STDTYPE, [
 		[double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
 		[long double],[psi_add_stdtype "{PSI_T_LONG_DOUBLE, \"long double\", NULL}"],
 		[
-			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, PSI_INCLUDES)
 			AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
 			psi_add_stdtype "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 		])
@@ -113,7 +113,7 @@ AC_DEFUN(PSI_OPAQUE_TYPE, [
 		])
 		case "$AS_TR_SH([psi_cv_type_class_]$1)" in
 		scalar)
-			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], PSI_INCLUDES)
 			psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 			;;
 		struct)
@@ -232,7 +232,7 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_CHECK_ALIGNOF(long double)
 
 	PSI_STDTYPE(bool)
-	AC_CHECK_ALIGNOF(bool, [PSI_INCLUDES])
+	AC_CHECK_ALIGNOF(bool, PSI_INCLUDES)
 
 	PSI_STDTYPE(char, int)
 	AC_CHECK_ALIGNOF(char)
diff --git a/src/parser.c b/src/parser.c
index d4cc07f..97ef23f 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Feb  9 15:55:09 2017 */
+/* Generated by re2c 0.16 on Mon Feb 20 20:39:25 2017 */
 #line 1 "src/parser.re"
 #include "php_psi_stdinc.h"
 #include <sys/mman.h>
@@ -230,7 +230,7 @@ token_t psi_parser_scan(struct psi_parser *P)
 	nextline:
 		P->tok = P->cur;
 		
-#line 234 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 234 "src/parser.c"
 		{
 			unsigned char yych;
 			unsigned int yyaccept = 0;
@@ -338,7 +338,7 @@ yy2:
 yy3:
 #line 346 "src/parser.re"
 			{break;}
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 342 "src/parser.c"
 yy4:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -351,12 +351,12 @@ yy4:
 yy6:
 #line 281 "src/parser.re"
 			{ continue; }
-#line 355 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 355 "src/parser.c"
 yy7:
 			++P->cur;
 #line 280 "src/parser.re"
 			{ NEWLINE(nextline); }
-#line 360 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 360 "src/parser.c"
 yy9:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -366,7 +366,7 @@ yy9:
 yy10:
 #line 265 "src/parser.re"
 			{RETURN(PSI_T_NOT);}
-#line 370 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 370 "src/parser.c"
 yy11:
 			yyaccept = 0;
 			yych = *(P->mrk = ++P->cur);
@@ -450,7 +450,7 @@ yy14:
 			++P->cur;
 #line 266 "src/parser.re"
 			{RETURN(PSI_T_MODULO);}
-#line 454 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 454 "src/parser.c"
 yy16:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -460,22 +460,22 @@ yy16:
 yy17:
 #line 267 "src/parser.re"
 			{RETURN(PSI_T_AMPERSAND);}
-#line 464 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 464 "src/parser.c"
 yy18:
 			++P->cur;
 #line 249 "src/parser.re"
 			{RETURN(PSI_T_LPAREN);}
-#line 469 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 469 "src/parser.c"
 yy20:
 			++P->cur;
 #line 250 "src/parser.re"
 			{RETURN(PSI_T_RPAREN);}
-#line 474 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 474 "src/parser.c"
 yy22:
 			++P->cur;
 #line 263 "src/parser.re"
 			{RETURN(PSI_T_ASTERISK);}
-#line 479 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 479 "src/parser.c"
 yy24:
 			yyaccept = 1;
 			yych = *(P->mrk = ++P->cur);
@@ -496,12 +496,12 @@ yy24:
 yy25:
 #line 268 "src/parser.re"
 			{RETURN(PSI_T_PLUS);}
-#line 500 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 500 "src/parser.c"
 yy26:
 			++P->cur;
 #line 252 "src/parser.re"
 			{RETURN(PSI_T_COMMA);}
-#line 505 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 505 "src/parser.c"
 yy28:
 			yyaccept = 2;
 			yych = *(P->mrk = ++P->cur);
@@ -522,7 +522,7 @@ yy28:
 yy29:
 #line 269 "src/parser.re"
 			{RETURN(PSI_T_MINUS);}
-#line 526 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 526 "src/parser.c"
 yy30:
 			yyaccept = 0;
 			yych = *(P->mrk = ++P->cur);
@@ -551,7 +551,7 @@ yy31:
 yy32:
 #line 270 "src/parser.re"
 			{RETURN(PSI_T_SLASH);}
-#line 555 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 555 "src/parser.c"
 yy33:
 			yyaccept = 4;
 			P->mrk = ++P->cur;
@@ -576,17 +576,17 @@ yy33:
 yy35:
 #line 341 "src/parser.re"
 			{RETURN(PSI_T_NUMBER);}
-#line 580 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 580 "src/parser.c"
 yy36:
 			++P->cur;
 #line 253 "src/parser.re"
 			{RETURN(PSI_T_COLON);}
-#line 585 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 585 "src/parser.c"
 yy38:
 			++P->cur;
 #line 251 "src/parser.re"
 			{RETURN(PSI_T_EOS);}
-#line 590 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 590 "src/parser.c"
 yy40:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -597,7 +597,7 @@ yy40:
 yy41:
 #line 277 "src/parser.re"
 			{RETURN(PSI_T_LCHEVR);}
-#line 601 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 601 "src/parser.c"
 yy42:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -607,7 +607,7 @@ yy42:
 yy43:
 #line 262 "src/parser.re"
 			{RETURN(PSI_T_EQUALS);}
-#line 611 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 611 "src/parser.c"
 yy44:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -618,7 +618,7 @@ yy44:
 yy45:
 #line 278 "src/parser.re"
 			{RETURN(PSI_T_RCHEVR);}
-#line 622 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 622 "src/parser.c"
 yy46:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -630,7 +630,7 @@ yy46:
 yy47:
 #line 342 "src/parser.re"
 			{RETURN(PSI_T_NAME);}
-#line 634 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 634 "src/parser.c"
 yy48:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -876,7 +876,7 @@ yy67:
 			++P->cur;
 #line 256 "src/parser.re"
 			{RETURN(PSI_T_LBRACKET);}
-#line 880 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 880 "src/parser.c"
 yy69:
 			yych = *++P->cur;
 			switch (yych) {
@@ -939,17 +939,17 @@ yy70:
 			++P->cur;
 #line 257 "src/parser.re"
 			{RETURN(PSI_T_RBRACKET);}
-#line 943 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 943 "src/parser.c"
 yy72:
 			++P->cur;
 #line 272 "src/parser.re"
 			{RETURN(PSI_T_CARET);}
-#line 948 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 948 "src/parser.c"
 yy74:
 			++P->cur;
 #line 254 "src/parser.re"
 			{RETURN(PSI_T_LBRACE);}
-#line 953 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 953 "src/parser.c"
 yy76:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -959,22 +959,22 @@ yy76:
 yy77:
 #line 271 "src/parser.re"
 			{RETURN(PSI_T_PIPE);}
-#line 963 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 963 "src/parser.c"
 yy78:
 			++P->cur;
 #line 255 "src/parser.re"
 			{RETURN(PSI_T_RBRACE);}
-#line 968 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 968 "src/parser.c"
 yy80:
 			++P->cur;
 #line 264 "src/parser.re"
 			{RETURN(PSI_T_TILDE);}
-#line 973 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 973 "src/parser.c"
 yy82:
 			++P->cur;
 #line 258 "src/parser.re"
 			{RETURN(PSI_T_CMP_NE);}
-#line 978 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 978 "src/parser.c"
 yy84:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -996,7 +996,7 @@ yy88:
 			++P->cur;
 #line 248 "src/parser.re"
 			{ NEWLINE(nextline); }
-#line 1000 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1000 "src/parser.c"
 yy90:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -1070,12 +1070,12 @@ yy90:
 yy92:
 #line 344 "src/parser.re"
 			{RETURN(PSI_T_DOLLAR_NAME);}
-#line 1074 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1074 "src/parser.c"
 yy93:
 			++P->cur;
 #line 260 "src/parser.re"
 			{RETURN(PSI_T_AND);}
-#line 1079 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1079 "src/parser.c"
 yy95:
 			yych = *++P->cur;
 			switch (yych) {
@@ -1191,7 +1191,7 @@ yy100:
 			++P->cur;
 #line 247 "src/parser.re"
 			{ goto comment; }
-#line 1195 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1195 "src/parser.c"
 yy102:
 			yych = *++P->cur;
 			switch (yych) {
@@ -1213,27 +1213,27 @@ yy103:
 			++P->cur;
 #line 273 "src/parser.re"
 			{RETURN(PSI_T_LSHIFT);}
-#line 1217 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1217 "src/parser.c"
 yy105:
 			++P->cur;
 #line 275 "src/parser.re"
 			{RETURN(PSI_T_CMP_LE);}
-#line 1222 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1222 "src/parser.c"
 yy107:
 			++P->cur;
 #line 259 "src/parser.re"
 			{RETURN(PSI_T_CMP_EQ);}
-#line 1227 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1227 "src/parser.c"
 yy109:
 			++P->cur;
 #line 276 "src/parser.re"
 			{RETURN(PSI_T_CMP_GE);}
-#line 1232 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1232 "src/parser.c"
 yy111:
 			++P->cur;
 #line 274 "src/parser.re"
 			{RETURN(PSI_T_RSHIFT);}
-#line 1237 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1237 "src/parser.c"
 yy113:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -1646,22 +1646,22 @@ yy148:
 yy150:
 #line 343 "src/parser.re"
 			{RETURN(PSI_T_NSNAME);}
-#line 1650 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1650 "src/parser.c"
 yy151:
 			++P->cur;
 #line 261 "src/parser.re"
 			{RETURN(PSI_T_OR);}
-#line 1655 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1655 "src/parser.c"
 yy153:
 			++P->cur;
 #line 345 "src/parser.re"
 			{RETURN(PSI_T_QUOTED_STRING);}
-#line 1660 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1660 "src/parser.c"
 yy155:
 			++P->cur;
 #line 279 "src/parser.re"
 			{RETURN(PSI_T_ELLIPSIS);}
-#line 1665 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1665 "src/parser.c"
 yy157:
 			yych = *++P->cur;
 			switch (yych) {
@@ -1865,7 +1865,7 @@ yy172:
 yy173:
 #line 291 "src/parser.re"
 			{RETURN(PSI_T_INT);}
-#line 1869 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1869 "src/parser.c"
 yy174:
 			yyaccept = 8;
 			yych = *(P->mrk = ++P->cur);
@@ -1939,7 +1939,7 @@ yy174:
 yy175:
 #line 317 "src/parser.re"
 			{RETURN(PSI_T_LET);}
-#line 1943 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1943 "src/parser.c"
 yy176:
 			yyaccept = 9;
 			yych = *(P->mrk = ++P->cur);
@@ -2013,7 +2013,7 @@ yy176:
 yy177:
 #line 316 "src/parser.re"
 			{RETURN(PSI_T_LIB);}
-#line 2017 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2017 "src/parser.c"
 yy178:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2152,7 +2152,7 @@ yy186:
 yy187:
 #line 318 "src/parser.re"
 			{RETURN(PSI_T_SET);}
-#line 2156 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2156 "src/parser.c"
 yy188:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2362,7 +2362,7 @@ yy203:
 yy204:
 #line 288 "src/parser.re"
 			{RETURN(PSI_T_BOOL);}
-#line 2366 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2366 "src/parser.c"
 yy205:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2448,7 +2448,7 @@ yy206:
 yy207:
 #line 289 "src/parser.re"
 			{RETURN(PSI_T_CHAR);}
-#line 2452 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2452 "src/parser.c"
 yy208:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2546,7 +2546,7 @@ yy211:
 yy212:
 #line 314 "src/parser.re"
 			{RETURN(PSI_T_ENUM);}
-#line 2550 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2550 "src/parser.c"
 yy213:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2636,7 +2636,7 @@ yy215:
 yy216:
 #line 322 "src/parser.re"
 			{RETURN(PSI_T_FREE);}
-#line 2640 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2640 "src/parser.c"
 yy217:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2754,7 +2754,7 @@ yy223:
 yy224:
 #line 292 "src/parser.re"
 			{RETURN(PSI_T_LONG);}
-#line 2758 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2758 "src/parser.c"
 yy225:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -2836,7 +2836,7 @@ yy226:
 yy227:
 #line 284 "src/parser.re"
 			{RETURN(PSI_T_NULL);}
-#line 2840 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 2840 "src/parser.c"
 yy228:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3013,7 +3013,7 @@ yy241:
 yy242:
 #line 323 "src/parser.re"
 			{RETURN(PSI_T_TEMP);}
-#line 3017 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3017 "src/parser.c"
 yy243:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3135,7 +3135,7 @@ yy249:
 yy250:
 #line 282 "src/parser.re"
 			{RETURN(PSI_T_TRUE);}
-#line 3139 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3139 "src/parser.c"
 yy251:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3243,7 +3243,7 @@ yy255:
 yy256:
 #line 287 "src/parser.re"
 			{RETURN(PSI_T_VOID);}
-#line 3247 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3247 "src/parser.c"
 yy257:
 			yyaccept = 20;
 			yych = *(P->mrk = ++P->cur);
@@ -3317,7 +3317,7 @@ yy257:
 yy258:
 #line 332 "src/parser.re"
 			{RETURN(PSI_T_ZVAL);}
-#line 3321 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3321 "src/parser.c"
 yy259:
 			yyaccept = 21;
 			yych = *(P->mrk = ++P->cur);
@@ -3391,7 +3391,7 @@ yy259:
 yy260:
 #line 306 "src/parser.re"
 			{RETURN(PSI_T_ARRAY);}
-#line 3395 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3395 "src/parser.c"
 yy261:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3505,7 +3505,7 @@ yy266:
 yy267:
 #line 315 "src/parser.re"
 			{RETURN(PSI_T_CONST);}
-#line 3509 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3509 "src/parser.c"
 yy268:
 			yyaccept = 23;
 			yych = *(P->mrk = ++P->cur);
@@ -3579,7 +3579,7 @@ yy268:
 yy269:
 #line 333 "src/parser.re"
 			{RETURN(PSI_T_COUNT);}
-#line 3583 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3583 "src/parser.c"
 yy270:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3661,7 +3661,7 @@ yy271:
 yy272:
 #line 283 "src/parser.re"
 			{RETURN(PSI_T_FALSE);}
-#line 3665 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3665 "src/parser.c"
 yy273:
 			yyaccept = 25;
 			yych = *(P->mrk = ++P->cur);
@@ -3735,7 +3735,7 @@ yy273:
 yy274:
 #line 293 "src/parser.re"
 			{RETURN(PSI_T_FLOAT);}
-#line 3739 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3739 "src/parser.c"
 yy275:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3854,7 +3854,7 @@ yy281:
 yy282:
 #line 285 "src/parser.re"
 			{RETURN(PSI_T_MIXED);}
-#line 3858 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3858 "src/parser.c"
 yy283:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -3976,7 +3976,7 @@ yy289:
 yy290:
 #line 290 "src/parser.re"
 			{RETURN(PSI_T_SHORT);}
-#line 3980 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 3980 "src/parser.c"
 yy291:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -4182,7 +4182,7 @@ yy308:
 yy309:
 #line 313 "src/parser.re"
 			{RETURN(PSI_T_UNION);}
-#line 4186 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4186 "src/parser.c"
 yy310:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -4264,7 +4264,7 @@ yy311:
 yy312:
 #line 330 "src/parser.re"
 			{RETURN(PSI_T_ARRVAL);}
-#line 4268 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4268 "src/parser.c"
 yy313:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -4362,7 +4362,7 @@ yy316:
 yy317:
 #line 334 "src/parser.re"
 			{RETURN(PSI_T_CALLOC);}
-#line 4366 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4366 "src/parser.c"
 yy318:
 			yyaccept = 31;
 			yych = *(P->mrk = ++P->cur);
@@ -4436,7 +4436,7 @@ yy318:
 yy319:
 #line 294 "src/parser.re"
 			{RETURN(PSI_T_DOUBLE);}
-#line 4440 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4440 "src/parser.c"
 yy320:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -4550,7 +4550,7 @@ yy325:
 yy326:
 #line 295 "src/parser.re"
 			{RETURN(PSI_T_INT8);}
-#line 4554 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4554 "src/parser.c"
 yy327:
 			yyaccept = 33;
 			yych = *(P->mrk = ++P->cur);
@@ -4624,7 +4624,7 @@ yy327:
 yy328:
 #line 327 "src/parser.re"
 			{RETURN(PSI_T_INTVAL);}
-#line 4628 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4628 "src/parser.c"
 yy329:
 			yyaccept = 34;
 			yych = *(P->mrk = ++P->cur);
@@ -4698,7 +4698,7 @@ yy329:
 yy330:
 #line 307 "src/parser.re"
 			{RETURN(PSI_T_OBJECT);}
-#line 4702 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4702 "src/parser.c"
 yy331:
 			yyaccept = 35;
 			yych = *(P->mrk = ++P->cur);
@@ -4772,7 +4772,7 @@ yy331:
 yy332:
 #line 331 "src/parser.re"
 			{RETURN(PSI_T_OBJVAL);}
-#line 4776 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4776 "src/parser.c"
 yy333:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -4870,7 +4870,7 @@ yy336:
 yy337:
 #line 321 "src/parser.re"
 			{RETURN(PSI_T_RETURN);}
-#line 4874 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4874 "src/parser.c"
 yy338:
 			yyaccept = 37;
 			yych = *(P->mrk = ++P->cur);
@@ -4944,7 +4944,7 @@ yy338:
 yy339:
 #line 304 "src/parser.re"
 			{RETURN(PSI_T_SIGNED);}
-#line 4948 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 4948 "src/parser.c"
 yy340:
 			yyaccept = 38;
 			yych = *(P->mrk = ++P->cur);
@@ -5018,7 +5018,7 @@ yy340:
 yy341:
 #line 309 "src/parser.re"
 			{RETURN(PSI_T_STATIC);}
-#line 5022 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5022 "src/parser.c"
 yy342:
 			yyaccept = 39;
 			yych = *(P->mrk = ++P->cur);
@@ -5092,7 +5092,7 @@ yy342:
 yy343:
 #line 305 "src/parser.re"
 			{RETURN(PSI_T_STRING);}
-#line 5096 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5096 "src/parser.c"
 yy344:
 			yyaccept = 40;
 			yych = *(P->mrk = ++P->cur);
@@ -5166,7 +5166,7 @@ yy344:
 yy345:
 #line 324 "src/parser.re"
 			{RETURN(PSI_T_STRLEN);}
-#line 5170 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5170 "src/parser.c"
 yy346:
 			yyaccept = 41;
 			yych = *(P->mrk = ++P->cur);
@@ -5240,7 +5240,7 @@ yy346:
 yy347:
 #line 312 "src/parser.re"
 			{RETURN(PSI_T_STRUCT);}
-#line 5244 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5244 "src/parser.c"
 yy348:
 			yyaccept = 42;
 			yych = *(P->mrk = ++P->cur);
@@ -5314,7 +5314,7 @@ yy348:
 yy349:
 #line 325 "src/parser.re"
 			{RETURN(PSI_T_STRVAL);}
-#line 5318 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5318 "src/parser.c"
 yy350:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -5412,7 +5412,7 @@ yy353:
 yy354:
 #line 338 "src/parser.re"
 			{RETURN(PSI_T_TO_INT);}
-#line 5416 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5416 "src/parser.c"
 yy355:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -5547,7 +5547,7 @@ yy363:
 yy364:
 #line 329 "src/parser.re"
 			{RETURN(PSI_T_BOOLVAL);}
-#line 5551 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5551 "src/parser.c"
 yy365:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -5653,7 +5653,7 @@ yy369:
 yy370:
 #line 297 "src/parser.re"
 			{RETURN(PSI_T_INT16);}
-#line 5657 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5657 "src/parser.c"
 yy371:
 			yyaccept = 46;
 			yych = *(P->mrk = ++P->cur);
@@ -5727,7 +5727,7 @@ yy371:
 yy372:
 #line 299 "src/parser.re"
 			{RETURN(PSI_T_INT32);}
-#line 5731 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5731 "src/parser.c"
 yy373:
 			yyaccept = 47;
 			yych = *(P->mrk = ++P->cur);
@@ -5801,7 +5801,7 @@ yy373:
 yy374:
 #line 301 "src/parser.re"
 			{RETURN(PSI_T_INT64);}
-#line 5805 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5805 "src/parser.c"
 yy375:
 			yyaccept = 48;
 			yych = *(P->mrk = ++P->cur);
@@ -5875,7 +5875,7 @@ yy375:
 yy376:
 #line 326 "src/parser.re"
 			{RETURN(PSI_T_PATHVAL);}
-#line 5879 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5879 "src/parser.c"
 yy377:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -5973,7 +5973,7 @@ yy380:
 yy381:
 #line 340 "src/parser.re"
 			{RETURN(PSI_T_TO_BOOL);}
-#line 5977 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 5977 "src/parser.c"
 yy382:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -6071,7 +6071,7 @@ yy385:
 yy386:
 #line 311 "src/parser.re"
 			{RETURN(PSI_T_TYPEDEF);}
-#line 6075 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6075 "src/parser.c"
 yy387:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -6169,7 +6169,7 @@ yy390:
 yy391:
 #line 296 "src/parser.re"
 			{RETURN(PSI_T_UINT8);}
-#line 6173 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6173 "src/parser.c"
 yy392:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -6251,7 +6251,7 @@ yy393:
 yy394:
 #line 286 "src/parser.re"
 			{RETURN(PSI_T_CALLABLE);}
-#line 6255 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6255 "src/parser.c"
 yy395:
 			yyaccept = 53;
 			yych = *(P->mrk = ++P->cur);
@@ -6325,7 +6325,7 @@ yy395:
 yy396:
 #line 308 "src/parser.re"
 			{RETURN(PSI_T_CALLBACK);}
-#line 6329 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6329 "src/parser.c"
 yy397:
 			yyaccept = 54;
 			yych = *(P->mrk = ++P->cur);
@@ -6399,7 +6399,7 @@ yy397:
 yy398:
 #line 328 "src/parser.re"
 			{RETURN(PSI_T_FLOATVAL);}
-#line 6403 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6403 "src/parser.c"
 yy399:
 			yyaccept = 55;
 			yych = *(P->mrk = ++P->cur);
@@ -6473,7 +6473,7 @@ yy399:
 yy400:
 #line 310 "src/parser.re"
 			{RETURN(PSI_T_FUNCTION);}
-#line 6477 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6477 "src/parser.c"
 yy401:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -6563,7 +6563,7 @@ yy403:
 yy404:
 #line 336 "src/parser.re"
 			{RETURN(PSI_T_TO_ARRAY);}
-#line 6567 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6567 "src/parser.c"
 yy405:
 			yyaccept = 57;
 			yych = *(P->mrk = ++P->cur);
@@ -6637,7 +6637,7 @@ yy405:
 yy406:
 #line 339 "src/parser.re"
 			{RETURN(PSI_T_TO_FLOAT);}
-#line 6641 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6641 "src/parser.c"
 yy407:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -6727,7 +6727,7 @@ yy409:
 yy410:
 #line 298 "src/parser.re"
 			{RETURN(PSI_T_UINT16);}
-#line 6731 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6731 "src/parser.c"
 yy411:
 			yyaccept = 59;
 			yych = *(P->mrk = ++P->cur);
@@ -6801,7 +6801,7 @@ yy411:
 yy412:
 #line 300 "src/parser.re"
 			{RETURN(PSI_T_UINT32);}
-#line 6805 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6805 "src/parser.c"
 yy413:
 			yyaccept = 60;
 			yych = *(P->mrk = ++P->cur);
@@ -6875,7 +6875,7 @@ yy413:
 yy414:
 #line 302 "src/parser.re"
 			{RETURN(PSI_T_UINT64);}
-#line 6879 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6879 "src/parser.c"
 yy415:
 			yyaccept = 61;
 			yych = *(P->mrk = ++P->cur);
@@ -6949,7 +6949,7 @@ yy415:
 yy416:
 #line 303 "src/parser.re"
 			{RETURN(PSI_T_UNSIGNED);}
-#line 6953 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6953 "src/parser.c"
 yy417:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -7039,7 +7039,7 @@ yy419:
 yy420:
 #line 335 "src/parser.re"
 			{RETURN(PSI_T_TO_OBJECT);}
-#line 7043 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7043 "src/parser.c"
 yy421:
 			yyaccept = 63;
 			yych = *(P->mrk = ++P->cur);
@@ -7113,7 +7113,7 @@ yy421:
 yy422:
 #line 337 "src/parser.re"
 			{RETURN(PSI_T_TO_STRING);}
-#line 7117 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7117 "src/parser.c"
 yy423:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -7195,7 +7195,7 @@ yy424:
 yy425:
 #line 319 "src/parser.re"
 			{RETURN(PSI_T_PRE_ASSERT);}
-#line 7199 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7199 "src/parser.c"
 yy426:
 			yyaccept = 65;
 			yych = *(P->mrk = ++P->cur);
@@ -7269,7 +7269,7 @@ yy426:
 yy427:
 #line 320 "src/parser.re"
 			{RETURN(PSI_T_POST_ASSERT);}
-#line 7273 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7273 "src/parser.c"
 		}
 #line 347 "src/parser.re"
 
@@ -7277,7 +7277,7 @@ yy427:
 	comment:
 		P->tok = P->cur;
 		
-#line 7281 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7281 "src/parser.c"
 		{
 			unsigned char yych;
 			if ((P->lim - P->cur) < 2) { if (!psi_parser_fill(P,2)) RETURN(PSI_T_EOF); };
@@ -7292,12 +7292,12 @@ yy430:
 yy431:
 #line 354 "src/parser.re"
 			{ goto comment; }
-#line 7296 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7296 "src/parser.c"
 yy432:
 			++P->cur;
 #line 352 "src/parser.re"
 			{ NEWLINE(comment); }
-#line 7301 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7301 "src/parser.c"
 yy434:
 			yych = *++P->cur;
 			switch (yych) {
@@ -7308,7 +7308,7 @@ yy435:
 			++P->cur;
 #line 353 "src/parser.re"
 			{ continue; }
-#line 7312 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7312 "src/parser.c"
 		}
 #line 355 "src/parser.re"
 
-- 
2.30.2