X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fnumber.h;h=b2a61cc9f2d91329733a35d5346bb70eba4919c1;hp=d7fa150e09e3de29cadcb3a16c9d0f066c0f6f0d;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=6509a2053456d0e63b6f383b757289d3016ed1a5

diff --git a/src/types/number.h b/src/types/number.h
index d7fa150..b2a61cc 100644
--- a/src/types/number.h
+++ b/src/types/number.h
@@ -26,9 +26,9 @@
 #ifndef PSI_TYPES_NUMBER_H
 #define PSI_TYPES_NUMBER_H
 
-
 struct psi_data;
 struct psi_token;
+struct psi_cpp;
 struct psi_impl;
 struct psi_const;
 struct psi_decl_enum_item;
@@ -36,31 +36,56 @@ struct psi_let_exp;
 struct psi_set_exp;
 struct psi_call_frame;
 struct psi_cpp_macro_call;
+struct psi_validate_scope;
+
+enum psi_number_suffix {
+	PSI_NUMBER_U	= 0x0100,
+	PSI_NUMBER_L	= 0x0200,
+	PSI_NUMBER_UL	= 0x0300,
+
+	PSI_NUMBER_LL	= 0x0400,
+	PSI_NUMBER_ULL	= 0x0500,
+
+	PSI_NUMBER_F	= 0x1000,
+	PSI_NUMBER_D	= 0x2000,
+	PSI_NUMBER_DF	= 0x3000,
+	PSI_NUMBER_DD	= 0x4000,
+	PSI_NUMBER_DL	= 0x2200,
+};
+
+enum psi_number_kind {
+	PSI_NUMBER_INT		= 0x01,
+	PSI_NUMBER_FLT		= 0x02,
+};
 
 struct psi_number {
 	struct psi_token *token;
 	token_t type;
+	unsigned flags;
 	union {
-		char *numb;
+		zend_string *numb;
 		impl_val ival;
 		struct psi_const *cnst;
 		struct psi_decl_var *dvar;
+		struct psi_decl_type *dtyp;
 		struct psi_decl_enum_item *enm;
 		struct psi_cpp_macro_call *call;
 	} data;
 };
 
-struct psi_number *psi_number_init(token_t t, void *num);
+struct psi_number *psi_number_init(token_t t, void *num, unsigned flags);
 struct psi_number *psi_number_copy(struct psi_number *exp);
 void psi_number_free(struct psi_number **exp_ptr);
 void psi_number_dump(int fd, struct psi_number *exp);
 
 bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
-		struct psi_impl *impl, struct psi_decl *cb_decl,
-		struct psi_let_exp *current_let, struct psi_set_exp *current_set,
-		struct psi_decl_enum *current_enum);
+		struct psi_validate_scope *scope);
 
 token_t psi_number_eval(struct psi_number *exp, impl_val *res,
-		struct psi_call_frame *frame, HashTable *defs);
+		struct psi_call_frame *frame, struct psi_cpp *cpp,
+		struct psi_num_exp *rec_guard);
+
+struct psi_plist *psi_number_tokens(struct psi_number *exp,
+		struct psi_plist *list);
 
 #endif