Author: Remi Meier <meier...@student.ethz.ch>
Branch:
Changeset: r394:19e89845f0a0
Date: 2013-07-11 17:36 +0200
http://bitbucket.org/pypy/stmgc/changeset/19e89845f0a0/
Log: merge
diff --git a/duhton/glob.c b/duhton/glob.c
--- a/duhton/glob.c
+++ b/duhton/glob.c
@@ -199,7 +199,7 @@
DuObject *du_div(DuObject *cons, DuObject *locals)
{
int result = 0;
- int first = 1;
+ int first = 1;
while (cons != Du_None) {
_du_read1(cons);
@@ -208,12 +208,12 @@
_du_save2(next, locals);
DuObject *obj = Du_Eval(expr, locals);
- if (first) {
- result = DuInt_AsInt(obj);
- first = 0;
- } else {
- result /= DuInt_AsInt(obj);
- }
+ if (first) {
+ result = DuInt_AsInt(obj);
+ first = 0;
+ } else {
+ result /= DuInt_AsInt(obj);
+ }
_du_restore2(next, locals);
cons = next;
@@ -612,8 +612,8 @@
void Du_Initialize(int num_threads)
{
stm_initialize();
- all_threads_count = num_threads;
- all_threads = (pthread_t*)malloc(sizeof(pthread_t) * num_threads);
+ all_threads_count = num_threads;
+ all_threads = (pthread_t*)malloc(sizeof(pthread_t) * num_threads);
DuFrame_SetBuiltinMacro(Du_Globals, "progn", Du_Progn);
DuFrame_SetBuiltinMacro(Du_Globals, "setq", du_setq);
@@ -621,7 +621,7 @@
DuFrame_SetBuiltinMacro(Du_Globals, "+", du_add);
DuFrame_SetBuiltinMacro(Du_Globals, "-", du_sub);
DuFrame_SetBuiltinMacro(Du_Globals, "*", du_mul);
- DuFrame_SetBuiltinMacro(Du_Globals, "/", du_div);
+ DuFrame_SetBuiltinMacro(Du_Globals, "/", du_div);
DuFrame_SetBuiltinMacro(Du_Globals, "<", du_lt);
DuFrame_SetBuiltinMacro(Du_Globals, "<=", du_le);
DuFrame_SetBuiltinMacro(Du_Globals, "==", du_eq);
@@ -642,12 +642,12 @@
DuFrame_SetBuiltinMacro(Du_Globals, "defun", du_defun);
DuFrame_SetBuiltinMacro(Du_Globals, "car", du_car);
DuFrame_SetBuiltinMacro(Du_Globals, "cdr", du_cdr);
- DuFrame_SetBuiltinMacro(Du_Globals, "cons", du_cons);
+ DuFrame_SetBuiltinMacro(Du_Globals, "cons", du_cons);
DuFrame_SetBuiltinMacro(Du_Globals, "not", du_not);
DuFrame_SetBuiltinMacro(Du_Globals, "transaction", du_transaction);
DuFrame_SetBuiltinMacro(Du_Globals, "sleepms", du_sleepms);
DuFrame_SetBuiltinMacro(Du_Globals, "defined?", du_defined);
- DuFrame_SetBuiltinMacro(Du_Globals, "pair?", du_pair);
+ DuFrame_SetBuiltinMacro(Du_Globals, "pair?", du_pair);
DuFrame_SetBuiltinMacro(Du_Globals, "assert", du_assert);
DuFrame_SetSymbolStr(Du_Globals, "None", Du_None);
}
diff --git a/duhton/test/test_cons.py b/duhton/test/test_cons.py
--- a/duhton/test/test_cons.py
+++ b/duhton/test/test_cons.py
@@ -10,6 +10,8 @@
def test_pair():
assert run("(print (pair? 1))") == "0\n"
assert run("(print (pair? (cons 1 2)))") == "1\n"
+ assert run("(setq x (cons 1 2)) (print (pair? x))") == "1\n"
+ assert run("(setq x 42) (print (pair? x))") == "0\n"
def test_car_cdr():
assert run("(print (car (quote (2 3))))") == "2\n"
diff --git a/duhton/test/test_int.py b/duhton/test/test_int.py
--- a/duhton/test/test_int.py
+++ b/duhton/test/test_int.py
@@ -20,6 +20,10 @@
assert evaluate("(* 2 3 7)") == 42
assert evaluate("(* (+ 5 1) (+ 6 1))") == 42
+def test_div():
+ assert evaluate("(/ 11 2)") == 5
+ assert evaluate("(/ 29 2 3)") == 4
+
def test_cmp():
assert evaluate("(< 6 6)") == 0
assert evaluate("(<= 6 6)") == 1
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
