MonetDB: Dec2011 - Inline MX macro that is only used once.

[Sjoerd Mullender]

Changeset: 47e5745523d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47e5745523d9
Modified Files:
        monetdb5/mal/mal_interpreter.mx
Branch: Dec2011
Log Message:

Inline MX macro that is only used once.


diffs (56 lines):

diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -547,7 +547,24 @@ workslow:
                        @:endProfile(stk)@
                }
        }
-       @:MALwrapup@
+       if (exceptionVar >= 0) {
+               if (ret) {
+                       str oldret = ret;
+                       ret = createScriptException(mb, mb->stop - 1,
+                               getExceptionType(getVarName(mb, exceptionVar)),
+                               ret, "Exception not caught");
+                       FREE_EXCEPTION(oldret);
+               } else {
+                       if (stk->stk[exceptionVar].vtype == TYPE_str) {
+                               ret = createScriptException(mb, mb->stop - 1, 
MAL,
+                                       stk->stk[exceptionVar].val.sval,
+                                       "Exception not caught");
+                       } else {
+                               ret = createScriptException(mb, mb->stop - 1, 
MAL,
+                                       NULL, "Exception not caught");
+                       }
+               }
+       }
        GDKfree(backup);
        GDKfree(sbackup);
        GDKfree(garbage);
@@ -1517,26 +1534,6 @@ str runMALprocess(Client cntxt, MalBlkPt
        return MAL_SUCCEED;
 }
 
-@= MALwrapup
-       if (exceptionVar >= 0) {
-               if (ret) {
-                       str oldret = ret;
-                       ret = createScriptException(mb, mb->stop - 1,
-                               getExceptionType(getVarName(mb, exceptionVar)),
-                               ret, "Exception not caught");
-                       FREE_EXCEPTION(oldret);
-               } else {
-                       if (stk->stk[exceptionVar].vtype == TYPE_str) {
-                               ret = createScriptException(mb, mb->stop - 1, 
MAL,
-                                       stk->stk[exceptionVar].val.sval,
-                                       "Exception not caught");
-                       } else {
-                               ret = createScriptException(mb, mb->stop - 1, 
MAL,
-                                       NULL, "Exception not caught");
-                       }
-               }
-       }
-@
 @h
 /*
  * @+ Safeguarding
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list