better batch mode error msgs

Author: jcupitt

TODO

@@ -1,3 +1,15 @@
+- 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/main-batch.c

@@ -95,17 +95,20 @@ main_log_is_empty(void)
 static void
 main_error_exit(const char *fmt, ...)
 {
-    va_list args;
+	if (fmt) {
+		va_list args;
 
-    va_start(args, fmt);
-    (void) vfprintf(stderr, fmt, args);
-    va_end(args);
-    fprintf(stderr, "\n");
+		va_start(args, fmt);
+		(void) vfprintf(stderr, fmt, args);
+		va_end(args);
+		fprintf(stderr, "\n");
+	}
 
     if (!g_str_equal(error_get_top(), "")) {
-        fprintf(stderr, "%s\n", error_get_top());
+        fprintf(stderr, "%s", error_get_top());
         if (!g_str_equal(error_get_sub(), ""))
-            fprintf(stderr, "%s\n", error_get_sub());
+            fprintf(stderr, ", %s", error_get_sub());
+		fprintf(stderr, "\n");
     }
 
     if (main_option_verbose) {
@@ -444,7 +447,7 @@ main(int argc, char **argv)
 		argc > 1) {
 		// load argv[1] as a set of defs
 		if (!toolkit_new_from_file(main_toolkitgroup, argv[1]))
-			main_log_add("%s\n", error_get_sub());
+			main_error_exit(NULL);
 
 		// the rest of argc/argv become nip4 defs
 		main_build_argv(argc - 1, argv + 1);

src/util.c

@@ -186,6 +186,10 @@ error_get_top(void)
 const char *
 error_get_sub(void)
 {
+	// remove any annoying trailing \n
+	while (vips_buf_removec(&error_sub_buf, '\n'))
+			;
+
 	return vips_buf_all(&error_sub_buf);
 }
 

test/workspaces/test_snip.def

@@ -2,87 +2,89 @@
 // we can't use uchar as a number format directly since it'll become 'a' or
 // whatever and arithmetic ops will start failing
 fmts = [
-	["uchar", cast_unsigned_char, cast_unsigned_int @ cast_unsigned_char],
-	["char", cast_signed_char, cast_signed_int @ cast_signed_char],
-	["ushort", cast_unsigned_short, cast_unsigned_short],
-	["short", cast_signed_short, cast_signed_short],
-	["uint", cast_unsigned_int, cast_unsigned_int],
-	["int", cast_signed_int, cast_signed_int],
-	["float", cast_float, cast_float],
-	["double", cast_double, cast_double],
-	["complex", cast_complex, cast_complex],
-	["dcomplex", cast_double_complex, cast_double_complex]
+    ["uchar", cast_unsigned_char, cast_unsigned_int @ cast_unsigned_char],
+    ["char", cast_signed_char, cast_signed_int @ cast_signed_char],
+    ["ushort", cast_unsigned_short, cast_unsigned_short],
+    ["short", cast_signed_short, cast_signed_short],
+    ["uint", cast_unsigned_int, cast_unsigned_int],
+    ["int", cast_signed_int, cast_signed_int],
+    ["float", cast_float, cast_float],
+    ["double", cast_double, cast_double],
+    ["complex", cast_complex, cast_complex],
+    ["dcomplex", cast_double_complex, cast_double_complex]
 ];
 
 // we need a to_real that does images as well
 to_real x
-	= abs x, is_complex x
-	= mean x, is_Image x
-	= x;
+    = abs x, is_complex x
+    = mean x, is_Image x
+    = x;
 
 // numbers we test
 numbers = [-10, 0, 1, 10, 3.1415927];
 
 test_unary op_name fn
-	= foldr1 logical_and
-		[test fname ifmt nfmt x :: [fname, ifmt, nfmt] <- fmts; x <- numbers]
+    = [test fname ifmt nfmt x :: [fname, ifmt, nfmt] <- fmts; x <- numbers]
 {
-	// image == number can fail due to rounding differences
-	test fname ifmt nfmt x
-		= true, abs (image - number) < 0.001
-		= error (join_sep " " (map print
-			["unary", fname, op_name, x, "==", image, number]))
-	{
-		image = (to_real @ fn @ ifmt @ to_image) x;
-		number = (to_real @ fn @ nfmt) x;
-	}
+    test fname ifmt nfmt x
+        = [status, message]
+    {
+        status = abs (image - number) < 0.001 && abs (matrix - number) < 0.001;
+        message = join_sep " " (map print [
+            "unary", fname, op_name, x, "==", image, number, matrix
+        ]);
+        image = (to_real @ fn @ ifmt @ to_image) x;
+        number = (to_real @ fn @ nfmt) x;
+        matrix = (to_real @ fn @ ifmt @ to_matrix) x;
+    }
 }
 
 test_binary op_name fn
-	= foldr1 logical_and
-		[test fname ifmt nfmt x y ::
-			[fname, ifmt, nfmt] <- fmts; x <- numbers; y <- numbers]
+    = [test fname ifmt nfmt x y ::
+         [fname, ifmt, nfmt] <- fmts; x <- numbers; y <- numbers]
 {
-	// image == number can fail due to rounding differences
-	test fname ifmt nfmt x y
-		= true, abs (image - number) < 0.001
-		= error (join_sep " " (map print
-			["binary", fname, x, op_name, y, "==", image, number]))
-	{
-		image = to_real (fn ((ifmt @ to_image) x) ((ifmt @ to_image) y));
-		number = to_real (fn (nfmt x) (nfmt y));
-	}
+    // image == number can fail due to rounding differences
+    test fname ifmt nfmt x y
+        = [status, message]
+    {
+        status = abs (image - number) < 0.001 && abs (matrix - number) < 0.001;
+        message = join_sep " " (map print [
+            "binary", fname, x, op_name, y, "==", image, number, matrix
+        ]);
+        image = to_real (fn ((ifmt @ to_image) x) ((ifmt @ to_image) y));
+        number = to_real (fn (nfmt x) (nfmt y));
+        matrix = to_real (fn ((ifmt @ to_matrix) x) ((ifmt @ to_matrix) y));
+    }
 }
 
 tests = [
-	test_binary "add" add,
-	test_binary "subtract" subtract,
-	test_binary "multiply" multiply,
-	test_binary "divide" test_div,
-	test_unary "square" square,
-	test_unary "constant plus" (add 12),
-	test_unary "plus constant" (converse add 12),
-	test_unary "divided by constant" (converse test_div 3),
-	test_unary "multiply constant" (multiply 7),
-	test_unary "constant multiplied by" (converse multiply 7),
-	test_unary "constant subtracted from" (subtract 4),
-	test_unary "subtract constant" (converse subtract 4),
-	"" ++ "a" == "a",
-	hd [1, error "nope"] == 1
+    test_binary "add" add,
+    test_binary "subtract" subtract,
+    test_binary "multiply" multiply,
+    test_binary "divide" test_div,
+    test_unary "square" square,
+    test_unary "constant plus" (add 12),
+    test_unary "plus constant" (converse add 12),
+    test_unary "divided by constant" (converse test_div 3),
+    test_unary "multiply constant" (multiply 7),
+    test_unary "constant multiplied by" (converse multiply 7),
+    test_unary "constant subtracted from" (subtract 4),
+    test_unary "subtract constant" (converse subtract 4),
+    ["" ++ "a" == "a", "concat"],
+    [hd [1, error "nope"] == 1, "lazy hd"]
 ]
 {
-	// libvips divide returns 0 for divide by zero
-	test_div a b
-		= 0, is_real b && b == 0
-		= 0, is_complex b && re b == 0 && im b == 0
-		= divide a b;
+    // libvips divide returns 0 for divide by zero
+    test_div a b
+        = 0, is_real b && b == 0
+        = 0, is_complex b && re b == 0 && im b == 0
+        = divide a b;
 }
 
 main
-	= "all tests pass", fail == []
-	= "failed: " ++ join_sep ", " (map print fail_numbers)
+    = concat (map print_result tests) ++ "\n"
 {
-	numbered = zip2 tests [1..];
-	fail = filter (not @ extract 0) numbered;
-	fail_numbers = map (extract 1) fail;
+    print_result result
+        = ".", result?0
+        = error result?1;
 }