Changeset: 850c21a1b38c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=850c21a1b38c
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/clients.mal
Branch: default
Log Message:
Input echoing control
diffs (41 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
@@ -381,7 +381,6 @@ mdbCommand(Client cntxt, MalBlkPtr mb, M
int m = 1;
char *b, *c, lastcmd = 0;
stream *out = cntxt->fdout;
- /* int listing = cntxt->listing;*/
char *oldprompt = cntxt->prompt;
size_t oldpromptlength = cntxt->promptlength;
MalStkPtr stk = stkbase;
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -37,13 +37,12 @@ static str parseError(Client cntxt, str
static void
echoInput(Client cntxt)
{
- if (cntxt->listing == 1) {
- char *c = CURRENT(cntxt);
+ char *c = CURRENT(cntxt);
+ if (cntxt->listing == 1 && *c && !NL(*c)) {
mnstr_printf(cntxt->fdout,"#");
while (*c && !NL(*c)) {
mnstr_printf(cntxt->fdout, "%c", *c++);
}
-
mnstr_printf(cntxt->fdout, "\n");
}
}
diff --git a/monetdb5/modules/mal/clients.mal b/monetdb5/modules/mal/clients.mal
--- a/monetdb5/modules/mal/clients.mal
+++ b/monetdb5/modules/mal/clients.mal
@@ -9,6 +9,7 @@ module clients;
pattern setListing(flag:int):int
address CLTsetListing
comment "Turn on/off echo of MAL instructions:
+ 1 - echo input,
2 - show mal instruction,
4 - show details of type resolutoin,
8 - show binding information.";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
