Changeset: 3431a776c606 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3431a776c606
Modified Files:
monetdb5/extras/jaql/jaqlgencode.c
Branch: Oct2012
Log Message:
dumpvariabletransformation: don't potentially push invalid argument
diffs (34 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
@@ -3201,15 +3201,16 @@ dumpvariabletransformation(jc *j, Client
assert(0);
}
q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any));
- q = pushArgument(mb, q, s);
- q = pushArgument(mb, q, v);
+ p = copyInstruction(q); /* reuse for dbl case below */
+
if (v != -1) {
+ q = pushArgument(mb, q, s);
+ q = pushArgument(mb, q, v);
h = getArg(q, 0);
pushInstruction(mb, q);
} else {
h = -1;
}
- p = copyInstruction(q); /* reuse for dbl case below */
if (h != -1) {
q = newInstruction(mb, ASSIGNsymbol);
@@ -3469,8 +3470,8 @@ dumpvariabletransformation(jc *j, Client
}
q = p;
- getArg(q, 1) = s;
- getArg(q, 2) = v;
+ q = pushArgument(mb, q, s);
+ q = pushArgument(mb, q, v);
s = getArg(q, 0) = newTmpVariable(mb, TYPE_any);
pushInstruction(mb, q);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
