Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19378/modules/mal

Modified Files:
        algebraExtensions.mx 
Log Message:
A few patches for the mal compiler


Index: algebraExtensions.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/algebraExtensions.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- algebraExtensions.mx        20 Jan 2007 10:21:34 -0000      1.7
+++ algebraExtensions.mx        4 Oct 2007 20:11:09 -0000       1.8
@@ -24,10 +24,10 @@
 @mal
 
 pattern algebra.project( b:bat[:any_1,:any_3], val:any_2) :bat[:any_1,:any_2]  
-address CMDBBPproject
+address ALGprojectCst
 comment "Fill the tail column with a newly typed constant.";
 pattern algebra.project(b:bat[:any_1,:any_3], val:bat[:any_1,:any_2]) 
:bat[:any_1,:any_2]
-address CMDBBPproject
+address ALGprojectCst
 comment "Fill the tail column with a constant.";
                                                                                
 
 @{
@@ -54,20 +54,13 @@
 #define ae_export extern
 #endif
 
-ae_export str CMDBBPproject(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-ae_export str CMDBBPprojectNil(int *ret, int *bid);
+ae_export str ALGprojectCst(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+ae_export str ALGprojectCstBody(int *result, int *bid, ptr *p, int tt);
 
 str
-CMDBBPproject(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
-       int *result, *bid, tt;
-       ptr *p;
+ALGprojectCstBody(int *result, int *bid, ptr *p, int tt){
        BAT *b, *bn;
 
-       result = (int *) getArgReference(stk, pci, 0);
-       bid = (int *) getArgReference(stk, pci, 1);
-       p = (ptr *) getArgReference(stk, pci, 2);
-       tt = getArgType(mb, pci, 2);
        if ((b = BATdescriptor(*bid)) == NULL) {
                throw(MAL, "bbp.project", "Cannot access descriptor");
        }
@@ -87,3 +80,14 @@
        }
        throw(MAL, "bbp.project", "Cannot create the constant BAT");
 }
+
+str
+ALGprojectCst(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+       int *result = (int *) getArgReference(stk, pci, 0);
+       int *bid = (int *) getArgReference(stk, pci, 1);
+       ptr *p = (ptr *) getArgReference(stk, pci, 2);
+       int tt = getArgType(mb, pci, 2);
+       return ALGprojectCstBody(result, bid, p, tt);
+}
[EMAIL PROTECTED]


-------------------------------------------------------------------------
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