X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fparser.re;h=10279ed7674f52f618a92f0eb8601b6fcb0c926c;hb=6b2e6562e64a263a42910d28e23b6ca94f3ecb65;hp=bb6ccab9225579572ee59defec89fbdd8ef74a6f;hpb=29137b5f19713219a1b9b5fdf54ad94a34d6fde0;p=m6w6%2Fext-psi

diff --git a/src/parser.re b/src/parser.re
index bb6ccab..10279ed 100644
--- 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->proc = PSI_ParserProcAlloc(malloc);
+
 	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);}
+		'CALLBACK' {RETURN(PSI_T_CALLBACK);}
 		'FUNCTION' {RETURN(PSI_T_FUNCTION);}
 		'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
 		'STRUCT' {RETURN(PSI_T_STRUCT);}
@@ -234,7 +235,7 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'BOOLVAL' {RETURN(PSI_T_BOOLVAL);}
 		'ARRVAL' {RETURN(PSI_T_ARRVAL);}
 		'OBJVAL' {RETURN(PSI_T_OBJVAL);}
-		'CBVAL' {RETURN(PSI_T_CBVAL);}
+		'ZVAL' {RETURN(PSI_T_ZVAL);}
 		'CALLOC' {RETURN(PSI_T_CALLOC);}
 		'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
 		'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}