projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'more-validations'
[m6w6/ext-psi]
/
src
/
parser.re
diff --git
a/src/parser.re
b/src/parser.re
index 7e445fd8a0a99c1fc9296803fe920e792cdce7a0..10279ed7674f52f618a92f0eb8601b6fcb0c926c 100644
(file)
--- a/
src/parser.re
+++ b/
src/parser.re
@@
-37,8
+37,8
@@
PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb err
P->line = 1;
P->error = error;
P->flags = flags;
P->line = 1;
P->error = error;
P->flags = flags;
-
P->proc = PSI_ParserProcAlloc(malloc);
P->proc = PSI_ParserProcAlloc(malloc);
+
if (flags & PSI_PARSER_DEBUG) {
PSI_ParserProcTrace(stderr, "PSI> ");
}
if (flags & PSI_PARSER_DEBUG) {
PSI_ParserProcTrace(stderr, "PSI> ");
}
@@
-214,6
+214,7
@@
token_t PSI_ParserScan(PSI_Parser *P)
'STRING' {RETURN(PSI_T_STRING);}
'ARRAY' {RETURN(PSI_T_ARRAY);}
'OBJECT' {RETURN(PSI_T_OBJECT);}
'STRING' {RETURN(PSI_T_STRING);}
'ARRAY' {RETURN(PSI_T_ARRAY);}
'OBJECT' {RETURN(PSI_T_OBJECT);}
+ 'CALLBACK' {RETURN(PSI_T_CALLBACK);}
'FUNCTION' {RETURN(PSI_T_FUNCTION);}
'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
'STRUCT' {RETURN(PSI_T_STRUCT);}
'FUNCTION' {RETURN(PSI_T_FUNCTION);}
'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
'STRUCT' {RETURN(PSI_T_STRUCT);}
@@
-234,6
+235,7
@@
token_t PSI_ParserScan(PSI_Parser *P)
'BOOLVAL' {RETURN(PSI_T_BOOLVAL);}
'ARRVAL' {RETURN(PSI_T_ARRVAL);}
'OBJVAL' {RETURN(PSI_T_OBJVAL);}
'BOOLVAL' {RETURN(PSI_T_BOOLVAL);}
'ARRVAL' {RETURN(PSI_T_ARRVAL);}
'OBJVAL' {RETURN(PSI_T_OBJVAL);}
+ 'ZVAL' {RETURN(PSI_T_ZVAL);}
'CALLOC' {RETURN(PSI_T_CALLOC);}
'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}
'CALLOC' {RETURN(PSI_T_CALLOC);}
'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}