MonetDB: default - Trim symbol table display

[mk]

Changeset: 539e6508969c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=539e6508969c
Modified Files:
        monetdb5/mal/mal_debugger.mx
Branch: default
Log Message:

Trim symbol table display
and allow for printing variables by symbol table index.


diffs (45 lines):

diff --git a/monetdb5/mal/mal_debugger.mx b/monetdb5/mal/mal_debugger.mx
--- a/monetdb5/mal/mal_debugger.mx
+++ b/monetdb5/mal/mal_debugger.mx
@@ -1379,8 +1379,13 @@
                                i = BBPindex(b);
                                if (i != 0){
                                        printBATelm(out, i, size, first);
-                               } else
+                               } else {
+                                       i = atoi(b);
+                                       if ( i || *b == '0')
+                                               printStackElm(out, mb, stk->stk 
+ i, i, size, first);
+                                       else
                                        mnstr_printf(out, "%s Symbol not 
found\n", "#mdb ");
+                               }
                                continue;
                        }
                        if (isaBatType(getVarType(mb,i)) && upper =='p'){
@@ -1435,7 +1440,7 @@
                        InstrPtr q;
 
                        lstng= LIST_MAL_DEBUG | LIST_MAL_UDF | LIST_MAL_LNR;
-                       if ( *b=='L') lstng |= LIST_MAL_PROPS | LIST_MAL_DETAIL;
+                       if ( *b=='L') lstng |= LIST_MAL_DETAIL;
                        skipWord(cntxt, b);
                        if (*b != 0) {
                                MalBlkPtr m= mdbLocateMalBlk(cntxt,mb,b,out);
@@ -1858,6 +1863,8 @@
        str nme, nmeOnStk;
        VarPtr n = getVar(mb, index);
 
+       if ( !isVarUsed(mb,index) )
+               return;
        printStackHdr(f,mb,v,index);
 
        if (v && v->vtype == TYPE_bat){
@@ -1883,7 +1890,7 @@
        if (strcmp(nmeOnStk, nme) && strncmp(nmeOnStk,"BAT",3))
                mnstr_printf(f,"!%s ",nmeOnStk);
        mnstr_printf(f, " %s", (isVarConstant(mb,index)? " constant" : ""));
-       mnstr_printf(f, " %s", (isVarUsed(mb,index) ? "": " not used" ));
+       /* mnstr_printf(f, " %s", (isVarUsed(mb,index) ? "": " not used" ));*/
        mnstr_printf(f, " %s", (isVarTypedef(mb,index) ? " type variable" : 
""));
        if ( getEndOfLife(mb,index))
                mnstr_printf(f," eolife=%d ", getEndOfLife(mb,index));
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list