fix bug in prelude

UData.hs

@@ -43,7 +43,7 @@ showBCompType BNEq = "/="
 
 applyBVal :: BValue -> BValue -> BResult
 applyBVal (BFuncVal b) (BNumVal v) = applyBFunc b v
-applyBVal (BFuncVal b) _ = BException ("cannot apply non-numeric argument to builtin function "++(show b))
+applyBVal (BFuncVal b) _ = BException ("cannot apply built-in function "++(showBFunc b)++" on non-numeric value")
 applyBVal (BIntList args) (BNumVal (BInt v)) = BClean (BIntList (v:args))
 applyBVal (BIntList args) _ = BException "cannot append non-integer number in IntList"
 applyBVal _ _ = BException "cannot use numeric value as function"

URunTime.hs

@@ -110,7 +110,7 @@ applyFunc ((VBuiltin a),ca) br = case a of
 	_ -> case br of
 		(VException e) -> VException e
 		(VGood (VBuiltin b,_)) -> bValToVResult (applyBVal  a b)
-		(VGood x) -> VException ("cannot feed non-builtin value to builtin value "++(showBValue a))
+		(VGood x) -> VException ("cannot apply built-in function "++(showBValue a)++" on non-numeric value")
 	where
 		bValToVResult (BException e) = VException e
 		bValToVResult (BClean v) = VGood (VBuiltin v,emptyContext)

aplusb.u

@@ -1,8 +1,8 @@
 (import* io)
 (import* str)
 (run
-	(a readInt)
-	(b readInt)
-	(_ (putStrLn (itoa (+ a b))))
+	(line readLine)
+	(let s (sum (map atoi (splitStr ' ' (rstrip line)))))
+	(_ (putStrLn (itoa s)))
 	(exit 0)
 )

io.u

@@ -37,6 +37,15 @@
 	)
 ))
 (def readInt (readIntF 0))
+(def readLineF (\handle
+	(do
+		(body (readWhileF handle (/= '\n')))
+		(trail (readIfF handle(= '\n')))
+		(let body_t (trail body (\x (++ body (cons x empty)))))
+		(return body_t)
+	)
+))
+(def readLine (readLineF 0))
 
 ; getArg
 (let getArgStr (recur (\f (do

prelude.u

@@ -12,7 +12,7 @@
 (def True (\x y x))
 (def False (\x y y))
 (def if id)
-(def not (\x False True))
+(def not (\x (x False True)))
 (def and (\x y (x y False)))
 (def or (\x y (x True y)))
 
@@ -24,6 +24,7 @@
 ; the List protocol:   (l null_value (\head tail list_value))
 (def cons (\x xs f g (g x xs)))
 (def empty fst)
+(def null (\x (x True (\_ _ False))))
 (def foldr (\f x0 (recur (\g (\l
 	(l x0 (\x xs
 		(f x (g xs))
@@ -42,7 +43,9 @@
 	))))
 ))
 (def ++ (\a b (foldr (\x y (cons x y)) b a)))
-(def join (\sep (foldr1 (\x y (++ x (++ sep y))) id "")))
+(def join (\sep (foldr1 (\x y (++ x (++ sep y))) id empty)))
+(def sum (foldl + 0))
+(def map (\f (foldr (\h r (cons (f h) r)) empty)))
 
 ; the Maybe protocol:  (m nothing_value (\v just_value))
 (def nothing fst)

str.u

@@ -26,4 +26,5 @@
 		)
 	) empty s)
 )))
+(def rstrip (foldr (\a r (or (not (isSpace a)) (not (null r)) (cons a r) r)) empty))
 

test.u

@@ -1,6 +1,8 @@
 (import* str)
 (import* io)
 (run
+	;(line readLine)
+	;(_ (putStrLn line))
 	;(r (system "ls -l"))
 	;(_ (putStrLn (itoa r)))