make batch mode output lazy

Author: jcupitt

CHANGELOG.md

@@ -8,6 +8,7 @@
 - improve search and display of builtins
 - add `vips_image_guess_interpretation` builtin
 - improve display of computed multipage images
+- batch mode output is lazy
 
 ## 9.0.13 2025/09/20
 

TODO

@@ -1,15 +1,3 @@
-- try:
-
-	main = "...." ++ error "hello";
-
-  does not print any "..."
-
-	print of main should be lazyier
-
-  main_print_main() does strict reduction of main
-
-  graph_value() is also strict
-
 - try < > in the image titlebar
 
     seems to get stuck on eg. mp3 files

src/heap.c

@@ -2617,7 +2617,7 @@ shell_node(Reduce *rc, HeapNode *hn)
 		for (;;) {
 			PEPOINTLEFT(hn, &p1);
 			if (!reduce_pelement(rc, reduce_spine, &p1) ||
-				shell_pelement(rc, &p1))
+				!shell_pelement(rc, &p1))
 				return FALSE;
 
 			PEPOINTRIGHT(hn, &p2);
@@ -2672,7 +2672,8 @@ shell_pelement(Reduce *rc, PElement *base)
 		break;
 
 	case ELEMENT_NODE:
-		shell_node(rc, PEGETVAL(base));
+		if (!shell_node(rc, PEGETVAL(base)))
+			return FALSE;
 		break;
 
 	case ELEMENT_CHAR:

src/main-batch.c

@@ -63,38 +63,15 @@ static GOptionEntry main_batch_options[] = {
     { NULL }
 };
 
-/* Accumulate startup errors here.
- */
-static char main_start_error_txt[MAX_STRSIZE];
-static VipsBuf main_start_error = VIPS_BUF_STATIC(main_start_error_txt);
-
-static void
-main_log_add(const char *fmt, ...)
-{
-    va_list ap;
-
-	va_start(ap, fmt);
-    vips_buf_vappendf(&main_start_error, fmt, ap);
-	va_end(ap);
-}
-
-static const char *
-main_log_get(void)
-{
-    return vips_buf_all(&main_start_error);
-}
-
-static gboolean
-main_log_is_empty(void)
-{
-    return vips_buf_is_empty(&main_start_error);
-}
-
 /* Print all errors and quit.
  */
 static void
 main_error_exit(const char *fmt, ...)
 {
+	/* We may have some half-written text .. flush before any error message.
+	 */
+	fflush(stdout);
+
 	if (fmt) {
 		va_list args;
 
@@ -111,17 +88,7 @@ main_error_exit(const char *fmt, ...)
 		fprintf(stderr, "\n");
     }
 
-    if (main_option_verbose) {
-        char txt[MAX_STRSIZE];
-        VipsBuf buf = VIPS_BUF_STATIC(txt);
-
-        slist_map(expr_error_all, (SListMapFn) expr_error_print, &buf);
-        fprintf(stderr, "%s", vips_buf_all(&buf));
-
-		if (!main_log_is_empty())
-			fprintf(stderr, "%s", main_log_get());
-    }
-
+    main_shutdown();
     exit(1);
 }
 
@@ -215,7 +182,8 @@ main_print_main(Symbol *sym)
             main_error_exit(_( "error saving \"%s\""), symbol_name_scope(sym));
     }
 	else
-		if (!graph_value(root))
+		if (!symbol_recalculate_check(sym) ||
+			!graph_value(root))
             main_error_exit(NULL);
 }
 
@@ -336,7 +304,7 @@ main_build_argv(int argc, char **argv)
 
 	attach_input_string(vips_buf_all(&buf));
 	if (!parse_onedef(kit, -1))
-		main_log_add("%s\n", error_get_sub());
+		main_error_exit(NULL);
 
 	filemodel_set_modified(FILEMODEL(kit), FALSE);
 }
@@ -465,7 +433,7 @@ main(int argc, char **argv)
                 printf("main_set: %s\n", main_option_set[i]);
 
             if (!main_set(main_option_set[i]))
-                main_log_add("%s\n%s", error_get_top(), error_get_sub());
+                main_error_exit(NULL);
         }
 
     if (main_option_test) {