Change val to be a string instead of an expr.

svn path=/trunk/yasm/; revision=342

diff --git a/libyasm/valparam.c b/libyasm/valparam.c
index 5e2e82ba28e41b63693f30df4bb5823663e3f6e0..434b0b00a33b914f8a89fdfa9cf8c97a2ba3649d 100644 (file)
--- a/libyasm/valparam.c
+++ b/libyasm/valparam.c
@@ -33,7 +33,8 @@ vps_delete(valparamhead *headp)
     cur = STAILQ_FIRST(headp);
     while (cur) {
        next = STAILQ_NEXT(cur, link);
-       expr_delete(cur->val);
+       if (cur->val)
+           xfree(cur->val);
        if (cur->param)
            expr_delete(cur->param);
        xfree(cur);

diff --git a/libyasm/valparam.h b/libyasm/valparam.h
index 50ac7829debf7423e04c30740975ad0a322dd743..571ba144d76390cf873eb6715f1372a0d308037f 100644 (file)
--- a/libyasm/valparam.h
+++ b/libyasm/valparam.h
@@ -24,12 +24,13 @@
 
 typedef struct valparam {
     /*@reldef@*/ STAILQ_ENTRY(valparam) link;
-    /*@owned@*/ expr *val;
+    /*@owned@*/ /*@null@*/ char *val;
     /*@owned@*/ /*@null@*/ expr *param;
 } valparam;
 typedef /*@reldef@*/ STAILQ_HEAD(valparamhead, valparam) valparamhead;
 
-void vp_new(/*@out@*/ valparam *r, /*@keep@*/ expr *v, /*@keep@*/ expr *p);
+void vp_new(/*@out@*/ valparam *r, /*@keep@*/ const char *v,
+           /*@keep@*/ expr *p);
 #define vp_new(r, v, p)                do {    \
        r = xmalloc(sizeof(valparam));  \
        r->val = v;                     \
@@ -45,6 +46,9 @@ void vps_append(valparamhead *headp, /*@keep@*/ valparam *vp);
            STAILQ_INSERT_TAIL(headp, vp, link);    \
     } while(0)
 
+/*@null@*/ /*@dependent@*/ valparam *vps_first(valparamhead *headp);
+#define vps_first(headp)           STAILQ_FIRST(headp)
+
 #define vps_foreach(iter, headp)    STAILQ_FOREACH(iter, headp, link)
 
 #endif

diff --git a/src/valparam.c b/src/valparam.c
index 5e2e82ba28e41b63693f30df4bb5823663e3f6e0..434b0b00a33b914f8a89fdfa9cf8c97a2ba3649d 100644 (file)
--- a/src/valparam.c
+++ b/src/valparam.c
@@ -33,7 +33,8 @@ vps_delete(valparamhead *headp)
     cur = STAILQ_FIRST(headp);
     while (cur) {
        next = STAILQ_NEXT(cur, link);
-       expr_delete(cur->val);
+       if (cur->val)
+           xfree(cur->val);
        if (cur->param)
            expr_delete(cur->param);
        xfree(cur);

diff --git a/src/valparam.h b/src/valparam.h
index 50ac7829debf7423e04c30740975ad0a322dd743..571ba144d76390cf873eb6715f1372a0d308037f 100644 (file)
--- a/src/valparam.h
+++ b/src/valparam.h
@@ -24,12 +24,13 @@
 
 typedef struct valparam {
     /*@reldef@*/ STAILQ_ENTRY(valparam) link;
-    /*@owned@*/ expr *val;
+    /*@owned@*/ /*@null@*/ char *val;
     /*@owned@*/ /*@null@*/ expr *param;
 } valparam;
 typedef /*@reldef@*/ STAILQ_HEAD(valparamhead, valparam) valparamhead;
 
-void vp_new(/*@out@*/ valparam *r, /*@keep@*/ expr *v, /*@keep@*/ expr *p);
+void vp_new(/*@out@*/ valparam *r, /*@keep@*/ const char *v,
+           /*@keep@*/ expr *p);
 #define vp_new(r, v, p)                do {    \
        r = xmalloc(sizeof(valparam));  \
        r->val = v;                     \
@@ -45,6 +46,9 @@ void vps_append(valparamhead *headp, /*@keep@*/ valparam *vp);
            STAILQ_INSERT_TAIL(headp, vp, link);    \
     } while(0)
 
+/*@null@*/ /*@dependent@*/ valparam *vps_first(valparamhead *headp);
+#define vps_first(headp)           STAILQ_FIRST(headp)
+
 #define vps_foreach(iter, headp)    STAILQ_FOREACH(iter, headp, link)
 
 #endif