ref: bd225cf9a9ec5a2d3bd35c067d011729d8fb9ae0
parent: aa419bde150ce4827ec127288876ce2d0a191629
author: Ori Bernstein <ori@eigenstate.org>
date: Wed Jul 1 17:36:02 EDT 2015
Add format funcs.
--- a/libstd/bigint.myr
+++ b/libstd/bigint.myr
@@ -27,7 +27,6 @@
const bigmove : (d : bigint#, s : bigint# -> bigint#)
const bigparse : (s : byte[:] -> option(bigint#))
const bigclear : (a : bigint# -> bigint#)
- const bigfmt : (a : bigint#, base : int -> byte[:])
const bigbfmt : (b : byte[:], a : bigint#, base : int -> size)
/*
const bigtoint : (a : bigint# -> @a::(numeric,integral))
@@ -115,25 +114,6 @@
v.sign = 0
v.dig = [][:]
-> v
-}
-
-const bigfmt = {a, base- var buf
- var n
-
- /*
- allocate a buffer guaranteed to be big enough.
- that's
- 2 + floor(nbits/(log_2(10)))
- or
- 2 + a.dig.len * 32/3.32...
- or
- 2 + a.dig.len * 10
- plus one for the - sign.
- */
- buf = slalloc(3 + a.dig.len * 10)
- n = bigbfmt(buf, a, base)
- -> buf[:n]
}
/* for now, just dump out something for debugging... */
--- a/libstd/bld.sub
+++ b/libstd/bld.sub
@@ -40,6 +40,7 @@
fltbits.myr
fltfmt.myr
fmt.myr
+ fmtfuncs.myr
getcwd.myr
getint.myr
hashfuncs.myr
--- /dev/null
+++ b/libstd/fmtfuncs.myr
@@ -1,0 +1,54 @@
+use "alloc.use"
+use "bigint.use"
+use "bitset.use"
+use "fmt.use"
+use "introspect.use"
+use "strbuf.use"
+use "varargs.use"
+
+pkg std =
+;;
+
+const __init__ = {+ var bigint : bigint#
+ var bitset : bitset#
+
+ fmtinstall(typeof(bigint), bigfmt, [][:])
+ fmtinstall(typeof(bitset), bsfmt, [][:])
+}
+
+const bigfmt = {sb, ap, opts+ var a, n, buf
+
+ a = vanext(ap)
+ /*
+ allocate a buffer guaranteed to be big enough.
+ that's
+ 2 + floor(nbits/(log_2(10)))
+ or
+ 2 + a.dig.len * 32/3.32...
+ or
+ 2 + a.dig.len * 10
+ plus one for the - sign.
+ */
+ buf = slalloc(3 + a.dig.len * 10)
+ n = bigbfmt(buf, a, 10)
+ sbputs(sb, buf[:n])
+ slfree(buf)
+}
+
+const bsfmt = {sb, ap, opts+ var i, bs
+
+ bs = vanext(ap)
+ sbputs(sb, "bitset{")+ for i = 0; i < bsmax(bs); i++
+ if bshas(bs, i)
+ if i != 0
+ sbfmt(sb, ", ")
+ ;;
+ sbfmt(sb, "{}", i)+ ;;
+ ;;
+ sbputs(sb, "}")
+}