readline's handling of multiline input improved

kimtg · kimtg · commit bc391b174924 · 2023-08-18T17:11:37.000+09:00
diff --git a/arc.cpp b/arc.cpp
@@ -2378,11 +2378,8 @@ A symbol can be coerced to a string.
 
 		while ((temp = readline("> ")) != NULL) {
 			input = temp;
+			free(temp);
 		read_start:
-#ifdef READLINE
-			if (temp && *temp)
-				add_history(temp);
-#endif
 
 			const char *p = input.c_str();
 			error err;
@@ -2394,8 +2391,12 @@ A symbol can be coerced to a string.
 				char *line = readline("  ");
 				if (!line) break;
 				input += std::string("\n") + line;
+				free(line);
 				goto read_start;
 			}
+#ifdef READLINE
+			add_history(input.c_str());
+#endif
 
 			if (!err) {
 				while (1) {
@@ -2421,7 +2422,6 @@ A symbol can be coerced to a string.
 			else {
 				print_error(err);
 			}
-			free(temp);
 		}
 	}
 }
diff --git a/arc.h b/arc.h
@@ -34,7 +34,7 @@
 #endif
 
 namespace arc {
-	constexpr auto VERSION = "0.25";
+	constexpr auto VERSION = "0.26";
 
 	enum type {
 		T_NIL,

Original file line number	Diff line number	Diff line change
`@@ -2378,11 +2378,8 @@ A symbol can be coerced to a string.`
`2378`	`2378`
`2379`	`2379`	`while ((temp = readline("> ")) != NULL) {`
`2380`	`2380`	`input = temp;`
	`2381`	`+ free(temp);`
`2381`	`2382`	`read_start:`
`2382`		`-#ifdef READLINE`
`2383`		`- if (temp && *temp)`
`2384`		`- add_history(temp);`
`2385`		`-#endif`
`2386`	`2383`
`2387`	`2384`	`const char *p = input.c_str();`
`2388`	`2385`	`error err;`
`@@ -2394,8 +2391,12 @@ A symbol can be coerced to a string.`
`2394`	`2391`	`char *line = readline(" ");`
`2395`	`2392`	`if (!line) break;`
`2396`	`2393`	`input += std::string("\n") + line;`
	`2394`	`+ free(line);`
`2397`	`2395`	`goto read_start;`
`2398`	`2396`	`}`
	`2397`	`+#ifdef READLINE`
	`2398`	`+ add_history(input.c_str());`
	`2399`	`+#endif`
`2399`	`2400`
`2400`	`2401`	`if (!err) {`
`2401`	`2402`	`while (1) {`
`@@ -2421,7 +2422,6 @@ A symbol can be coerced to a string.`
`2421`	`2422`	`else {`
`2422`	`2423`	`print_error(err);`
`2423`	`2424`	`}`
`2424`		`- free(temp);`
`2425`	`2425`	`}`
`2426`	`2426`	`}`
`2427`	`2427`	`}`