hare

commit 6fc89deae9d37f6c3fff1000e41adbf8eb50cca3
parent ed8c982d70fa9564e4fe481c8d4b7a747d1f8a72
Author: Bor Grošelj Simić <bgs@turminal.net>
Date:   Sun, 22 Dec 2024 23:26:36 +0100

hare::doc: don't introduce own error type

The problem with this is that Harec used to (incorrectly) do a full
dealias upon encountering a ... operator, and doc::error relied on this
behavior in function return types. This could be fixed by introducing
some casts, but there is really no good reason to have another separate
error type there at all.

Signed-off-by: Bor Grošelj Simić <bgs@turminal.net>

Diffstat:
M
cmd/haredoc/doc/types.ha
 | 
4
+---
M
hare/parse/doc/doc.ha
 | 
15
++++++---------

2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/cmd/haredoc/doc/types.ha b/cmd/haredoc/doc/types.ha
@@ -14,7 +14,7 @@ use os::exec;
 
 export type haredoc_colors_error = !str;
 
-export type error = !(lex::error | parse::error | doc::error | io::error |
+export type error = !(lex::error | parse::error |  io::error |
 	module::error | exec::error | fs::error | haredoc_colors_error |
 	utf8::invalid);
 
@@ -24,8 +24,6 @@ export fn strerror(err: error) str = {
 		return lex::strerror(err);
 	case let err: parse::error =>
 		return parse::strerror(err);
-	case let err: doc::error =>
-		return doc::strerror(err);
 	case let err: io::error =>
 		return io::strerror(err);
 	case let err: module::error =>
diff --git a/hare/parse/doc/doc.ha b/hare/parse/doc/doc.ha
@@ -28,17 +28,14 @@ export type decl_ref = ast::ident;
 // A reference to a module.
 export type mod_ref = ast::ident;
 
-// All possible error types.
-export type error = !lex::error;
-
 // Converts an error into a human-friendly string. The result may be statically
 // allocated.
-export fn strerror(err: error) const str = lex::strerror(err);
+export fn strerror(err: lex::error) const str = lex::strerror(err);
 
 // Parses a haredoc document from an [[io::handle]]. 'start' is the location of
 // the top-left corner of the document, for accurate locations in error messages
 // (e.g. declaration documentation starts at col=3; READMEs start at col=1).
-export fn parse(in: io::handle, start: lex::location) (doc | error) = {
+export fn parse(in: io::handle, start: lex::location) (doc | lex::error) = {
 	let sc = bufio::newscanner(in);
 	defer bufio::finish(&sc);
 
@@ -64,7 +61,7 @@ export fn parse(in: io::handle, start: lex::location) (doc | error) = {
 fn _parse(
 	sc: *bufio::scanner,
 	loc: *lex::location,
-) (doc | ...error | utf8::invalid) = {
+) (doc | ...lex::error | utf8::invalid) = {
 	let doc: doc = [];
 
 	for (let r => bufio::scan_rune(sc)?) {
@@ -100,7 +97,7 @@ fn _parse(
 fn scan_code_sample(
 	sc: *bufio::scanner,
 	loc: *lex::location,
-) (code_sample | ...error | utf8::invalid) = {
+) (code_sample | ...lex::error | utf8::invalid) = {
 	let s = memio::dynamic();
 	for (let r => bufio::scan_rune(sc)?) {
 		switch (r) {
@@ -150,7 +147,7 @@ fn scan_code_sample(
 fn scan_list(
 	sc: *bufio::scanner,
 	loc: *lex::location,
-) (list | ...error | utf8::invalid) = {
+) (list | ...lex::error | utf8::invalid) = {
 	let li: list = [];
 	for (true) {
 		match (bufio::scan_rune(sc)?) {
@@ -189,7 +186,7 @@ type state = enum {
 fn scan_paragraph(
 	sc: *bufio::scanner,
 	loc: *lex::location,
-) (paragraph | ...error | utf8::invalid) = {
+) (paragraph | ...lex::error | utf8::invalid) = {
 	let p: paragraph = [];
 	let s = memio::dynamic();
 	defer io::close(&s)!;