From 04a70da513d1da2ac81291307d1efe19b341cc47 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Fri, 8 May 2009 17:41:22 -0500
Subject: [PATCH 1/2] Fix compile error in cpu-ppc.hpp
---
vm/cpu-ppc.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vm/cpu-ppc.hpp b/vm/cpu-ppc.hpp
index b256b01c8b..6ae2cce27d 100755
--- a/vm/cpu-ppc.hpp
+++ b/vm/cpu-ppc.hpp
@@ -35,7 +35,7 @@ inline static void *get_call_target(cell return_address)
check_call_site(return_address);
cell insn = *(cell *)return_address;
- cell unsigned_addr = (insn & B_MASK);
+ cell unsigned_addr = (insn & b_mask);
fixnum signed_addr = (fixnum)(unsigned_addr << 6) >> 6;
return (void *)(signed_addr + return_address);
}
@@ -48,7 +48,7 @@ inline static void set_call_target(cell return_address, void *target)
cell insn = *(cell *)return_address;
fixnum relative_address = ((cell)target - return_address);
- insn = ((insn & ~B_MASK) | (relative_address & B_MASK));
+ insn = ((insn & ~b_mask) | (relative_address & b_mask));
*(cell *)return_address = insn;
/* Flush the cache line containing the call we just patched */
From ea85f298d18fe3d4c7d42624effcedc40eec539e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 8 May 2009 18:00:53 -0500
Subject: [PATCH 2/2] math.combinatorics: fix unit test and help lint
---
basis/math/combinatorics/combinatorics-docs.factor | 2 +-
basis/math/combinatorics/combinatorics-tests.factor | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/basis/math/combinatorics/combinatorics-docs.factor b/basis/math/combinatorics/combinatorics-docs.factor
index 7f40969b95..041539c981 100644
--- a/basis/math/combinatorics/combinatorics-docs.factor
+++ b/basis/math/combinatorics/combinatorics-docs.factor
@@ -64,7 +64,7 @@ HELP: combination
{ $description "Outputs the " { $snippet "mth" } " lexicographical combination of " { $snippet "seq" } " choosing " { $snippet "k" } " elements." }
{ $notes "Combinations are 0-based and a bounds error will be thrown if " { $snippet "m" } " is larger than " { $snippet "seq length k nCk" } "." }
{ $examples
- { $example "USING: math.combinatorics prettyprint ;"
+ { $example "USING: math.combinatorics sequences prettyprint ;"
"6 7 iota 4 combination ." "{ 0 1 3 6 }" }
{ $example "USING: math.combinatorics prettyprint ;"
"0 { \"a\" \"b\" \"c\" \"d\" } 2 combination ." "{ \"a\" \"b\" }" }
diff --git a/basis/math/combinatorics/combinatorics-tests.factor b/basis/math/combinatorics/combinatorics-tests.factor
index 1bc4bbc825..ca6ec9cb53 100644
--- a/basis/math/combinatorics/combinatorics-tests.factor
+++ b/basis/math/combinatorics/combinatorics-tests.factor
@@ -1,4 +1,4 @@
-USING: math.combinatorics math.combinatorics.private tools.test ;
+USING: math.combinatorics math.combinatorics.private tools.test sequences ;
IN: math.combinatorics.tests
[ 1 ] [ 0 factorial ] unit-test