From: Daniel Ehrenberg <littledan@Macintosh-122.local>
Date: Tue, 16 Mar 2010 17:28:00 +0000 (-0400)
Subject: Merge branch 'bags' of git://github.com/littledan/Factor
X-Git-Tag: 0.97~4743
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=512fe14e4eb3730d84ce501f7221de09fc2890f2

Merge branch 'bags' of git://github.com/littledan/Factor

Conflicts:

	basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
	basis/furnace/auth/auth.factor
	basis/stack-checker/backend/backend.factor
---

512fe14e4eb3730d84ce501f7221de09fc2890f2
diff --cc basis/furnace/auth/auth.factor
index 29ab04fe1b,e7f868759f..2acb09919d
--- a/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@@ -14,7 -14,7 +14,8 @@@ furnace.redirectio
  furnace.boilerplate
  furnace.auth.providers
  furnace.auth.providers.db ;
 +FROM: assocs => change-at ;
+ FROM: namespaces => set ;
  IN: furnace.auth
  
  SYMBOL: logged-in-user
diff --cc basis/help/lint/checks/checks.factor
index 85fa50f2b9,47e1714229..87b44595d2
--- a/basis/help/lint/checks/checks.factor
+++ b/basis/help/lint/checks/checks.factor
@@@ -48,15 -40,8 +49,15 @@@ SYMBOL: vocab-article
  : effect-values ( word -- seq )
      stack-effect
      [ in>> ] [ out>> ] bi append
-     [ dup pair? [ first ] when effect>string ] map prune ;
+     [ dup pair? [ first ] when effect>string ] map members ;
  
 +: effect-effects ( word -- seq )
 +    stack-effect in>> [
 +        dup pair?
 +        [ second dup effect? [ effect>string ] [ drop f ] if ]
 +        [ drop f ] if
 +    ] map ;
 +
  : contains-funky-elements? ( element -- ? )
      {
          $shuffle
diff --cc basis/stack-checker/backend/backend.factor
index 1e7ae5a9f3,ddb1fd0021..51b5f0cdaf
--- a/basis/stack-checker/backend/backend.factor
+++ b/basis/stack-checker/backend/backend.factor
@@@ -3,10 -3,10 +3,11 @@@
  USING: fry arrays generic io io.streams.string kernel math namespaces
  parser sequences strings vectors words quotations effects classes
  continuations assocs combinators compiler.errors accessors math.order
 -definitions sets hints macros stack-checker.state
 +definitions locals sets hints macros stack-checker.state
  stack-checker.visitor stack-checker.errors stack-checker.values
  stack-checker.recursive-state stack-checker.dependencies summary ;
 +FROM: sequences.private => from-end ;
+ FROM: namespaces => set ;
  IN: stack-checker.backend
  
  : push-d ( obj -- ) meta-d push ;