Defining 'begin' as a macro in lisp tests and fixing indentation

extra/lisp/lisp-tests.factor

@@ -30,12 +30,10 @@ IN: lisp.test
     "(lambda (&rest xs) xs)" lisp-string>factor "list" lisp-define
         
     { 5 } [
-      ! [ 2 3 ] "+" <lisp-symbol> funcall
         "(+ 2 3)" lisp-eval
     ] unit-test
     
     { 8.3 } [
-     ! [ 10.4 2.1 ] "-" <lisp-symbol> funcall
         "(- 10.4 2.1)" lisp-eval
     ] unit-test
     
@@ -55,8 +53,8 @@ IN: lisp.test
         "(cond ((< 1 2) \"b\") (#t \"a\"))" lisp-eval
     ] unit-test
         
-    { 5 } [
-      "(begin (+ 1 4))" lisp-eval
+    { +nil+ } [
+        "(list)" lisp-eval
     ] unit-test
     
     { { 1 2 3 4 5 } } [
@@ -67,6 +65,18 @@ IN: lisp.test
         "(list 1 2 (list 3 (list 4) 5))" lisp-eval cons>seq
     ] unit-test
 
+    { T{ lisp-symbol f "begin" } } [
+        "(defmacro begin (&rest body) (list (list (quote lambda) (list) body)))" lisp-eval
+    ] unit-test
+    
+    { t } [
+        T{ lisp-symbol f "begin" } lisp-macro?
+    ] unit-test
+    
+    { 5 } [
+        "(begin (+ 1 4))" lisp-eval
+    ] unit-test
+    
     { T{ lisp-symbol f "if" } } [
         "(defmacro if (pred tr fl) (list (quote cond) (list pred tr) (list #t fl)))" lisp-eval
     ] unit-test
@@ -80,7 +90,7 @@ IN: lisp.test
     ] unit-test
     
     { 3 } [
-       "((lambda (x) (if x (begin (+ 1 2)) (- 3 5))) #t)" lisp-eval
+        "((lambda (x) (if x (+ 1 2) (- 3 5))) #t)" lisp-eval
     ] unit-test
     
 ] with-interactive-vocabs