define renamed to def, defun renamed to defn

stdlib/ut.lsp

@@ -1,23 +1,23 @@
 (include "/usr/local/var/mlisp/terminal.lsp")
 
-(defun ut::assert-equal (expected form) (do 
-		(define returned (eval form))
+(defn ut::assert-equal (expected form) (do 
+		(def returned (eval form))
 		(if (= expected returned)
 			(list #t expected returned)
 			(list nil expected returned))
 	))
 
-(defun ut::assert-true (test) (ut::assert-equal #t test))
-(defun ut::assert-false (test) (ut::assert-equal nil test))
-(defun ut::assert-nil (test) (ut::assert-false test))
+(defn ut::assert-true (test) (ut::assert-equal #t test))
+(defn ut::assert-false (test) (ut::assert-equal nil test))
+(defn ut::assert-nil (test) (ut::assert-false test))
 
 
-(defun ut::define-test (name exp_list)
+(defn ut::define-test (name exp_list)
     (set! ut::tests_list (push ut::tests_list (list name exp_list)))) 
 
 
-(defun ut::exec-test (test_name code) (do
-		(define test_result (eval code)) 
+(defn ut::exec-test (test_name code) (do
+		(def test_result (eval code)) 
 		(if (first test_result) 
 				(do (print (+ (term-green "OK") "  -> " test_name))
 					#t
@@ -28,15 +28,15 @@
 				))
 ))
 
-(defun ut::run-test (name)
+(defn ut::run-test (name)
 		(for t ut::tests_list
 			(if (= (first t) name)
 				(ut::exec-test (first t) (second t)))
 		))
 
-(defun ut::run-tests () (do 
-		(define oks 0)
-		(define errs 0)
+(defn ut::run-tests () (do 
+		(def oks 0)
+		(def errs 0)
 		(for t ut::tests_list
 			(if (ut::exec-test (first t) (second t))
 				(set! oks (+ oks 1))	
@@ -48,7 +48,7 @@
 			(print (term-red (+ (string errs) " test(s) FAILED"))))
 		))
 
-(define ut::tests_list '())
+(def ut::tests_list '())
 
 
 ;; example of usage