projects
/
m6w6
/
ext-psi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
6ebcb60
)
parser: NAME fallback ERROR,WARNING
author
Michael Wallner
<mike@php.net>
Tue, 7 Mar 2017 11:50:02 +0000
(12:50 +0100)
committer
Michael Wallner
<mike@php.net>
Wed, 3 May 2017 06:44:09 +0000
(08:44 +0200)
src/cpp.h
patch
|
blob
|
history
src/cpp_tokiter.c
patch
|
blob
|
history
src/parser_proc.c
patch
|
blob
|
history
src/parser_proc.y
patch
|
blob
|
history
src/parser_proc_def.h
patch
|
blob
|
history
diff --git
a/src/cpp.h
b/src/cpp.h
index 81f27b3a348a510e6e033a3c941c46adfa6c7450..1a8fc2c62281d01ba97528ffb3900548e436ec23 100644
(file)
--- a/
src/cpp.h
+++ b/
src/cpp.h
@@
-29,7
+29,7
@@
#include "data.h"
#ifndef PSI_CPP_DEBUG
#include "data.h"
#ifndef PSI_CPP_DEBUG
-# define PSI_CPP_DEBUG
1
+# define PSI_CPP_DEBUG
0
#endif
struct psi_cpp_data {
#endif
struct psi_cpp_data {
diff --git
a/src/cpp_tokiter.c
b/src/cpp_tokiter.c
index 5753af74462add34bc3cbafaaf4f10bd30b8db31..7aa938e07da101dceb0d330bb62e2a16be4c4e35 100644
(file)
--- a/
src/cpp_tokiter.c
+++ b/
src/cpp_tokiter.c
@@
-371,9
+371,7
@@
static void psi_cpp_tokiter_expand_call_tokens(struct psi_cpp_data *cpp,
}
psi_cpp_tokiter_expand_tokens(cpp, tokens);
}
psi_cpp_tokiter_expand_tokens(cpp, tokens);
- psi_cpp_tokiter_seek(cpp, psi_cpp_tokiter_index(cpp) + psi_plist_count(tokens));
psi_plist_free(tokens);
psi_plist_free(tokens);
-
}
static bool psi_cpp_tokiter_expand_call(struct psi_cpp_data *cpp,
}
static bool psi_cpp_tokiter_expand_call(struct psi_cpp_data *cpp,
diff --git
a/src/parser_proc.c
b/src/parser_proc.c
index 81d3ca29210a5e0d94661984116fc3ad5a9e76c7..295c60f1686cdcfd4f325ff896504eb8c52fe099 100644
(file)
--- a/
src/parser_proc.c
+++ b/
src/parser_proc.c
@@
-643,8
+643,8
@@
static const YYCODETYPE yyFallback[] = {
0, /* CALLABLE => nothing */
0, /* PRE_ASSERT => nothing */
0, /* POST_ASSERT => nothing */
0, /* CALLABLE => nothing */
0, /* PRE_ASSERT => nothing */
0, /* POST_ASSERT => nothing */
-
0, /* ERROR => nothing
*/
-
0, /* WARNING => nothing
*/
+
14, /* ERROR => NAME
*/
+
14, /* WARNING => NAME
*/
14, /* TEMP => NAME */
14, /* FREE => NAME */
14, /* SET => NAME */
14, /* TEMP => NAME */
14, /* FREE => NAME */
14, /* SET => NAME */
diff --git
a/src/parser_proc.y
b/src/parser_proc.y
index bac0d381ce9f633cdeba486d984c429ff31d11ec..29d354b133d47f99e9c68cfe5e905dd324bcaca0 100644
(file)
--- a/
src/parser_proc.y
+++ b/
src/parser_proc.y
@@
-60,7
+60,7
@@
void psi_parser_proc_free(void **parser_proc)
%left LSHIFT RSHIFT.
%left PLUS MINUS.
%left ASTERISK SLASH MODULO.
%left LSHIFT RSHIFT.
%left PLUS MINUS.
%left ASTERISK SLASH MODULO.
-%fallback NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT.
+%fallback NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT
ERROR WARNING
.
%wildcard ANY.
%type decl_enum {struct psi_decl_enum *}
%destructor decl_enum {psi_decl_enum_free(&$$);}
%wildcard ANY.
%type decl_enum {struct psi_decl_enum *}
%destructor decl_enum {psi_decl_enum_free(&$$);}
diff --git
a/src/parser_proc_def.h
b/src/parser_proc_def.h
index ed1455a76a95c4c0cb367236256ada0b14e405e5..85cb2992c6f75f1303842f8566e1ce27b0c8d324 100644
(file)
--- a/
src/parser_proc_def.h
+++ b/
src/parser_proc_def.h
@@
-65,7
+65,7
@@
DEF(%left, LSHIFT RSHIFT.)
DEF(%left, PLUS MINUS.)
DEF(%left, ASTERISK SLASH MODULO.)
DEF(%left, PLUS MINUS.)
DEF(%left, ASTERISK SLASH MODULO.)
-DEF(%fallback, NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT.)
+DEF(%fallback, NAME TEMP FREE SET LET RETURN CALLOC CALLBACK ZVAL LIB STRING COUNT
ERROR WARNING
.)
DEF(%wildcard, ANY.)
TOKEN_TYPE(decl_enum, struct psi_decl_enum *)
DEF(%wildcard, ANY.)
TOKEN_TYPE(decl_enum, struct psi_decl_enum *)