Changeset 11648 for lang/c

Timestamp:

05/15/08 23:21:29 (6 months ago)

Author:

mokehehe

Message:

allow compound lambda' body

Location:

lang/c/misc/mlisp

Files:

• core/c_compiler.cpp (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

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

@@ -260 +260 @@
 }
 
-SExp compile_block(SExp sexps, SExp e, SExp next) {
-        return nil;
+SExp compile_block(SExp sexps, SExp e, SExp s, SExp next) {
+        SExp d = cdr(sexps);
+        SExp nx = nilp(d) ? next : compile_block(d, e, s, next);
+        return compile(car(sexps), e, s, nx);
 }
 
@@ -283 +285 @@
                 } else if (eq(op, intern("lambda"))) {
                         SExp vars = cadr(x);
-                        SExp body = caddr(x);
+                        SExp body = cddr(x);
                         SExp non_local = find_free(body, vars);
                         SExp free = filter_member(append2(car(e), cdr(e)), non_local);
                         SExp sets = find_sets(body, vars);
 
-                        SExp boxes = make_boxes(sets, vars, compile(body, cons(vars, free), set_union(sets, set_intersect(s, free)), list(1, RETURN)));
+                        SExp boxes = make_boxes(sets, vars, compile_block(body, cons(vars, free), set_union(sets, set_intersect(s, free)), list(1, RETURN)));
                         return collect_free(free, e, list(4, CLOSE, int2s(length(free)), boxes, next));
                 } else if (eq(op, intern("if"))) {

lang/c/misc/mlisp/readme.txt

@@ -44 +44 @@
 
 * ToDo
--[v] �X�^�b�N�x�[�X�ɒu��������-[v] �C�ӌ‚̈��󂯎�
+-[v] �X�^�b�N�x�[�X�ɒu��������-[x] �C�ӌ‚̈��󂯎�
 -[x] �}�N�����
 --[x] macroexpand ��- C �������[�o���̊֐���яo�������ɂ���- �unil�v�ut�v���V���{���Ȃ̂ŁA�R���p�C�������V���{���Q�ƂɂȂ�Ă��܂�
@@ -62 +62 @@
 
 * �o�O
-
-
+- eval ����ƃX�^�b�N���󂳂��A�l�����������Ȃ�