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

Modified Files:
        mal_debugger.mx mal_module.mx 
Log Message:
preparing for handling multiplexed inline functions.
minor code cleanup, saving 1.5 page of code.


Index: mal_debugger.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_debugger.mx,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- mal_debugger.mx     9 Dec 2007 16:21:05 -0000       1.213
+++ mal_debugger.mx     24 Dec 2007 12:28:24 -0000      1.214
@@ -582,9 +582,7 @@
                modnme= request;
                *fcnnme= 0;
                fcnnme++;
-               sym= findSymbolInModule(
-                               
findModule(cntxt->nspace,getName(modnme,strlen(modnme))),
-                               fcnnme);
+               sym= findSymbol( getName(modnme,strlen(modnme)), fcnnme);
                mdb->brkBlock[mdb->brkTop] = sym? sym->def: mb;
                mdb->brkPc[mdb->brkTop] = -1;
                mdb->brkVar[mdb->brkTop] = -1;
@@ -817,9 +815,7 @@
                if( (h= strchr(fcnname,'[')) ){
                        *h=0; idx= atoi(h+1);
                } 
-               fsym= findSymbolInModule(
-                       findModule(MCgetClient()->nspace, getName(b,strlen(b))),
-                       fcnname);
+               fsym= findSymbol( getName(b,strlen(b)), fcnname);
                if (fsym == 0) {
                        stream_printf(out, "'%s.%s' not found\n", b,fcnname);
                        return NULL;

Index: mal_module.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_module.mx,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- mal_module.mx       29 Oct 2007 20:09:55 -0000      1.63
+++ mal_module.mx       24 Dec 2007 12:28:24 -0000      1.64
@@ -75,6 +75,7 @@
 mal_export void                setInheritanceMode(Module head,int flag);
 mal_export Module      setInheritance(Module head,Module first, Module second);
 mal_export Module   findModule(Module scope, str name);
+mal_export Symbol   findSymbol(str mod, str fcn);
 mal_export int                 isModuleDefined(Module scope, str name);
 mal_export Symbol   findSymbolInModule(Module v, str fcn);
 mal_export int      displayModule(stream *f, Module v, str fcn,int listing);
@@ -433,6 +434,12 @@
        }
        return NULL;
 }
+
+Symbol findSymbol(str mod, str fcn){
+       Module m= findModule(MCgetClient()->nspace,mod);
+       return findSymbolInModule(m,fcn);
+}
+
 int displayModule(stream *f, Module v, str fcn, int listing){
        Symbol s;
        int k=0;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to