From 55ba09956ec121467a269a4a968da5fe45388c1e Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 18 Nov 2015 11:16:48 +0100 Subject: [PATCH] flush --- src/parser_proc.h | 108 +++++++++++++++++++++--------------------- src/parser_proc.y | 2 +- tests/idn/idn001.phpt | 2 +- tests/idn/idn002.phpt | 2 +- tests/idn/idn003.phpt | 2 +- tests/idn/idn004.phpt | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/parser_proc.h b/src/parser_proc.h index 95f1821..9ff8b15 100644 --- a/src/parser_proc.h +++ b/src/parser_proc.h @@ -1,58 +1,58 @@ #define PSI_T_NAME 1 -#define PSI_T_COMMENT 2 -#define PSI_T_LIB 3 -#define PSI_T_QUOTED_STRING 4 -#define PSI_T_EOS 5 -#define PSI_T_STRUCT 6 -#define PSI_T_LBRACE 7 -#define PSI_T_RBRACE 8 -#define PSI_T_BOOL 9 -#define PSI_T_INT 10 -#define PSI_T_FLOAT 11 -#define PSI_T_STRING 12 -#define PSI_T_CONST 13 -#define PSI_T_NSNAME 14 -#define PSI_T_EQUALS 15 -#define PSI_T_TYPEDEF 16 -#define PSI_T_LPAREN 17 -#define PSI_T_RPAREN 18 -#define PSI_T_LBRACKET 19 -#define PSI_T_NUMBER 20 -#define PSI_T_RBRACKET 21 -#define PSI_T_COMMA 22 -#define PSI_T_VOID 23 -#define PSI_T_DOUBLE 24 -#define PSI_T_INT8 25 -#define PSI_T_UINT8 26 -#define PSI_T_INT16 27 -#define PSI_T_UINT16 28 -#define PSI_T_INT32 29 -#define PSI_T_UINT32 30 -#define PSI_T_INT64 31 -#define PSI_T_UINT64 32 -#define PSI_T_FUNCTION 33 -#define PSI_T_COLON 34 -#define PSI_T_REFERENCE 35 -#define PSI_T_NULL 36 -#define PSI_T_TRUE 37 -#define PSI_T_FALSE 38 -#define PSI_T_DOLLAR 39 -#define PSI_T_LET 40 -#define PSI_T_CALLOC 41 -#define PSI_T_STRLEN 42 -#define PSI_T_STRVAL 43 -#define PSI_T_INTVAL 44 -#define PSI_T_FLOATVAL 45 -#define PSI_T_BOOLVAL 46 -#define PSI_T_ARRVAL 47 -#define PSI_T_SET 48 -#define PSI_T_TO_ARRAY 49 -#define PSI_T_TO_STRING 50 -#define PSI_T_TO_INT 51 -#define PSI_T_TO_FLOAT 52 -#define PSI_T_TO_BOOL 53 -#define PSI_T_RETURN 54 -#define PSI_T_FREE 55 +#define PSI_T_FREE 2 +#define PSI_T_SET 3 +#define PSI_T_LET 4 +#define PSI_T_RETURN 5 +#define PSI_T_LIB 6 +#define PSI_T_COMMENT 7 +#define PSI_T_QUOTED_STRING 8 +#define PSI_T_EOS 9 +#define PSI_T_STRUCT 10 +#define PSI_T_LBRACE 11 +#define PSI_T_RBRACE 12 +#define PSI_T_BOOL 13 +#define PSI_T_INT 14 +#define PSI_T_FLOAT 15 +#define PSI_T_STRING 16 +#define PSI_T_CONST 17 +#define PSI_T_NSNAME 18 +#define PSI_T_EQUALS 19 +#define PSI_T_TYPEDEF 20 +#define PSI_T_LPAREN 21 +#define PSI_T_RPAREN 22 +#define PSI_T_LBRACKET 23 +#define PSI_T_NUMBER 24 +#define PSI_T_RBRACKET 25 +#define PSI_T_COMMA 26 +#define PSI_T_VOID 27 +#define PSI_T_DOUBLE 28 +#define PSI_T_INT8 29 +#define PSI_T_UINT8 30 +#define PSI_T_INT16 31 +#define PSI_T_UINT16 32 +#define PSI_T_INT32 33 +#define PSI_T_UINT32 34 +#define PSI_T_INT64 35 +#define PSI_T_UINT64 36 +#define PSI_T_FUNCTION 37 +#define PSI_T_COLON 38 +#define PSI_T_REFERENCE 39 +#define PSI_T_NULL 40 +#define PSI_T_TRUE 41 +#define PSI_T_FALSE 42 +#define PSI_T_DOLLAR 43 +#define PSI_T_CALLOC 44 +#define PSI_T_STRLEN 45 +#define PSI_T_STRVAL 46 +#define PSI_T_INTVAL 47 +#define PSI_T_FLOATVAL 48 +#define PSI_T_BOOLVAL 49 +#define PSI_T_ARRVAL 50 +#define PSI_T_TO_ARRAY 51 +#define PSI_T_TO_STRING 52 +#define PSI_T_TO_INT 53 +#define PSI_T_TO_FLOAT 54 +#define PSI_T_TO_BOOL 55 #define PSI_T_MIXED 56 #define PSI_T_ARRAY 57 #define PSI_T_POINTER 58 diff --git a/src/parser_proc.y b/src/parser_proc.y index 32cba5d..29e59a1 100644 --- a/src/parser_proc.y +++ b/src/parser_proc.y @@ -16,10 +16,10 @@ /* TOKEN is defined inside syntax_error */ %syntax_error { PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text); - TOKEN->type = PSI_T_NAME; } %nonassoc NAME. +%fallback NAME FREE SET LET RETURN LIB. file ::= blocks. diff --git a/tests/idn/idn001.phpt b/tests/idn/idn001.phpt index c5d19c6..cb57c11 100644 --- a/tests/idn/idn001.phpt +++ b/tests/idn/idn001.phpt @@ -1,7 +1,7 @@ --TEST-- libidn --INI-- -psi.directory={PWD} +psi.directory={PWD}/../../psis:{PWD} --SKIPIF--