shithub: mc

Info  •  Files  •  Log  •  Branches

Move away from ".use" suffix.

--- a/lib/bio/geti.myr

+++ b/lib/bio/geti.myr

@@ -1,6 +1,6 @@

 use std

-use "bio.use"

+use "bio"

 pkg bio =

 	/* unsigned big endian */

--- a/lib/bio/iter.myr

+++ b/lib/bio/iter.myr

@@ -1,5 +1,5 @@

 use std

-use "bio.use"

+use "bio"

 pkg bio =

 	type lineiter = file#

--- a/lib/bio/puti.myr

+++ b/lib/bio/puti.myr

@@ -1,6 +1,6 @@

 use std

-use "bio.use"

+use "bio"

 pkg bio =

 	/* unsigned big endian */

--- a/lib/cryptohash/test/md5.myr

+++ b/lib/cryptohash/test/md5.myr

@@ -1,7 +1,7 @@

 use std

 use cryptohash

-use "test/util.use"

+use "test/util"

 const main = {

 	hasheq(cryptohash.md5("")[:], \

--- a/lib/cryptohash/test/sha1.myr

+++ b/lib/cryptohash/test/sha1.myr

@@ -1,7 +1,7 @@

 use std

 use cryptohash

-use "test/util.use"

+use "test/util"

 const main = {

 	hasheq(cryptohash.sha1("")[:], \

--- a/lib/cryptohash/test/sha256.myr

+++ b/lib/cryptohash/test/sha256.myr

@@ -1,7 +1,7 @@

 use std

 use cryptohash

-use "test/util.use"

+use "test/util"

 const main = {

 	hasheq(cryptohash.sha224("")[:], \

--- a/lib/cryptohash/test/sha512.myr

+++ b/lib/cryptohash/test/sha512.myr

@@ -1,7 +1,7 @@

 use std

 use cryptohash

-use "test/util.use"

+use "test/util"

 const main = {

 	hasheq(cryptohash.sha384("")[:], \

--- a/lib/date/date.myr

+++ b/lib/date/date.myr

@@ -1,6 +1,6 @@

 use std

-use "types.use"

-use "zoneinfo.use"

+use "types"

+use "zoneinfo"

 pkg date =

 	/* useful constructors */

--- a/lib/date/fmt.myr

+++ b/lib/date/fmt.myr

@@ -1,7 +1,7 @@

 use std

-use "types.use"

-use "names.use"

+use "types"

+use "names"

 pkg date = 

 	const sbfmt	: (sb : std.strbuf#, args : std.valist#, opt : (byte[:], byte[:])[:] -> void)

--- a/lib/date/parse.myr

+++ b/lib/date/parse.myr

@@ -1,9 +1,9 @@

 use std

-use "types.use"

-use "names.use"

-use "date.use"

-use "zoneinfo.use"

+use "types"

+use "names"

+use "date"

+use "zoneinfo"

 pkg date =

 	type parsefail = union

--- a/lib/date/zoneinfo+posixy.myr

+++ b/lib/date/zoneinfo+posixy.myr

@@ -1,7 +1,7 @@

 use std

 use sys

-use "types.use"

+use "types"

 pkg _zoneinfo =

 	type zifile

--- a/lib/inifile/access.myr

+++ b/lib/inifile/access.myr

@@ -1,7 +1,7 @@

 use std

 use bio

-use "types.use"

+use "types"

 pkg inifile =

 	/* key getting/setting */

--- a/lib/inifile/parse.myr

+++ b/lib/inifile/parse.myr

@@ -1,7 +1,7 @@

 use std

 use bio

-use "types.use"

+use "types"

 pkg inifile =

 	/* reading */

--- a/lib/inifile/write.myr

+++ b/lib/inifile/write.myr

@@ -1,7 +1,7 @@

 use std

 use bio

-use "types.use"

+use "types"

 pkg inifile =

 	const write	: (ini : inifile#, path : byte[:]	-> bool)

--- a/lib/regex/compile.myr

+++ b/lib/regex/compile.myr

@@ -1,7 +1,7 @@

 use std

-use "types.use"

-use "ranges.use"

+use "types"

+use "ranges"

 pkg regex =

 	const parse	: (re : byte[:]	-> std.result(ast#, status))

--- a/lib/regex/interp.myr

+++ b/lib/regex/interp.myr

@@ -1,6 +1,6 @@

 use std

-use "types.use"

+use "types"

 pkg regex =

 	const exec	: (re : regex#, str : byte[:] -> std.option(byte[:][:]))

--- a/lib/regex/test/basic.myr

+++ b/lib/regex/test/basic.myr

@@ -1,6 +1,6 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	var s : byte[:]

--- a/lib/regex/test/boundaries.myr

+++ b/lib/regex/test/boundaries.myr

@@ -1,5 +1,5 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	/* expected matches */

--- a/lib/regex/test/capture.myr

+++ b/lib/regex/test/capture.myr

@@ -1,5 +1,5 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	testmatch("A(.*)", "Abc", `std.Some ["bc"][:])

--- a/lib/regex/test/class.myr

+++ b/lib/regex/test/class.myr

@@ -1,6 +1,6 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	asciiclass()

--- a/lib/regex/test/failmatch.myr

+++ b/lib/regex/test/failmatch.myr

@@ -1,6 +1,6 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	testmatch(".*bcd", "Abc", `std.None)

--- a/lib/regex/test/negclass.myr

+++ b/lib/regex/test/negclass.myr

@@ -1,6 +1,6 @@

 use std

-use "testmatch.use"

+use "testmatch"

 const main = {

 	asciiclass()

--- a/lib/regex/test/unicode.myr

+++ b/lib/regex/test/unicode.myr

@@ -1,7 +1,7 @@

 use std

 use regex

-use "testmatch.use"

+use "testmatch"

 const main = {

 	testmatch(".*bæc", "Abæc", `std.Some [][:])

--- a/lib/std/alloc.myr

+++ b/lib/std/alloc.myr

@@ -1,9 +1,9 @@

-use "die.use"

-use "extremum.use"

-use "types.use"

-use "units.use"

-use "syswrap.use"

-use "memops.use"

+use "die"

+use "extremum"

+use "types"

+use "units"

+use "syswrap"

+use "memops"

 /*

 The allocator implementation here is based on Bonwick's slab allocator.

--- a/lib/std/assert.myr

+++ b/lib/std/assert.myr

@@ -1,6 +1,6 @@

-use "fmt.use"

-use "syswrap.use"

-use "varargs.use"

+use "fmt"

+use "syswrap"

+use "varargs"

 pkg std =

 	const assert	: (cond : bool, fmt : byte[:], args : ... -> void)

--- a/lib/std/bigint.myr

+++ b/lib/std/bigint.myr

@@ -1,18 +1,18 @@

-use "alloc.use"

-use "chartype.use"

-use "cmp.use"

-use "die.use"

-use "extremum.use"

-use "hasprefix.use"

-use "option.use"

-use "slcp.use"

-use "sldup.use"

-use "slfill.use"

-use "slpush.use"

-use "types.use"

-use "utf.use"

-use "errno.use"

-use "memops.use"

+use "alloc"

+use "chartype"

+use "cmp"

+use "die"

+use "extremum"

+use "hasprefix"

+use "option"

+use "slcp"

+use "sldup"

+use "slfill"

+use "slpush"

+use "types"

+use "utf"

+use "errno"

+use "memops"

 pkg std =

 	type bigint = struct

--- a/lib/std/bitset.myr

+++ b/lib/std/bitset.myr

@@ -1,11 +1,11 @@

-use "alloc.use"

-use "die.use"

-use "extremum.use"

-use "mk.use"

-use "slcp.use"

-use "sldup.use"

-use "slfill.use"

-use "types.use"

+use "alloc"

+use "die"

+use "extremum"

+use "mk"

+use "slcp"

+use "sldup"

+use "slfill"

+use "types"

 pkg std =

 	type bitset = struct

--- a/lib/std/blat.myr

+++ b/lib/std/blat.myr

@@ -1,5 +1,5 @@

-use "syswrap.use"

-use "result.use"

+use "syswrap"

+use "result"

 pkg std =

 	const blat : (path : byte[:], buf : byte[:], perm : int64 -> bool)

--- a/lib/std/chartype.myr

+++ b/lib/std/chartype.myr

@@ -1,5 +1,5 @@

-use "die.use"

-use "types.use"

+use "die"

+use "types"

 /* 

    Tables adapted from plan 9's runetype.c,

--- a/lib/std/clear.myr

+++ b/lib/std/clear.myr

@@ -1,4 +1,4 @@

-use "slfill.use"

+use "slfill"

 pkg std =

 	generic clear	: (p : @a#	-> void)

 ;;

--- a/lib/std/cmp.myr

+++ b/lib/std/cmp.myr

@@ -1,7 +1,7 @@

-use "extremum.use"

-use "types.use"

-use "utf.use"

-use "chartype.use"

+use "extremum"

+use "types"

+use "utf"

+use "chartype"

 pkg std =

 	type order = union

--- a/lib/std/consts.myr

+++ b/lib/std/consts.myr

@@ -1,4 +1,4 @@

-use "syswrap.use"

+use "syswrap"

 pkg std =

 	const In	: fd = 0

--- a/lib/std/cstrconv.myr

+++ b/lib/std/cstrconv.myr

@@ -1,4 +1,4 @@

-use "types.use"

+use "types"

 pkg std =

 	const cstrlen	: (buf : byte[:] -> size)

--- a/lib/std/dial+plan9.myr

+++ b/lib/std/dial+plan9.myr

@@ -1,16 +1,16 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "fmt.use"

-use "option.use"

-use "pathjoin.use"

-use "result.use"

-use "sleq.use"

-use "strfind.use"

-use "strstrip.use"

-use "syswrap.use"

-use "utf.use"

+use "alloc"

+use "die"

+use "fmt"

+use "option"

+use "pathjoin"

+use "result"

+use "sleq"

+use "strfind"

+use "strstrip"

+use "syswrap"

+use "utf"

 pkg std =

--- a/lib/std/dial+posixy.myr

+++ b/lib/std/dial+posixy.myr

@@ -1,20 +1,20 @@

 use sys

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "endian.use"

-use "hasprefix.use"

-use "intparse.use"

-use "ipparse.use"

-use "option.use"

-use "resolve.use"

-use "result.use"

-use "sleq.use"

-use "slcp.use"

-use "strfind.use"

-use "syswrap.use"

-use "utf.use"

+use "alloc"

+use "chartype"

+use "die"

+use "endian"

+use "hasprefix"

+use "intparse"

+use "ipparse"

+use "option"

+use "resolve"

+use "result"

+use "sleq"

+use "slcp"

+use "strfind"

+use "syswrap"

+use "utf"

 pkg std =

 	const dial	: (dialstr : byte[:] -> result(fd, byte[:]))

--- a/lib/std/die.myr

+++ b/lib/std/die.myr

@@ -1,5 +1,5 @@

-use "syswrap.use"

-use "types.use"

+use "syswrap"

+use "types"

 pkg std = 

 	$noret const die	: (msg : byte[:] -> void)

--- a/lib/std/dir+freebsd.myr

+++ b/lib/std/dir+freebsd.myr

@@ -1,12 +1,12 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "types.use"

+use "alloc"

+use "die"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "types"

 pkg std =

 	type dir = struct

--- a/lib/std/dir+linux.myr

+++ b/lib/std/dir+linux.myr

@@ -1,13 +1,13 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "memops.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "types.use"

+use "alloc"

+use "die"

+use "memops"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "types"

 pkg std =

 	type dir = struct

--- a/lib/std/dir+osx.myr

+++ b/lib/std/dir+osx.myr

@@ -1,12 +1,12 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "types.use"

+use "alloc"

+use "die"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "types"

 pkg std =

 	type dir = struct

--- a/lib/std/dir+plan9.myr

+++ b/lib/std/dir+plan9.myr

@@ -1,13 +1,13 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "syswrap.use"

-use "types.use"

+use "alloc"

+use "die"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "syswrap"

+use "types"

 pkg std =

 	type dir = struct

--- a/lib/std/diriter.myr

+++ b/lib/std/diriter.myr

@@ -1,6 +1,6 @@

-use "alloc.use"

-use "dir.use"

-use "option.use"

+use "alloc"

+use "dir"

+use "option"

 pkg std =

 	type diriter = dir#

--- a/lib/std/dirname.myr

+++ b/lib/std/dirname.myr

@@ -1,11 +1,11 @@

-use "alloc.use"

-use "slcp.use"

-use "die.use"

-use "sldup.use"

-use "strfind.use"

-use "option.use"

-use "types.use"

-use "memops.use"

+use "alloc"

+use "slcp"

+use "die"

+use "sldup"

+use "strfind"

+use "option"

+use "types"

+use "memops"

 pkg std =

 	const dirname	: (p : byte[:] -> byte[:])

--- a/lib/std/env+plan9.myr

+++ b/lib/std/env+plan9.myr

@@ -1,17 +1,17 @@

 use sys

-use "alloc.use"

-use "die.use"

-use "extremum.use"

-use "fmt.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "sleq.use"

-use "slpush.use"

-use "slurp.use"

-use "cstrconv.use"

+use "alloc"

+use "die"

+use "extremum"

+use "fmt"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "sleq"

+use "slpush"

+use "slurp"

+use "cstrconv"

 pkg std =

 	const getenv :	(name : byte[:] -> option(byte[:]))

--- a/lib/std/env+posixy.myr

+++ b/lib/std/env+posixy.myr

@@ -1,8 +1,8 @@

 use sys

-use "extremum.use"

-use "option.use"

-use "sleq.use"

+use "extremum"

+use "option"

+use "sleq"

 pkg std =

 	const getenv :	(name : byte[:] -> option(byte[:]))

--- a/lib/std/execvp.myr

+++ b/lib/std/execvp.myr

@@ -1,11 +1,11 @@

-use "alloc.use"

-use "env.use"

-use "errno.use"

-use "fmt.use"

-use "option.use"

-use "strfind.use"

-use "strsplit.use"

-use "syswrap.use"

+use "alloc"

+use "env"

+use "errno"

+use "fmt"

+use "option"

+use "strfind"

+use "strsplit"

+use "syswrap"

 pkg std = 

 	const execvp	: (cmd : byte[:], args : byte[:][:] -> errno)

--- a/lib/std/fltfmt.myr

+++ b/lib/std/fltfmt.myr

@@ -1,13 +1,13 @@

-use "alloc.use"

-use "bigint.use"

-use "die.use"

-use "extremum.use"

-use "fltbits.use"

-use "slpush.use"

-use "strbuf.use"

-use "types.use"

-use "utf.use"

-use "memops.use"

+use "alloc"

+use "bigint"

+use "die"

+use "extremum"

+use "fltbits"

+use "slpush"

+use "strbuf"

+use "types"

+use "utf"

+use "memops"

 pkg std =

 	pkglocal const MNormal = 0

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

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

@@ -1,25 +1,25 @@

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "extremum.use"

-use "fltfmt.use"

-use "hashfuncs.use"

-use "hasprefix.use"

-use "htab.use"

-use "introspect.use"

-use "intparse.use"

-use "option.use"

-use "result.use"

-use "sleq.use"

-use "slpush.use"

-use "strbuf.use"

-use "strfind.use"

-use "strsplit.use"

-use "syswrap-ss.use"

-use "syswrap.use"

-use "types.use"

-use "utf.use"

-use "varargs.use"

+use "alloc"

+use "chartype"

+use "die"

+use "extremum"

+use "fltfmt"

+use "hashfuncs"

+use "hasprefix"

+use "htab"

+use "introspect"

+use "intparse"

+use "option"

+use "result"

+use "sleq"

+use "slpush"

+use "strbuf"

+use "strfind"

+use "strsplit"

+use "syswrap-ss"

+use "syswrap"

+use "types"

+use "utf"

+use "varargs"

 pkg std =

 	/* write to fd */

--- a/lib/std/fmtfuncs.myr

+++ b/lib/std/fmtfuncs.myr

@@ -1,10 +1,10 @@

-use "alloc.use"

-use "bigint.use"

-use "bitset.use"

-use "fmt.use"

-use "introspect.use"

-use "strbuf.use"

-use "varargs.use"

+use "alloc"

+use "bigint"

+use "bitset"

+use "fmt"

+use "introspect"

+use "strbuf"

+use "varargs"

 pkg std =

 ;;

--- a/lib/std/fndup.myr

+++ b/lib/std/fndup.myr

@@ -1,7 +1,7 @@

-use "alloc.use"

-use "die.use"

-use "sldup.use"

-use "types.use"

+use "alloc"

+use "die"

+use "sldup"

+use "types"

 pkg std =

 	generic fndup	: (fn : @fn::function -> @fn::function)

--- a/lib/std/getcwd.myr

+++ b/lib/std/getcwd.myr

@@ -1,9 +1,9 @@

-use "alloc.use"

-use "errno.use"

-use "extremum.use"

-use "syswrap.use"

-use "syswrap-ss.use"

+use "alloc"

+use "errno"

+use "extremum"

+use "syswrap"

+use "syswrap-ss"

 pkg std =

 	const getcwd : (-> byte[:])

 ;;

--- a/lib/std/hashfuncs.myr

+++ b/lib/std/hashfuncs.myr

@@ -1,10 +1,10 @@

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "sleq.use"

-use "slpush.use"

-use "types.use"

-use "utf.use"

+use "alloc"

+use "chartype"

+use "die"

+use "sleq"

+use "slpush"

+use "types"

+use "utf"

 pkg std =

 	const strhash	: (s : byte[:]	-> uint32)

--- a/lib/std/hasprefix.myr

+++ b/lib/std/hasprefix.myr

@@ -1,4 +1,4 @@

-use "cmp.use"

+use "cmp"

 pkg std =

 	const hasprefix	: (s : byte[:], pre : byte[:] -> bool)

 ;;

--- a/lib/std/hassuffix.myr

+++ b/lib/std/hassuffix.myr

@@ -1,4 +1,4 @@

-use "sleq.use"

+use "sleq"

 pkg std =

 	const hassuffix	: (s : byte[:], suff : byte[:] -> bool)

 ;;

--- a/lib/std/htab.myr

+++ b/lib/std/htab.myr

@@ -1,8 +1,8 @@

-use "alloc.use"

-use "die.use"

-use "extremum.use"

-use "option.use"

-use "types.use"

+use "alloc"

+use "die"

+use "extremum"

+use "option"

+use "types"

 pkg std =

 	type htab(@k, @v) = struct

--- a/lib/std/intparse.myr

+++ b/lib/std/intparse.myr

@@ -1,9 +1,9 @@

-use "chartype.use"

-use "die.use"

-use "hasprefix.use"

-use "option.use"

-use "types.use"

-use "utf.use"

+use "chartype"

+use "die"

+use "hasprefix"

+use "option"

+use "types"

+use "utf"

 pkg std =

 	generic intparsebase	: (s : byte[:], base : int -> option(@a::(integral,numeric)))

--- a/lib/std/introspect.myr

+++ b/lib/std/introspect.myr

@@ -1,5 +1,5 @@

-use "types.use"

-use "die.use"

+use "types"

+use "die"

 pkg std =

 	type typedesc = union

--- a/lib/std/ipparse.myr

+++ b/lib/std/ipparse.myr

@@ -1,17 +1,17 @@

-use "die.use"

-use "intparse.use"

-use "option.use"

-use "strfind.use"

-use "types.use"

-use "chartype.use"

-use "fmt.use"

-use "slcp.use"

-use "slfill.use"

-use "sleq.use"

+use "die"

+use "intparse"

+use "option"

+use "strfind"

+use "types"

+use "chartype"

+use "fmt"

+use "slcp"

+use "slfill"

+use "sleq"

  /* FIXME: needed for decls which should be pulled in as hidden */

-use "hasprefix.use"

-use "utf.use"

+use "hasprefix"

+use "utf"

 pkg std =

--- a/lib/std/memops-impl.myr

+++ b/lib/std/memops-impl.myr

@@ -1,4 +1,4 @@

-use "types.use"

+use "types"

 pkg std =

 	pkglocal const memblit	: (dst : byte#, src : byte#, len : std.size -> void)

--- a/lib/std/memops.myr

+++ b/lib/std/memops.myr

@@ -1,4 +1,4 @@

-use "types.use"

+use "types"

 pkg std =

 	pkglocal extern const memblit	: (src : byte#, dst : byte#, len : std.size -> void)

--- a/lib/std/mk.myr

+++ b/lib/std/mk.myr

@@ -1,4 +1,4 @@

-use "alloc.use"

+use "alloc"

 pkg std =

 	generic mk	: (val : @a -> @a#)

--- a/lib/std/mkpath.myr

+++ b/lib/std/mkpath.myr

@@ -1,5 +1,5 @@

-use "syswrap.use"

-use "errno.use"

+use "syswrap"

+use "errno"

 pkg std =

 	const mkpath	: (p : byte[:], mode : int64 -> errno)

--- a/lib/std/mktemp.myr

+++ b/lib/std/mktemp.myr

@@ -1,16 +1,16 @@

-use "die.use"

-use "alloc.use"

-use "env.use"

-use "errno.use"

-use "fmt.use"

-use "option.use"

-use "pathjoin.use"

-use "memops.use"

-use "rand.use"

-use "result.use"

-use "sldup.use"

-use "syswrap.use"

-use "types.use"

+use "die"

+use "alloc"

+use "env"

+use "errno"

+use "fmt"

+use "option"

+use "pathjoin"

+use "memops"

+use "rand"

+use "result"

+use "sldup"

+use "syswrap"

+use "types"

 pkg std =

 	const mktemp	: (base : byte[:], opt : fdopt, mode : int64 -> std.result((fd, byte[:]), errno))

--- a/lib/std/now.myr

+++ b/lib/std/now.myr

@@ -1,5 +1,5 @@

-use "types.use"

-use "syswrap.use"

+use "types"

+use "syswrap"

 pkg std =

 	const now	: (-> time)

--- a/lib/std/optparse.myr

+++ b/lib/std/optparse.myr

@@ -1,15 +1,15 @@

-use "alloc.use"

-use "die.use"

-use "extremum.use"

-use "fmt.use"

-use "strbuf.use"

-use "option.use"

-use "sleq.use"

-use "slpush.use"

-use "syswrap-ss.use"

-use "syswrap.use"

-use "types.use"

-use "utf.use"

+use "alloc"

+use "die"

+use "extremum"

+use "fmt"

+use "strbuf"

+use "option"

+use "sleq"

+use "slpush"

+use "syswrap-ss"

+use "syswrap"

+use "types"

+use "utf"

 pkg std =

 	type optdef = struct

--- a/lib/std/pathjoin.myr

+++ b/lib/std/pathjoin.myr

@@ -1,13 +1,13 @@

-use "alloc.use"

-use "extremum.use"

-use "strjoin.use"

-use "strsplit.use"

-use "sleq.use"

-use "sljoin.use"

-use "sldup.use"

-use "slcp.use"

-use "die.use"

-use "fmt.use"

+use "alloc"

+use "extremum"

+use "strjoin"

+use "strsplit"

+use "sleq"

+use "sljoin"

+use "sldup"

+use "slcp"

+use "die"

+use "fmt"

 pkg std =

 	const pathcat	: (a : byte[:], b : byte[:] -> byte[:])

--- a/lib/std/putint.myr

+++ b/lib/std/putint.myr

@@ -1,5 +1,5 @@

-use "assert.use"

-use "types.use"

+use "assert"

+use "types"

 pkg std =

 	generic putle64	: (buf : byte[:], v :  @a::(numeric,integral) -> size)

--- a/lib/std/rand.myr

+++ b/lib/std/rand.myr

@@ -1,9 +1,9 @@

-use "die.use"

-use "extremum.use"

-use "assert.use"

-use "types.use"

-use "alloc.use"

-use "now.use"

+use "die"

+use "extremum"

+use "assert"

+use "types"

+use "alloc"

+use "now"

 /*

    Translated from C by Ori Bernstein

--- a/lib/std/resolve+posixy.myr

+++ b/lib/std/resolve+posixy.myr

@@ -1,24 +1,24 @@

 use sys

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "endian.use"

-use "extremum.use"

-use "hashfuncs.use"

-use "htab.use"

-use "ipparse.use"

-use "option.use"

-use "result.use"

-use "slcp.use"

-use "sldup.use"

-use "sleq.use"

-use "slpush.use"

-use "slurp.use"

-use "strfind.use"

-use "strsplit.use"

-use "strstrip.use"

-use "types.use"

-use "utf.use"

+use "alloc"

+use "chartype"

+use "die"

+use "endian"

+use "extremum"

+use "hashfuncs"

+use "htab"

+use "ipparse"

+use "option"

+use "result"

+use "slcp"

+use "sldup"

+use "sleq"

+use "slpush"

+use "slurp"

+use "strfind"

+use "strsplit"

+use "strstrip"

+use "types"

+use "utf"

 pkg std =

 	type rectype = union

--- a/lib/std/search.myr

+++ b/lib/std/search.myr

@@ -1,5 +1,5 @@

-use "cmp.use"

-use "option.use"

+use "cmp"

+use "option"

 pkg std =

 	generic lsearch	: (sl : @t[:], val : @t, cmp : (a : @t, b : @t -> order) -> option(@idx::(integral,numeric)))

--- a/lib/std/slcp.myr

+++ b/lib/std/slcp.myr

@@ -1,6 +1,6 @@

-use "die.use"

-use "types.use"

-use "memops.use"

+use "die"

+use "types"

+use "memops"

 pkg std =

 	generic slcp : (a : @a[:], b : @a[:] -> void)

--- a/lib/std/sldup.myr

+++ b/lib/std/sldup.myr

@@ -1,6 +1,6 @@

-use "alloc.use"

-use "die.use"

-use "slcp.use"

+use "alloc"

+use "die"

+use "slcp"

 pkg std =

 	generic sldup : (sl : @a[:] -> @a[:])

--- a/lib/std/sljoin.myr

+++ b/lib/std/sljoin.myr

@@ -1,5 +1,5 @@

-use "alloc.use"

-use "slcp.use"

+use "alloc"

+use "slcp"

 pkg std =

 	generic sljoin	: (dst : @a[:], src : @a[:]	-> @a[:])

--- a/lib/std/slpop.myr

+++ b/lib/std/slpop.myr

@@ -1,5 +1,5 @@

-use "types.use"

-use "alloc.use"

+use "types"

+use "alloc"

 pkg std =

 	generic slpop	: (sl : @a[:] -> (@a, @a[:]))

--- a/lib/std/slpush.myr

+++ b/lib/std/slpush.myr

@@ -1,5 +1,5 @@

-use "types.use"

-use "alloc.use"

+use "types"

+use "alloc"

 pkg std =

 	generic slpush	: (sl : @a[:], elt : @a	-> @a[:])

--- a/lib/std/slput.myr

+++ b/lib/std/slput.myr

@@ -1,6 +1,6 @@

-use "types.use"

-use "alloc.use"

-use "die.use"

+use "types"

+use "alloc"

+use "die"

 pkg std =

 	generic slput	: (sl : @a[:], idx : size, elt : @a	-> @a[:])

--- a/lib/std/slurp.myr

+++ b/lib/std/slurp.myr

@@ -1,10 +1,10 @@

-use "alloc.use"

-use "die.use"

-use "result.use"

-use "extremum.use"

-use "syswrap.use"

-use "errno.use"

-use "types.use"

+use "alloc"

+use "die"

+use "result"

+use "extremum"

+use "syswrap"

+use "errno"

+use "types"

 pkg std =

 	const slurp : (path : byte[:] -> result(byte[:], errno))

--- a/lib/std/sort.myr

+++ b/lib/std/sort.myr

@@ -1,4 +1,4 @@

-use "cmp.use"

+use "cmp"

 pkg std =

 	generic sort	: (sl:@a[:], cmp:(a:@a, b:@a -> order) -> @a[:])

--- a/lib/std/spork.myr

+++ b/lib/std/spork.myr

@@ -1,9 +1,9 @@

-use "die.use"

-use "execvp.use"

-use "fmt.use"

-use "result.use"

-use "syswrap.use"

-use "errno.use"

+use "die"

+use "execvp"

+use "fmt"

+use "result"

+use "syswrap"

+use "errno"

 pkg std =

 	const spork	: (cmd : byte[:][:]	-> result((pid, fd, fd), errno))

--- a/lib/std/strbuf.myr

+++ b/lib/std/strbuf.myr

@@ -1,10 +1,10 @@

-use "alloc.use"

-use "die.use"

-use "extremum.use"

-use "slcp.use"

-use "types.use"

-use "utf.use"

-use "memops.use"

+use "alloc"

+use "die"

+use "extremum"

+use "slcp"

+use "types"

+use "utf"

+use "memops"

 pkg std =

 	type strbuf = struct

--- a/lib/std/strfind.myr

+++ b/lib/std/strfind.myr

@@ -1,5 +1,5 @@

-use "types.use"

-use "option.use"

+use "types"

+use "option"

 pkg std =

 	const strfind	: (haystack : byte[:], needle : byte[:] -> option(size))

--- a/lib/std/strjoin.myr

+++ b/lib/std/strjoin.myr

@@ -1,6 +1,6 @@

-use "alloc.use"

-use "die.use"

-use "slcp.use"

+use "alloc"

+use "die"

+use "slcp"

 pkg std =

 	const strcat	: (a : byte[:], b : byte[:] -> byte[:])

--- a/lib/std/strsplit.myr

+++ b/lib/std/strsplit.myr

@@ -1,12 +1,12 @@

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "extremum.use"

-use "option.use"

-use "slpush.use"

-use "strfind.use"

-use "types.use"

-use "utf.use"

+use "alloc"

+use "chartype"

+use "die"

+use "extremum"

+use "option"

+use "slpush"

+use "strfind"

+use "types"

+use "utf"

 pkg std =

 	const strsplit	: (s : byte[:], delim : byte[:] -> byte[:][:])

--- a/lib/std/strstrip.myr

+++ b/lib/std/strstrip.myr

@@ -1,6 +1,6 @@

-use "types.use"

-use "utf.use"

-use "chartype.use"

+use "types"

+use "utf"

+use "chartype"

 pkg std =

 	const strstrip	: (str : byte[:] -> byte[:])

--- a/lib/std/syswrap+plan9-x6.myr

+++ b/lib/std/syswrap+plan9-x6.myr

@@ -1,5 +1,5 @@

 use sys

-use "types.use"

+use "types"

 pkg std =

 	type fd		= sys.fd

--- a/lib/std/syswrap+plan9.myr

+++ b/lib/std/syswrap+plan9.myr

@@ -1,11 +1,11 @@

 use sys

-use "option.use"

-use "types.use"

-use "errno.use"

-use "result.use"

-use "cstrconv.use"

-use "strfind.use"

+use "option"

+use "types"

+use "errno"

+use "result"

+use "cstrconv"

+use "strfind"

 pkg std =

 	type fd		= sys.fd

--- a/lib/std/syswrap+posixy.myr

+++ b/lib/std/syswrap+posixy.myr

@@ -1,9 +1,9 @@

 use sys

-use "cstrconv.use"

-use "errno.use"

-use "option.use"

-use "result.use"

-use "types.use"

+use "cstrconv"

+use "errno"

+use "option"

+use "result"

+use "types"

 pkg std =

 	type fd		= sys.fd

--- a/lib/std/syswrap-ss+freebsd.myr

+++ b/lib/std/syswrap-ss+freebsd.myr

@@ -1,8 +1,8 @@

 use sys

-use "errno.use"

-use "cstrconv.use"

-use "slcp.use"

-use "die.use"

+use "errno"

+use "cstrconv"

+use "slcp"

+use "die"

 pkg std =

 	const exit	: (status:int -> void)

--- a/lib/std/syswrap-ss+linux.myr

+++ b/lib/std/syswrap-ss+linux.myr

@@ -1,5 +1,5 @@

 use sys

-use "errno.use"

+use "errno"

 pkg std =

 	const exit	: (status:int -> void)

--- a/lib/std/syswrap-ss+osx.myr

+++ b/lib/std/syswrap-ss+osx.myr

@@ -1,8 +1,8 @@

 use sys

-use "errno.use"

-use "cstrconv.use"

-use "slcp.use"

-use "die.use"

+use "errno"

+use "cstrconv"

+use "slcp"

+use "die"

 pkg std =

 	const exit	: (status:int -> void)

--- a/lib/std/syswrap-ss+plan9.myr

+++ b/lib/std/syswrap-ss+plan9.myr

@@ -1,7 +1,7 @@

 use sys

-use "errno.use"

-use "cstrconv.use"

+use "errno"

+use "cstrconv"

 pkg std =

 	$noret const exit	: (status : int -> void)

--- a/lib/std/test/bytebuf.myr

+++ b/lib/std/test/bytebuf.myr

@@ -1,9 +1,9 @@

-use "bytebuf.use"

+use "bytebuf"

 /* support */

-use "die.use"

-use "fmt.use"

-use "sleq.use"

+use "die"

+use "fmt"

+use "sleq"

 const main = {

 	var bb, v

--- a/lib/std/try.myr

+++ b/lib/std/try.myr

@@ -1,6 +1,6 @@

-use "result.use"

-use "option.use"

-use "fmt.use"

+use "result"

+use "option"

+use "fmt"

 pkg std =

 	generic try : (v : result(@a, @b) -> @a)

--- a/lib/std/units.myr

+++ b/lib/std/units.myr

@@ -1,4 +1,4 @@

-use "types.use"

+use "types"

 pkg std =

 	/* JEDEC 100B.1 memory sizes */

--- a/lib/std/utf.myr

+++ b/lib/std/utf.myr

@@ -1,5 +1,5 @@

-use "die.use"

-use "types.use"

+use "die"

+use "types"

 pkg std =

 	const Badchar	: char = -1 castto(char)

--- a/lib/std/varargs.myr

+++ b/lib/std/varargs.myr

@@ -1,7 +1,7 @@

-use "types.use"

-use "introspect.use"

-use "sleq.use"

-use "die.use"

+use "types"

+use "introspect"

+use "sleq"

+use "die"

 pkg std =

 	type valist

--- a/lib/std/wait+plan9.myr

+++ b/lib/std/wait+plan9.myr

@@ -1,17 +1,17 @@

 use sys

-use "alloc.use"

-use "chartype.use"

-use "die.use"

-use "extremum.use"

-use "hashfuncs.use"

-use "hasprefix.use"

-use "htab.use"

-use "intparse.use"

-use "option.use"

-use "strsplit.use"

-use "syswrap.use"

-use "utf.use"

+use "alloc"

+use "chartype"

+use "die"

+use "extremum"

+use "hashfuncs"

+use "hasprefix"

+use "htab"

+use "intparse"

+use "option"

+use "strsplit"

+use "syswrap"

+use "utf"

 pkg std =

 	type waitstatus = union

@@ -91,4 +91,4 @@

 }

 const pidhash	= {x;	-> inthash(x castto(int32))}

-const pideq	= {a, b;	-> a == b}

\ No newline at end of file

+const pideq	= {a, b;	-> a == b}

--- a/lib/std/wait+posixy.myr

+++ b/lib/std/wait+posixy.myr

@@ -1,7 +1,7 @@

 use sys

-use "die.use"

-use "syswrap.use"

+use "die"

+use "syswrap"

 pkg std =

 	type waitstatus = union

--- a/lib/std/writeall.myr

+++ b/lib/std/writeall.myr

@@ -1,8 +1,8 @@

-use "errno.use"

-use "result.use"

-use "option.use"

-use "syswrap.use"

-use "types.use"

+use "errno"

+use "result"

+use "option"

+use "syswrap"

+use "types"

 pkg std =

 	const writeall : (fd : fd, src : byte[:] -> (size, option(errno)))

--- a/lib/sys/ifreq+linux.myr

+++ b/lib/sys/ifreq+linux.myr

@@ -1,4 +1,4 @@

-use "sys.use"

+use "sys"

 pkg sys =

 	const Ifnamesz = 16

--- a/lib/sys/ifreq+osx.myr

+++ b/lib/sys/ifreq+osx.myr

@@ -1,4 +1,4 @@

-use "sys.use"

+use "sys"

 pkg sys =

 	const Ifnamesz = 16

--- a/lib/sys/ifreq+plan9.myr

+++ b/lib/sys/ifreq+plan9.myr

@@ -1,2 +1,2 @@

 pkg sys =

-;;

\ No newline at end of file

+;;

--- a/lib/sys/sys+freebsd-x64.myr

+++ b/lib/sys/sys+freebsd-x64.myr

@@ -1,4 +1,4 @@

-use "systypes.use"

+use "systypes"

 pkg sys =

 	type pid	= int	/* process id */

--- a/lib/sys/sys+linux-x64.myr

+++ b/lib/sys/sys+linux-x64.myr

@@ -1,4 +1,4 @@

-use "systypes.use"

+use "systypes"

 pkg sys =

 	type scno	= int64	/* syscall */

--- a/lib/sys/sys+osx-x64.myr

+++ b/lib/sys/sys+osx-x64.myr

@@ -1,4 +1,4 @@

-use "systypes.use"

+use "systypes"

 pkg sys =

 	type scno 	= int64	/* syscall */

--- a/lib/sys/sys+plan9-x64.myr

+++ b/lib/sys/sys+plan9-x64.myr

@@ -1,4 +1,4 @@

-use "systypes.use"

+use "systypes"

 pkg sys =

 	type scno	= int64	/* syscall */

--- a/mbld/build.myr

+++ b/mbld/build.myr

@@ -1,11 +1,11 @@

 use std

-use "config.use"

-use "deps.use"

-use "opts.use"

-use "parse.use"

-use "types.use"

-use "util.use"

+use "config"

+use "deps"

+use "opts"

+use "parse"

+use "types"

+use "util"

 pkg bld =

 	const buildall	: (b : build# -> bool)

--- a/mbld/clean.myr

+++ b/mbld/clean.myr

@@ -1,11 +1,11 @@

 use std

-use "config.use"

-use "deps.use"

-use "opts.use"

-use "parse.use"

-use "types.use"

-use "util.use"

+use "config"

+use "deps"

+use "opts"

+use "parse"

+use "types"

+use "util"

 pkg bld =

 	const cleanall	: (b : build# -> bool)

--- a/mbld/deps.myr

+++ b/mbld/deps.myr

@@ -2,10 +2,10 @@

 use regex

 use bio

-use "config.use"

-use "opts.use"

-use "types.use"

-use "util.use"

+use "config"

+use "opts"

+use "types"

+use "util"

 pkg bld =

 	const myrdeps	: (b : build#, mt : myrtarg#, doclean : bool, addsrc : bool -> depgraph#)

--- a/mbld/install.myr

+++ b/mbld/install.myr

@@ -1,12 +1,12 @@

 use std

-use "config.use"

-use "deps.use"

-use "opts.use"

-use "parse.use"

-use "types.use"

-use "util.use"

-use "build.use"

+use "config"

+use "deps"

+use "opts"

+use "parse"

+use "types"

+use "util"

+use "build"

 pkg bld =

 	const install	: (p : build#	-> bool)

--- a/mbld/main.myr

+++ b/mbld/main.myr

@@ -1,17 +1,17 @@

 use std

 use regex

-use "build.use"

-use "clean.use"

-use "config.use"

-use "deps.use"

-use "install.use"

-use "opts.use"

-use "parse.use"

-use "test.use"

-use "types.use"

-use "util.use"

-use "syssel.use"

+use "build"

+use "clean"

+use "config"

+use "deps"

+use "install"

+use "opts"

+use "parse"

+use "test"

+use "types"

+use "util"

+use "syssel"

 const main = {args : byte[:][:]

 	var b : bld.build#

--- a/mbld/opts.myr

+++ b/mbld/opts.myr

@@ -1,6 +1,6 @@

 use std

-use "config.use"

+use "config"

 pkg bld =

 	var opt_arch 	: byte[:]

--- a/mbld/parse.myr

+++ b/mbld/parse.myr

@@ -1,9 +1,9 @@

 use std

-use "types.use"

-use "util.use"

-use "opts.use"

-use "syssel.use"

+use "types"

+use "util"

+use "opts"

+use "syssel"

 pkg bld =

 	const load	: (b : build# -> bool)

--- a/mbld/syssel.myr

+++ b/mbld/syssel.myr

@@ -1,7 +1,7 @@

 use std

-use "opts.use"

-use "types.use"

+use "opts"

+use "types"

 pkg bld =

 	type syssel(@a) = struct

--- a/mbld/test.myr

+++ b/mbld/test.myr

@@ -1,14 +1,14 @@

 use std

-use "build.use"

-use "clean.use"

-use "deps.use"

-use "opts.use"

-use "parse.use"

-use "types.use"

-use "util.use"

+use "build"

+use "clean"

+use "deps"

+use "opts"

+use "parse"

+use "types"

+use "util"

-use "config.use"

+use "config"

 pkg bld =

 	const test	: (b : build# -> bool)

--- a/mbld/util.myr

+++ b/mbld/util.myr

@@ -1,7 +1,7 @@

 use std

-use "opts.use"

-use "types.use"

+use "opts"

+use "types"

 pkg bld =

 	const run	: (cmd : byte[:][:] -> bool)

-- 

⑨