1 files changed, 8 insertions, 15 deletions
diff --git a/variable.h b/variable.h
index da3badc..4c7b987 100644
--- a/variable.h
+++ b/variable.h
@@ -4,28 +4,21 @@
 #include <stdint.h>
 
 typedef struct {
-	uint8_t used :1;
-	uint8_t fromc :1;
-	uint8_t valtype :4;
+	uint8_t tmp    :1;
+	uint8_t type   :3;
+	uint8_t unused :4;
 	union {
 		float f;
 		uint32_t p;
 	} value;
 } variable;
 
-enum valtype {
-	STRING = 0,
-	NUMBER,
+enum VARTYPE {
+	NUMBER = 0,
+	STRING,
+	OPERATOR,
 	FUNC,
-	EXPR
+	CFUNC,
 };
 
-variable *make_varn(variable *v, float value);
-variable *make_vars(variable *v, const char *s);
-variable *make_varf(variable *v, uint8_t fromc, uint32_t func);
-variable *make_vare(variable *v, const char *e);
-
-int try_number(variable *v, const char *text);
-int try_variable(char **name, const char *text);
-
 #endif // VARIABLE_H_