Changeset 2434

Timestamp:

12/04/07 22:42:46 (5 years ago)

Author:

mokehehe

Message:

 

Location:

lang/c/misc/mlisp

Files:

• lib.l (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• src/mlisp.h (modified) (1 diff)
• test.l (modified) (1 diff)

lang/c/misc/mlisp/lib.l

@@ -1 +1 @@
 
 (setq list
-          (lambda (nil . rest)
-                rest))
+      (lambda (nil . rest)
+        rest))
 
 (defmacro defun (fname arg body)
   (list 'setq fname
-                (list 'lambda arg body)))
+        (list 'lambda arg body)))
 
 (defun funcall (fn . x)
@@ -29 +29 @@
 (defmacro all (x)
   (cond ((null x) t)
-                ((car x) (list all (cdr x)))
-                (t nil)))
+        ((car x) (list all (cdr x)))
+        (t nil)))
 
 ; ���₵��
 (defmacro any (x)
   (cond ((null x) nil)
-                ((car x) t)
-                (t (list any (cdr x)))))
+        ((car x) t)
+        (t (list any (cdr x)))))
 
 (defun length (ls)
   (cond ((null ls) 0)
-                (t (+ 1 (length (cdr ls))))))
+        (t (+ 1 (length (cdr ls))))))
 
 (defun mapcar (fn ls)
   (cond ((eq ls nil) nil)
-                (t (cons (fn (car ls))
-                                 (mapcar fn (cdr ls))))))
+        (t (cons (fn (car ls))
+                 (mapcar fn (cdr ls))))))
 
 
+(defun zerop (x) (eq x 0))
 (defun evenp (x) (eq (% x 2) 0))
 (defun oddp  (x) (eq (% x 2) 1))
@@ -57 +58 @@
 ; �Q�‚̃��X�g�������(defun concat (x y)
   (cond ((null x) y)
-                (t (cons (car x)
-                                 (concat (cdr x) y)))))
+        (t (cons (car x)
+                 (concat (cdr x) y)))))
 
 ; �C�ӌ‚̃��X�g�������(defun append (nil . x)
-  (cond ((cdr x)
-                 (concat (car x)
-                                 (apply append (cdr x))))
-                (t (car x))))
+  (cond ((cdr x) (concat (car x)
+                         (apply append (cdr x))))
+        (t (car x))))
 
 
@@ -77 +77 @@
 ;(defmacro if (p tbody ebody)
 ;  (cond (p tbody)
-;               (t ebody)))
+;        (t ebody)))
 
 (defmacro if (test then else)
   (cons cond (cons (list test then)
-                                   (cond (else (list (list t else)))))))
+                   (cond (else (list (list t else)))))))
 

lang/c/misc/mlisp/readme.txt

@@ -44 +44 @@
 - �_�C�i�~�b�N�X�R�[�v
 - �K�x�R���Ȃ�
+- �C���^�v���^
 
 

lang/c/misc/mlisp/src/mlisp.h

@@ -84 +84 @@
 
 /// macros
-#define SEXP_IS_INT(a)          (((a) & 1) == 1)
+#define SEXP_IS_INT(a)          (((a) & 1) != 0)
 #define SEXP_TYPE(a)            ((a) & ~VAL_MASK)
 #define SEXP_CONSP(a)           (SEXP_TYPE(a) == tCell)

lang/c/misc/mlisp/test.l

@@ -2 +2 @@
 (defun concat (x y)
   (cond ((null x) y)
-                (t (cons (car x)
-                                 (concat (cdr x) y)))))
+        (t (cons (car x)
+                 (concat (cdr x) y)))))
 
 (defun append (nil . x)
   (cond ((cdr x)
-                 (concat (car x)
-                                 (apply append (cdr x))))
-                (t (car x))))
+         (concat (car x)
+                 (apply append (cdr x))))
+        (t (car x))))