Shuffle things around so that it works with the chartype commit.

1 files changed, 1 insertions, 17 deletions

diff --git a/libstd/intparse.myr b/libstd/intparse.myr
index 9739cab..991a336 100644
--- a/libstd/intparse.myr
+++ b/libstd/intparse.myr
@@ -1,3 +1,4 @@
+use "chartype.use"
 use "die.use"
 use "fmt.use"
 use "hasprefix.use"
@@ -64,20 +65,3 @@ generic doparse = {s, isneg, base
 		-> `Some v
 	;;
 }
-
-generic charval = {c, base
-	var v = -1
-
-	if c >= '0' && c <= '9'
-		v =  (c - '0') castto(@a::(tcint,tcnum,tctest))
-	elif c >= 'a' && c <= 'z'
-		v =  (c - 'a' + 10) castto(@a::(tcint,tcnum,tctest))
-	elif c >= 'A' && c <= 'Z'
-		v =  (c - 'A' + 10) castto(@a::(tcint,tcnum,tctest))
-	;;
-
-	if v < 0 || v > (base castto(@a::(tcint,tcnum,tctest)))
-		-> -1
-	;;
-	-> v
-}