flush

diff --git a/src/parser_proc.h b/src/parser_proc.h
index 95f18213ae07a1ef304cc5e604156ab081d16565..9ff8b15fe59b1764b9c1b31dad5951630b75d849 100644 (file)
--- 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 32cba5d48daa207f3f669a438a5e062bee1e09bd..29e59a1592af74341bef880141b7b12478db6367 100644 (file)
--- 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 c5d19c615202a7d793066b14358d81fbdf279788..cb57c118f2b68df5ea070895c892252f5df13fef 100644 (file)
--- 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--
 <?php
 extension_loaded("psi") or die("skip - need ext/psi");

diff --git a/tests/idn/idn002.phpt b/tests/idn/idn002.phpt
index 9f092b1e77eb4966b19d082095c35791715190bc..eae97ab0d8fbf2dfe65ac256c1c5828e11f2fed5 100644 (file)
--- a/tests/idn/idn002.phpt
+++ b/tests/idn/idn002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libidn
 --INI--
-psi.directory={PWD}
+psi.directory={PWD}/../../psis:{PWD}
 --SKIPIF--
 <?php
 extension_loaded("psi") or die("skip - need ext/psi");

diff --git a/tests/idn/idn003.phpt b/tests/idn/idn003.phpt
index 8befdc94cd6fad002b9e0e6f4b511275b7201ba8..99b1b73f9b645543b0470dc151c9be9cc387b116 100644 (file)
--- a/tests/idn/idn003.phpt
+++ b/tests/idn/idn003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libidn
 --INI--
-psi.directory={PWD}
+psi.directory={PWD}/../../psis:{PWD}
 --SKIPIF--
 <?php
 extension_loaded("psi") or die("skip - need ext/psi");

diff --git a/tests/idn/idn004.phpt b/tests/idn/idn004.phpt
index d70f3076deddc150736a143181c63609185ebdec..dc234b2f63912172dc5ddbb80e2cba917e995daf 100644 (file)
--- a/tests/idn/idn004.phpt
+++ b/tests/idn/idn004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libidn
 --INI--
-psi.directory={PWD}
+psi.directory={PWD}/../../psis:{PWD}
 --SKIPIF--
 <?php
 extension_loaded("psi") or die("skip - need ext/psi");