WIP

Author: infradig

src/parser.c

@@ -2252,6 +2252,7 @@ static cell *insert_call_here(parser *p, cell *c, cell *p1)
 
 static cell *term_to_body_conversion(parser *p, cell *c)
 {
+	//printf("*** %s/%u, p->is_command=%d\n", C_STR(p, c), c->arity, p->is_command);
 	pl_idx c_idx = c - p->cl->cells;
 	bool is_head = (c_idx == 0) && !p->is_command;
 
@@ -3759,7 +3760,7 @@ unsigned tokenize(parser *p, bool is_arg_processing, bool is_consing)
 
 				process_clause(p->m, p->cl, NULL);
 
-				if (!p->one_shot)
+				if (!p->one_shot || p->is_command)
 					term_to_body(p);
 
 				if ((p->is_consulting /*|| p->is_command*/) && !p->skip) {
@@ -4387,25 +4388,10 @@ bool run(parser *p, const char *prolog_src, bool dump, query **subq, unsigned in
 	}
 
 	SB(pr);
-
-	if (dump) {
-		SB_strcat(pr, "true,");
-	}
-
-	if (*prolog_src != '[') {
-		SB_sprintf(pr, "((%s", prolog_src);
-	} else {
-		SB_sprintf(pr, "%s", prolog_src);
-	}
-
+	SB_sprintf(pr, "%s", prolog_src);
 	SB_trim_ws(pr);
 	SB_trim(pr, '.');
-
-	if (*prolog_src != '[') {
-		SB_strcat(pr, ")).");
-	} else {
-		SB_strcat(pr, ".");
-	}
+	SB_strcat(pr, ".");
 
 	p->in_body = true;
 	p->srcptr = SB_cstr(pr);
@@ -4416,6 +4402,7 @@ bool run(parser *p, const char *prolog_src, bool dump, query **subq, unsigned in
 		p->line_num_start = 0;
 		p->line_num = 1;
 		p->one_shot = true;
+		p->is_command = true;
 		p->is_consulting = false;
 		tokenize(p, false, false);