MonetDB: trails - Throw an exception when returning from a Factory

[Pedro Ferreira]

Changeset: e4c295b6d1c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4c295b6d1c9
Modified Files:
        monetdb5/mal/mal_interpreter.c
Branch: trails
Log Message:

Throw an exception when returning from a Factory


diffs (13 lines):

diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -1155,8 +1155,8 @@ str runMALsequence(Client cntxt, MalBlkP
                        /* Return from factory involves cleanup */
 
                        if (getInstrPtr(mb, 0)->token == FACTORYsymbol) {
-                               yieldResult(mb, pci, stkpc);
                                shutdownFactory(cntxt, mb);
+                               ret= createException(MAL, "mal.interpreter", 
"The factory has ended");
                        } else {
                                /* a fake multi-assignment */
                                if (env != NULL && pcicaller != NULL) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list