X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=test.lisp;h=20edcbfcf14c3dc40153e9c35388c529532ec5ea;hb=3845c1fa84a7ac80aa6e686512b055d37496764d;hp=a38014b178d2bf9175211d10a51c8e5bc8bbdd1a;hpb=0188e1908fdc55a98c0ebb99f3a95e2787dd7c5d;p=jscl.git

diff --git a/test.lisp b/test.lisp
index a38014b..20edcbf 100644
--- a/test.lisp
+++ b/test.lisp
@@ -1,70 +1,61 @@
-(lambda (x y) x)
-
-(debug "hola")
-(debug '(1 2 3 4))
-(debug (if 2 (+ 2 1) 0))
-(debug (= (+ 2 1) (- 4 1)))
-
-;;; Variables
-(debug "---VARIABLES---")
-(eval-when-compile
-  (%compile-defvar 'name))
-(setq name 10)
-(debug name)
-
-;;; Functions
-(debug "---FUNCTIONS---")
-(eval-when-compile
-  (%compile-defun 'f))
-(fsetq f (lambda (x) (+ x 10)))
-(debug (f 20))
-
-;;; Macros
-(debug "---MACROS---")
+;;; Library
 
 (eval-when-compile
   (%compile-defmacro 'defmacro
-                     (lambda (name args &rest body)
-                       (list 'eval-when-compile
-                             (list '%compile-defmacro (list 'quote name)
-                                   (list* 'lambda args body))))))
-
-(defmacro incf (x)
-  (list 'setq x (list '+ 1 x)))
-
-(eval-when-compile
-  (%compile-defvar 'x))
-
-(setq x 10)
-(incf x)
-(debug x)
-
-;;; Conses
-(debug (cons 1 2))
-(debug (car (cons 1 2)))
-(debug (cdr (cons 1 2)))
-
-(setq x '(1 . 2))
-(debug x)
-(debug (eq x x))
-(debug (eq '(1 . 2) '(1 . 2)))
-
-;;; Symbols
-(debug (symbol-name 'foo))
-(debug (symbol-name 'foo-bar))
-
-
-;;; &rest lambda-list
-
-(debug (lambda (&rest x) x))
-(debug (lambda (x y &rest z) z))
-(debug (lambda (x y &rest z) x))
-
-;; (debug (foo))
-
-;; (eval-when-compile
-;;   (%compile-defmacro 'defun
-;; 		     (lambda (name args &rest body)
-;; 		       (list 'eval-when-compile
-;; 			     (list 'compile-defun)
-;; 			     (list 'fsetq (list 'lambda args (list 'progn body)))))))
+     (lambda (name args &rest body)
+       `(eval-when-compile
+          (%compile-defmacro ',name (lambda ,args ,@body))))))
+
+(defmacro defvar (name value)
+  `(progn
+     (eval-when-compile
+       (%compile-defvar ',name))
+     (setq ,name ,value)))
+
+(defmacro defun (name args &rest body)
+  `(progn
+     (eval-when-compile
+       (%compile-defun ',name))
+     (fsetq ,name (lambda ,args ,@body))))
+
+(defun = (x y) (= x y))
+(defun + (x y) (+ x y))
+(defun - (x y) (- x y))
+(defun * (x y) (* x y))
+(defun / (x y) (/ x y))
+(defun 1+ (x) (+ x 1))
+(defun 1- (x) (- x 1))
+(defun cons (x y ) (cons x y))
+(defun car (x) (car x))
+(defun cdr (x) (cdr x))
+
+(defun append (list1 list2)
+  (if (null list1)
+      list2
+      (cons (car list1)
+            (append (cdr list1) list2))))
+
+(defun reverse-aux (list acc)
+  (if (null list)
+      acc
+      (reverse-aux (cdr list) (cons (car list) acc))))
+
+(defun reverse (list)
+  (reverse-aux list '()))
+
+(defun mapcar (func list)
+  (if (null list)
+      '()
+      (cons (funcall func (car list))
+            (mapcar func (cdr list)))))
+
+(defmacro push (x place)
+  `(setq ,place (cons ,x ,place)))
+
+(defvar *package* (new))
+
+(defun intern (name)
+  (set *package* name (make-symbol name)))
+
+(defun find-symbol (name)
+  (get *package* name))