cleanup

[umpf.git] / int.c

diff --git a/int.c b/int.c
index 6e9a814fa67dc95a495734bb48b512681d734ad6..b83b435178cf96029f0f2139c2f6b3a82db21034 100644 (file)
--- a/int.c
+++ b/int.c
@@ -28,21 +28,13 @@ get_bucket_number(char* name)
        unsigned char* p = name;
 
         while (*p != '\0'){
-                n = n * MAGIC + *p++;
+                n = n * MAGIC + toupper(*p++);
         }
         n %= HASHSIZE;
 
         return n;
 }
 
-void
-cap(char* s)
-{
-       char* p;
-       for(p = s; *p; p++)
-               *p = toupper(*p);
-}
-
 /* value NULL for finding without modyfiing */
 static struct variable*
 find_var(char* name, char* value, struct variable** hash)
@@ -50,19 +42,22 @@ find_var(char* name, char* value, struct variable** hash)
        int n;
        struct variable *p;
 
-       name = xstrdup(name);
-       if (isupper(*name))
-               cap(name);
-
        n = get_bucket_number(name);
 
        p = hash[n];
-       while(p && strcmp(p->name,name))
-               p = p->next;
+
+       if (isupper(*name)){
+               while(p && strcasecmp(p->name,name))
+                       p = p->next;
+       } else {
+               while(p && strcmp(p->name,name))
+                       p = p->next;
+       }
 
        if (p && value){
                free(p->value);
                p->value = value;
+               p->modified = 1;
        } else if (p && !value)
                return p;
        else {
@@ -71,6 +66,7 @@ find_var(char* name, char* value, struct variable** hash)
                hash[n] = p;
                p->name = name; 
                p->value = (value? value:xstrdup(""));
+               p->modified = 1;
        }
 
        return p;
@@ -239,10 +235,75 @@ interp_cond(struct tree* t, struct variable** hash)
        }
 }
 
-void
-new_action(char* l, char* r, char* s)
+static void
+modify_headers(struct hlist* headers, struct variable** hash)
+{
+       struct hlist* p;
+       struct hlist* last = NULL;
+       struct variable* pv;
+       int i;
+
+       for(p = headers; p; p = p->next){
+               pv = find_var(p->name,NULL,hash);
+               if (pv->modified){
+                       pv->modified = 0;
+                       free(pv->value);
+                       pv->value = xstrdup(p->value); //FIXME: fold it
+               }
+               last = p;
+       }
+
+       /* find new headers */
+       for (i = 0; i < HASHSIZE; i++){
+               for(pv = hash[i]; pv; pv = pv->next){
+                       if (isupper(pv->name[0]) && pv->modified){
+                               pv->modified = 0;
+                               p = xmalloc(sizeof(struct hlist));
+
+                               last->next = p; //FIXME
+                               p->next = NULL;
+                               p->name = xstrdup(pv->name);
+                               p->value = xstrdup(pv->value);
+                       }
+               }
+       }
+}
+
+static struct hlist*
+copy_headers(struct hlist* orig)
+{
+       struct hlist* new = NULL;
+       struct hlist* po, * pn = NULL;
+
+       for (po = orig; po; po = po->next){
+               if (!pn)
+                       pn = xmalloc(sizeof(struct hlist));
+               pn->next = xmalloc(sizeof(struct hlist));
+               pn = pn->next;
+               pn->next = NULL;
+               pn->name = xstrdup(po->name);
+               pn->value = xstrdup(po->value);
+               if (!new)
+                       new = pn;
+       }
+
+       return new;
+}
+
+static void
+new_action(char* l, char* r, char* s, struct variable** hash)
 {
-       //TODO: modify headers according to variable values
+       struct action* a;
+
+       a = xmalloc(sizeof(struct action));
+
+       modify_headers(current_headers, hash);
+       a->e.headers = copy_headers(current_headers);
+       a->l = l;
+       a->r = r;
+       a->s = s;
+
+       do_action(a);
 }
 
 void
@@ -266,7 +327,7 @@ interp(struct tree* t, struct variable** hash)
                                interp(t->pt.tif.e, hash);
                        break;
                case ST_ARROW:
-                       new_action(t->pt.arrow.kw_left, t->pt.arrow.kw_right, interp_ass_right(t->pt.arrow.s, hash));
+                       new_action(t->pt.arrow.kw_left, t->pt.arrow.kw_right, interp_ass_right(t->pt.arrow.s, hash),hash);
                        break;
                case ST_EMPTY:
                        break;  
@@ -324,11 +385,13 @@ void
 save_current_headers(struct variable** hash)
 {
        struct hlist* p;
+       struct variable* pv;
        char* u;
 
        for (p = current_headers;p;p = p->next){
                u = unfold(p->value);
-               find_var(p->name,u,hash);
+               pv = find_var(p->name,u,hash);
+               pv->modified = 0;
        }
 
 }