Changeset: 2fde825d75e8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fde825d75e8
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
Branch: malparsing
Log Message:
Minor reporting issues in MAL debugger
diffs (53 lines):
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -833,7 +833,10 @@ retryRead:
if (m && strchr(b, '*')) {
/* detect l user.fcn[*] */
for (m = mb; m != NULL; m = m->history)
- debugFunction(out, m, 0, lstng,
0,m->stop);
+ if( lstng == LIST_MAL_NAME)
+ printFunction(out, m,
0, lstng);
+ else
+ debugFunction(out, m,
0, lstng, 0,m->stop);
} else if (m == NULL && !strchr(b, '.') &&
!strchr(b, '[') && !isdigit((int) *b) && *b != '-' && *b != '+') {
/* is this a variable ? */
varid = findVariable(mb, b);
@@ -868,12 +871,19 @@ retryRead:
}
for(; fs; fs = fs->peer)
if( strcmp(fcnnme, fs->name)==0) {
- debugFunction(out, fs->def, 0,
lstng, 0,fs->def->stop);
+ if( lstng == LIST_MAL_NAME)
+ printFunction(out,
fs->def, 0, lstng);
+ else
+ debugFunction(out,
fs->def, 0, lstng, 0,m->stop);
}
continue;
}
- if (m)
- debugFunction(out, m, 0, lstng,
0,m->stop);
+ if (m){
+ if( lstng == LIST_MAL_NAME)
+ printFunction(out, m, 0, lstng);
+ else
+ debugFunction(out, m, 0, lstng,
0,m->stop);
+ }
} else {
/*
* Listing the program starts at the pc last given.
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -485,6 +485,11 @@ debugFunction(stream *fd, MalBlkPtr mb,
mnstr_printf(fd,"<- ");
for(; j < p->argc; j++)
mnstr_printf(fd,"%d ",getArg(p,j));
+ // also show type check property
+ if( p->polymorphic)
+ mnstr_printf(fd," polymorphic");
+ if( p->typechk == TYPE_UNKNOWN)
+ mnstr_printf(fd," type check needed ");
mnstr_printf(fd,"\n");
}
GDKfree(ps);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
