shithub: mc

Info  •  Files  •  Log  •  Branches

Don't double install formats.

--- a/lib/std/fmt.myr

+++ b/lib/std/fmt.myr

@@ -9,8 +9,10 @@

 use "htab"

 use "intparse"

 use "introspect"

+use "memops"

 use "option"

 use "result"

+use "sldup"

 use "sleq"

 use "slpush"

 use "strbuf"

@@ -79,7 +81,10 @@

 var fmtmap : htab(byte[:], fmtdesc)#

 const fmtinstall = {ty, fn, optdesc

-	htput(fmtmap, ty, [.fn=fn, .optdesc=optdesc])

+	match std.htget(fmtmap, ty)

+	| `std.Some _:	std.fatal("doubly installed format\n")

+	| `std.None:	htput(fmtmap, ty, [.fn=fn, .optdesc=sldup(optdesc)])

+	;;

 }

 const put = {fmt, args