Changeset 12366 for lang/c

Timestamp:

05/25/08 23:37:08 (6 months ago)

Author:

mokehehe

Message:

Fix a bug about 'find-free'.

Location:

lang/c/misc/mlisp

Files:

• core/c_compiler.cpp (modified) (2 diffs)
• core/v_vm.h (modified) (1 diff)
• proto/stackbased.scm (modified) (2 diffs)

lang/c/misc/mlisp/core/c_compiler.cpp

@@ -193 +193 @@
 static SExp find_free(SExp x, SExp b);
 
-static SExp find_free_compound(SExp body, SExp free) {
-        for (SExp p = body; !nilp(p); p = cdr(p)) {
+static SExp find_free_compound(SExp xs, SExp b) {
+        SExp r = nil;
+        for (SExp p = xs; !nilp(p); p = cdr(p)) {
                 SExp x = car(p);
-                free = find_free(x, free);
-        }
-        return free;
+                r = set_union(find_free(x, b), r);
+        }
+        return r;
 }
 
@@ -241 +242 @@
                         return find_free_compound(body, b);
                 } else {
-                        SExp r = nil;
-                        for (;; x = cdr(x)) {
-                                if (nilp(x))    break;
-                                r = set_union(find_free(car(x), b), r);
-                        }
-                        return r;
+                        return find_free_compound(x, b);
                 }
         } else {

lang/c/misc/mlisp/core/v_vm.h

@@ -1 @@
-//=============================================================================
 /// �o�[�`�����}�V��
 //=============================================================================

lang/c/misc/mlisp/proto/stackbased.scm

@@ -295 +295 @@
   (lambda (x b)
     (define (find-free-compound xs b)
-      (fold (lambda (x r) (find-free x r))
-            b
+      (fold (lambda (x r) (set-union (find-free x b) r))
+            '()
             xs))
     (cond
@@ -319 +319 @@
                        (find-free-compound body b)))
                    (else
-                    (recur next ((x x))
-                           (if (null? x)
-                               '()
-                             (set-union (find-free (car x) b)
-                                        (next (cdr x))))))))
+                    (find-free-compound x b))))
      (else '()))))