MonetDB: Jul2012 - dumprefvar: fix annotation not to pass a NULL...

[Fabian Groffen]

Changeset: b89e50c36cd0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b89e50c36cd0
Modified Files:
        monetdb5/extras/jaql/jaqlgencode.c
Branch: Jul2012
Log Message:

dumprefvar: fix annotation not to pass a NULL-pointer


diffs (22 lines):

diff --git a/monetdb5/extras/jaql/jaqlgencode.c 
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -344,8 +344,9 @@ dumprefvar(jc *j, MalBlkPtr mb, tree *t,
 
        a = elems;
        for (t = t->tval1; t != NULL; t = t->tval1) {
-               MALCOMMENT(mb, "| dereferencing %s", t->sval);
                if (t->type == j_arr_idx) {
+                       MALCOMMENT(mb, "| dereferencing [%c]",
+                                       t->nval == -1 ? '*' : '0' + 
(char)t->nval);
                        c = dumparrrefvar(mb, t, a, j->j5);
                        q = newInstruction(mb, ASSIGNsymbol);
                        setModuleId(q, algebraRef);
@@ -367,6 +368,7 @@ dumprefvar(jc *j, MalBlkPtr mb, tree *t,
                        if (t->tval1 != NULL && t->nval == -1)
                                encapsulate = 1;
                } else {
+                       MALCOMMENT(mb, "| dereferencing %s", t->sval);
                        q = newInstruction(mb, ASSIGNsymbol);
                        setModuleId(q, putName("jaql", 4));
                        setFunctionId(q, uselectRef);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list