MonetDB: malparsing - Merge with default

[Martin Kersten]

Changeset: 254e5a886366 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=254e5a886366
Modified Files:
        monetdb5/mal/Makefile.ag
        monetdb5/optimizer/opt_wlc.c
        sql/backends/monet5/wlr.c
Branch: malparsing
Log Message:

Merge with default


diffs (52 lines):

diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -10,6 +10,7 @@ INCLUDES = ../../common/options \
                   ../../clients/mapilib \
                   ../../gdk \
                   ../optimizer \
+                  ../modules/mal \
                   $(libxml2_CFLAGS) $(curl_CFLAGS) $(openssl_CFLAGS)
 MTSAFE
 
diff --git a/monetdb5/optimizer/opt_wlc.c b/monetdb5/optimizer/opt_wlc.c
--- a/monetdb5/optimizer/opt_wlc.c
+++ b/monetdb5/optimizer/opt_wlc.c
@@ -114,9 +114,9 @@ OPTwlcImplementation(Client cntxt, MalBl
        GDKfree(old);
 
     /* Defense line against incorrect plans */
-       chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
-       chkFlow(cntxt->fdout, mb);
-       //chkDeclarations(cntxt->fdout, mb);
+       chkTypes(cntxt->usermodule, mb, FALSE);
+       chkFlow(mb);
+       //chkDeclarations(mb);
     /* keep all actions taken as a post block comment */
 #ifdef _WLCR_DEBUG_
        printFunction(cntxt->fdout,mb, 0, LIST_MAL_ALL);
diff --git a/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -219,7 +219,7 @@ WLRprocess(void *arg)
                // now parse the file line by line to reconstruct the WLR blocks
                do{
                        pc = mb->stop;
-                       if( parseMAL(c, c->curprg, 1, 1)  || mb->errors){
+                       if( parseMAL(c)  || mb->errors){
                                char line[PATHLENGTH];
                                snprintf(line, PATHLENGTH,"#wlr.process:failed 
further parsing '%s':\n",path);
                                strncpy(wlr_error,line, PATHLENGTH);
@@ -254,9 +254,9 @@ WLRprocess(void *arg)
                        if ( getModuleId(q) == wlrRef && getFunctionId(q) 
==commitRef ){
                                pushEndInstruction(mb);
                                // execute this block if no errors are found
-                               chkTypes(c->fdout,c->nspace, mb, FALSE);
-                               chkFlow(c->fdout,mb);
-                               chkDeclarations(c->fdout,mb);
+                               chkTypes(c->usermodule,mb, FALSE);
+                               chkFlow(mb);
+                               chkDeclarations(mb);
 
                                if( mb->errors == 0){
                                        sql->session->auto_commit = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list