X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.re;h=d5a0f8e0205824d32aaf0134341fb6d8e5c10f7c;hp=d4a25d2a5592e901881d18a56022a59edda168b3;hb=2421d323be79e4a811a4197914330a8c0124b130;hpb=93b5629631b3bfdbb9f06a9036f85f1caf370466

diff --git a/src/parser.re b/src/parser.re
index d4a25d2..d5a0f8e 100644
--- a/src/parser.re
+++ b/src/parser.re
@@ -179,8 +179,11 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		"]" {RETURN(PSI_T_RBRACKET);}
 		"=" {RETURN(PSI_T_EQUALS);}
 		"$" {RETURN(PSI_T_DOLLAR);}
-		"*" {RETURN(PSI_T_POINTER);}
-		"&" {RETURN(PSI_T_REFERENCE);}
+		"*" {RETURN(PSI_T_ASTERISK);}
+		"&" {RETURN(PSI_T_AMPERSAND);}
+		"+" {RETURN(PSI_T_PLUS);}
+		"-" {RETURN(PSI_T_MINUS);}
+		"/" {RETURN(PSI_T_SLASH);}
 		[\r\n] { ++P->line; continue; }
 		[\t ]+ { continue; }
 		'TRUE' {RETURN(PSI_T_TRUE);}
@@ -203,6 +206,7 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'UNSIGNED' {RETURN(PSI_T_UNSIGNED);}
 		'STRING' {RETURN(PSI_T_STRING);}
 		'ARRAY' {RETURN(PSI_T_ARRAY);}
+		'OBJECT' {RETURN(PSI_T_OBJECT);}
 		'FUNCTION' {RETURN(PSI_T_FUNCTION);}
 		'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
 		'STRUCT' {RETURN(PSI_T_STRUCT);}
@@ -214,11 +218,14 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'FREE' {RETURN(PSI_T_FREE);}
 		'STRLEN' {RETURN(PSI_T_STRLEN);}
 		'STRVAL' {RETURN(PSI_T_STRVAL);}
+		'PATHVAL' {RETURN(PSI_T_PATHVAL);}
 		'INTVAL' {RETURN(PSI_T_INTVAL);}
 		'FLOATVAL' {RETURN(PSI_T_FLOATVAL);}
 		'BOOLVAL' {RETURN(PSI_T_BOOLVAL);}
 		'ARRVAL' {RETURN(PSI_T_ARRVAL);}
+		'OBJVAL' {RETURN(PSI_T_OBJVAL);}
 		'CALLOC' {RETURN(PSI_T_CALLOC);}
+		'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
 		'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}
 		'TO_STRING' {RETURN(PSI_T_TO_STRING);}
 		'TO_INT' {RETURN(PSI_T_TO_INT);}