MonetDB: Jan2014 - Turn errors during MAL include into errors.

[Sjoerd Mullender]

Changeset: 48c3d27b0ffd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48c3d27b0ffd
Modified Files:
        monetdb5/mal/mal_parser.c
Branch: Jan2014
Log Message:

Turn errors during MAL include into errors.
When a non-existing file is included, we want to know it.


diffs (27 lines):

diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1083,18 +1083,20 @@ parseInclude(Client cntxt)
        if (currChar(cntxt) != ';') {
                parseError(cntxt, "';' expected\n");
                skipToEnd(cntxt);
-               return "";
+               return 0;
        }
        skipToEnd(cntxt);
 
        s = loadLibrary(modnme, FALSE);
        if (s) {
-               mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
+               parseError(cntxt, s);
                GDKfree(s);
+               return 0;
        }
        if ((s = malInclude(cntxt, modnme, 0))) {
-               mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
+               parseError(cntxt, s);
                GDKfree(s);
+               return 0;
        }
        return "";
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list