Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20920

Modified Files:
        opt_macro.mx 
Log Message:
Handle an arbitrary argument list.


Index: opt_macro.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_macro.mx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- opt_macro.mx        17 Aug 2007 13:56:54 -0000      1.20
+++ opt_macro.mx        4 Sep 2007 07:41:29 -0000       1.21
@@ -185,9 +185,9 @@
        if (mb->stop - pc < mc->stop - 2)
                return 0;
 
-       cvar = (int *) alloca(mc->vtop * MAXARG);
+       cvar = (int *) alloca(mc->vtop * mc->maxarg);
 
-       mvar = (int *) alloca(mb->vtop * MAXARG);
+       mvar = (int *) alloca(mb->vtop * mc->maxarg);
        /* also trim the return statement */
        lim = pc + mc->stop - 3;
        k = 1;
@@ -397,9 +397,9 @@
        int ctop = 0, mtop = 0;
 
        /* collect variable map */
-       cvar = (int *) alloca(mc->vtop * MAXARG);
+       cvar = (int *) alloca(mc->vtop * mc->maxarg);
 
-       mvar = (int *) alloca(mb->vtop * MAXARG);
+       mvar = (int *) alloca(mb->vtop * mc->maxarg);
        lim = pc + mc->stop - 2;
        k = 1;
        for (i = pc; i < lim; i++, k++) {
@@ -407,7 +407,7 @@
                q = getInstrPtr(mc, k);
                for (j = 0; j < p->argc; j++)
                        cvar[ctop++] = getArg(q, j);
-               assert(ctop < mc->vtop *MAXARG);
+               assert(ctop < mc->vtop *mc->maxarg);
 
                for (j = 0; j < p->argc; j++)
                        mvar[mtop++] = getArg(p, j);


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to