codea: refactor, teil1

[uebersetzerbau-ss10.git] / codea / tree.h

diff --git a/codea/tree.h b/codea/tree.h
index f88851f0d32076977f87bf17d6af5e6a0d932a53..2e38ed4d5be5b283c8283c328888da862d2e70bb 100644 (file)
--- a/codea/tree.h
+++ b/codea/tree.h
@@ -10,39 +10,16 @@ typedef struct burm_state *STATEPTR_TYPE;
 #endif
 
 enum {
-       O_RET=1,
-       O_NULL,
-       O_SUB,
-       O_MUL,
-       O_OR,
-       O_LESS,
-       O_EQ,
-       O_ID,
-       O_ADD,
-       O_NUM,
-       O_FIELD,
-       O_MTWO,
-       O_MFOUR,
-       O_MEIGHT,
-       O_MONE
+       O_RET=1, O_NULL, O_SUB, O_MUL,
+       O_OR=5, O_LESS, O_EQ, O_ID, O_ADD,
+       O_NUM=10, O_FIELD, O_MTWO, O_MFOUR, O_MEIGHT,
+       O_MONE=15
 };
 
 static char *o_names[] = {
-       "",
-       "O_RET",
-       "O_NULL",
-       "O_SUB",
-       "O_MUL",
-       "O_OR",
-       "O_LESS",
-       "O_EQ",
-       "O_ID",
-       "O_ADD",
-       "O_NUM",
-       "O_FIELD",
-       "O_MTWO",
-       "O_MFOUR",
-       "O_MEIGHT",
+       "", "O_RET", "O_NULL", "O_SUB", "O_MUL",
+       "O_OR", "O_LESS", "O_EQ", "O_ID", "O_ADD",
+       "O_NUM", "O_FIELD", "O_MTWO", "O_MFOUR", "O_MEIGHT",
        "O_MONE"
 };
 
@@ -54,7 +31,6 @@ struct treenode {
        long val;
        char *reg;
        struct treenode *parent;
-       int skip;
        int param_index;
        int exprcount;
        int soffset;