shithub: mc

Info  •  Files  •  Log  •  Branches

Add 'htgetv' function.

    Returns a value no matter what. A default value, if needed.

--- a/libstd/htab.myr

+++ b/libstd/htab.myr

@@ -21,6 +21,7 @@

 	generic htput	: (ht : htab(@k, @v)#, k : @k, v : @v -> void)

 	generic htdel	: (ht : htab(@k, @v)#, k : @k -> void)

 	generic htget	: (ht : htab(@k, @v)#, k : @k -> option(@v))

+	generic htgetv	: (ht : htab(@k, @v)#, k : @k, fallback : @v-> @v)

 	generic hthas	: (ht : htab(@k, @v)#, k : @k -> bool)

 	generic htkeys	: (ht : htab(@k, @v)# -> @k[:])

 ;;

@@ -163,6 +164,13 @@

 	match idx(ht, k)

 	| `Some i:	-> `Some ht.vals[i]

 	| `None:	-> `None

+	;;

+}

+

+generic htgetv = {ht, k, v

+	match idx(ht, k)

+	| `Some i:	-> ht.vals[i]

+	| `None:	-> v

 	;;

 }

--- a/myrbuild/myrbuild.c

+++ b/myrbuild/myrbuild.c

@@ -373,8 +373,6 @@

     head = *nargs;

     for (i = 0; i < nlibs; i++)

         visit(args, nargs, head, g, libs[i], looped, marked);

-    compiled = mkht(strhash, streq);

-    

 }

 void linkobj(char **files, size_t nfiles)