From: Anicka Bernathova <anicka@anicka.net>
Date: Tue, 21 Jul 2009 13:31:58 +0000 (+0200)
Subject: redo variables
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=69ef53984e88bb38a08ea7263f1832aea9ad2e6b;p=umpf.git

redo variables
---

diff --git a/code.c b/code.c
index 2200d23..932bb9a 100644
--- a/code.c
+++ b/code.c
@@ -34,35 +34,34 @@ get_bucket_number(char* name)
 
 /* return var struct or NULL if not found */
 struct variable*
-get_var_struct(char* name, struct list* hash)
+get_var_struct(char* name, enum var_type type, struct list* hash)
 {
 	int n;
 	struct variable *p;
 
 	n = get_bucket_number(name);
-	int nocase = isupper(*name);
 	LIST_FOREACH(p, hash + n)
-		if (!(nocase ? strcasecmp : strcmp)(p->name,name))
+		if (!strcasecmp(p->name, name) && p->type == type)
 			return p;
 
 	return NULL;
 }
 
 int
-find_var(char* name, struct list* hash)
+find_var(char* name, enum var_type type, struct list* hash)
 {
 	int n;
 	struct variable *p;
 
 	n = get_bucket_number(name);
-	int nocase = isupper(*name);
 	LIST_FOREACH(p, hash + n)
-		if (!(nocase ? strcasecmp : strcmp)(p->name,name))
+		if (!strcasecmp(p->name, name) && p->type == type)
 			return p->varcode;
 
 	p = xmalloc(sizeof(struct variable));
 	p->name = xstrdup(name);
 	p->varcode = current_varcode++;
+	p->type = type;
 	list_add_last(hash+n, &p->car);
 
 	return p->varcode;
diff --git a/cond.y b/cond.y
index 38ec08c..4c1d3d2 100644
--- a/cond.y
+++ b/cond.y
@@ -2,10 +2,12 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "umpf.h"
 
 static struct tree* tree_malloc(int type);
+static enum var_type get_var_type(char* var);
 
 %}
 %error-verbose
@@ -153,7 +155,7 @@ ass:
 					$$->pt.ass.left = tree_malloc(ST_LEAF);
 					$$->pt.ass.left->pt.leaf.type = L_VAR;
 					$$->pt.ass.left->pt.leaf.value = $1;
-					$$->pt.ass.left->pt.leaf.n = find_var($1, var_hash);
+					$$->pt.ass.left->pt.leaf.n = find_var($1, get_var_type($1), var_hash);
 					$$->pt.ass.right = $3;
 				}
 ;
@@ -162,7 +164,7 @@ leaves:		VAR 	{
 				$$ = tree_malloc(ST_LEAF);
 				$$->pt.leaf.type = L_VAR;
 				$$->pt.leaf.value = $1;
-				$$->pt.leaf.n = find_var($1, var_hash);
+				$$->pt.leaf.n = find_var($1, get_var_type($1), var_hash);
 			}
 		| CONST	{ 
 				$$ = tree_malloc(ST_LEAF);
@@ -246,6 +248,28 @@ tree_malloc(int type)
 	return temp;
 }
 
+enum var_type
+get_var_type(char* var)
+{
+	int upper = 0;
+	int lower = 0;
+
+	if (islower(*var))
+		return VAR_USER;
+
+	while (*var) {
+		if (isupper(*var))	
+			upper++;
+		if (islower(*var))
+			lower++;
+		var++;
+	}
+	if (upper && lower)
+		return VAR_HEADER;
+
+	return VAR_INTERN;
+}
+
 void
 yyerror (char const *s)
 {
diff --git a/int.c b/int.c
index 5c9c33a..59c1f93 100644
--- a/int.c
+++ b/int.c
@@ -192,7 +192,7 @@ modify_headers(struct list* headers, struct list* hash)
 	
 
 	LIST_FOREACH(p, headers){
-		pv = get_var_struct(p->name, hash);
+		pv = get_var_struct(p->name, VAR_HEADER, hash);
 		if (!pv)
 			continue;
 		u = unfold(p->value);
@@ -210,14 +210,14 @@ modify_headers(struct list* headers, struct list* hash)
 	// find new headers 
 	for (i = 0; i < HASHSIZE; i++){
 		LIST_FOREACH(pv, hash + i){
-			if (isupper(pv->name[0]) && pv->modified){
+			if (pv->type == VAR_HEADER && pv->modified){
 				pv->modified = 0;
 
 				p = xmalloc(sizeof(struct hlist));
 				p->name = xstrdup(pv->name);
 				p->value = get_var(pv->varcode);
 
-				list_add_last(headers,&p->car);
+				list_add_last(headers, &p->car);
 			}
 		}
 	}
@@ -700,7 +700,7 @@ save_current_headers(struct list* hash)
 	struct variable* pv;
 
 	LIST_FOREACH(p, current_headers){
-		pv = get_var_struct(p->name, hash);
+		pv = get_var_struct(p->name, VAR_HEADER, hash);
 		if (!pv)
 			continue;
 		u = unfold(p->value);
diff --git a/umpf.h b/umpf.h
index e379c84..35f65ef 100644
--- a/umpf.h
+++ b/umpf.h
@@ -13,6 +13,12 @@ enum keyword {
 	K_FILTER
 };
 
+enum var_type {
+	VAR_HEADER,
+	VAR_INTERN,
+	VAR_USER
+};
+
 struct tree {
 	enum {
 		ST_IF,
@@ -164,6 +170,7 @@ struct variable {
 	char* name;
 	int varcode;
 	int modified;
+	enum var_type type;
 };
 
 struct list input_code;
@@ -179,8 +186,8 @@ char* empty;
 
 void init(void);
 void compile(struct tree* t, struct list* where);
-int find_var(char* name, struct list* hash);
-struct variable* get_var_struct(char* name, struct list* hash);
+int find_var(char* name, enum var_type type, struct list* hash);
+struct variable* get_var_struct(char* name, enum var_type type, struct list* hash);
 int store_const(char* c);
 struct list* new_var_hash(void);
 int get_bucket_number(char* name);