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

diff --cc basis/compiler/cfg/representations/preferred/preferred.factor
Simple merge

diff --cc basis/compiler/cfg/representations/representations.factor
Simple merge

diff --cc basis/compiler/cfg/rpo/rpo.factor
Simple merge

diff --cc basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
Simple merge

diff --cc basis/compiler/tree/recursive/recursive.factor
Simple merge

diff --cc basis/farkup/farkup.factor
Simple merge

diff --cc basis/furnace/auth/auth.factor
index 29ab04fe1bfe51f543058b7ad89d01d9cabc9ca8,e7f868759f3ea2b3e7d8ad144b43a779dad3c836..2acb09919d8aa2a0fd35a3d8a154a7e315dab5bb
--- 1/basis/furnace/auth/auth.factor
--- 2/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@@ -14,7 -14,7 +14,8 @@@ furnace.redirectio
  furnace.boilerplate\r
  furnace.auth.providers\r
  furnace.auth.providers.db ;\r
 +FROM: assocs => change-at ;\r
+ FROM: namespaces => set ;\r
  IN: furnace.auth\r
  \r
  SYMBOL: logged-in-user\r

diff --cc basis/help/lint/checks/checks.factor
index 85fa50f2b9638474a5b9ac21224d154344a5e9af,47e171422981bc62e3cf74f57c36ab9ddc5cf6ec..87b44595d27e9d10db7108a13153754f158ae2d2
--- 1/basis/help/lint/checks/checks.factor
--- 2/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/regexp/minimize/minimize.factor
Simple merge

diff --cc basis/stack-checker/backend/backend.factor
index 1e7ae5a9f3a98805ee33e1946a6e7d2039e5124e,ddb1fd0021b75d878dc74fa03d3dd3efff78e72f..51b5f0cdaf6cf58d1294727c17df26534d36f7b7
--- 1/basis/stack-checker/backend/backend.factor
--- 2/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 ;

diff --cc basis/stack-checker/dependencies/dependencies.factor
Simple merge

diff --cc basis/stack-checker/transforms/transforms.factor
Simple merge

diff --cc core/combinators/combinators.factor
Simple merge

diff --cc extra/mason/test/test.factor
Simple merge