MonetDB: default - Use alternative temporary nameing

[mk]

Changeset: ba91c86f5131 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba91c86f5131
Modified Files:
        monetdb5/mal/mal_instruction.mx
Branch: default
Log Message:

Use alternative temporary nameing


diffs (42 lines):

diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -909,7 +909,7 @@
 @= chkTemporary
     if( isTmpName(name)){
                int j;
-        i= atol(name+1);
+        i= atol(name+ (*name == TMPMARKER? 1:2));
         /* quick test validity*/
         if( i< mb->vtop && isTmpVar(mb,i) && getVarTmp(mb,i) == i)
             return i;
@@ -1160,7 +1160,7 @@
                return -1;
        @:makeVarSpace@
        if (isTmpName(name)) {
-               int i = atol(name + 1);
+               int i = atol(name+ (*name == TMPMARKER? 1:2));
 
                /* test validity */
                if (i > mb->vtop) {
@@ -2525,7 +2525,6 @@
                        } else {
                                if( getTailType(getArgType(mb,p,i)) > TYPE_str )
                                { char *ct=cv;
-                                       strcat(t, "=");
                                        VALformat(&cv, &getVar(mb, getArg(p, 
i))->value);
                                        ct= (char*) GDKmalloc(1024+strlen(cv));
                                        if (isVarUDFtype(mb, getArg(p, i)) ) {
@@ -2552,8 +2551,11 @@
                                GDKfree(s);
                                s = ns;
                        }
-                       if ( cv ) 
+                       if ( cv )  {
+                               if ( !isVarConstant(mb, getArg(p, i)) )
+                                       strcat(t,"=");
                                strcat(t, cv);
+                       }
                        
                        advance(t,base,len);
                        if ( (cv && strlen(cv)==0) || isVarUDFtype(mb, 
getArg(p, i)) ||
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list