Fix typo and update a combinator usage in calendar

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 54741567bb172061c7934b49468ee88ff69a7bad..7a03fe44089323f929f406fd4a0e6001fa6ae35d 100644 (file)
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -348,7 +348,7 @@ M: duration time-
     #! good for any date since October 15, 1582
     [
         dup 2 <= [ [ 1- ] [ 12 + ] bi* ] when
-        [ dup [ 4 /i + ] keep [ 100 /i - ] keep 400 /i + ] dip
+        [ dup [ 4 /i + ] [ 100 /i - ] [ 400 /i + ] tri ] dip
         [ 1+ 3 * 5 /i + ] keep 2 * +
     ] dip 1+ + 7 mod ;
 

diff --git a/basis/math/primes/factors/factors.factor b/basis/math/primes/factors/factors.factor
index 9acc2b58c6bb4982036275f0e06dd957c867f1a9..278bf70b3d28d9c263600e5c6511e89ef79bf003 100644 (file)
--- a/basis/math/primes/factors/factors.factor
+++ b/basis/math/primes/factors/factors.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007-2009 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators kernel make math math.fucntions math.primes sequences ;
+USING: arrays combinators kernel make math math.functions math.primes sequences ;
 IN: math.primes.factors
 
 <PRIVATE