From 99771eb689c28a0afe306131145fe693c2357c9c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Mar 2010 13:14:26 -0400 Subject: [PATCH] bootstrap.compiler: fix joint dependencies declared here --- basis/bootstrap/compiler/compiler.factor | 7 ++----- basis/stack-checker/errors/errors.factor | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor index 393e4eab27..0237ed99ee 100644 --- a/basis/bootstrap/compiler/compiler.factor +++ b/basis/bootstrap/compiler/compiler.factor @@ -20,11 +20,8 @@ IN: bootstrap.compiler "alien.remote-control" require ] unless -{ - "stack-checker.errors.prettyprint" - "alien.prettyprint" - "alien.debugger" -} [ "prettyprint" swap require-when ] each +"prettyprint" "alien.prettyprint" require-when +"debugger" "alien.debugger" require-when "cpu." cpu name>> append require diff --git a/basis/stack-checker/errors/errors.factor b/basis/stack-checker/errors/errors.factor index 58ce20035c..5eca37ffbe 100644 --- a/basis/stack-checker/errors/errors.factor +++ b/basis/stack-checker/errors/errors.factor @@ -1,5 +1,6 @@ -! Copyright (C) 2006, 2009 Slava Pestov. +! Copyright (C) 2006, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. +USING: vocabs.loader ; IN: stack-checker.errors TUPLE: inference-error ; @@ -34,3 +35,4 @@ ERROR: bad-declaration-error < inference-error declaration ; ERROR: unbalanced-branches-error < inference-error word quots declareds actuals ; +"debugger" "stack-checker.errors.prettyprint" require-when