Merge branch 'master' of git://factorcode.org/git/factor

diff --combined basis/functors/functors.factor
index e89592405688eee8ad2fd0a66fddf4dffdbd1888,b7dab0d6af45e7f8965684d981b5430e01529652..ccd1e9618ed7bed74f27db197db62cd9bbf7b21b
--- 1/basis/functors/functors.factor
--- 2/basis/functors/functors.factor
+++ b/basis/functors/functors.factor
@@@ -4,8 -4,8 +4,8 @@@ USING: accessors arrays classes.mixin c
  classes.tuple classes.tuple.parser combinators effects
  effects.parser fry generic generic.parser generic.standard
  interpolate io.streams.string kernel lexer locals.parser
 -locals.rewrite.closures locals.types make namespaces parser
 -quotations sequences vocabs.parser words words.symbol ;
 +locals.rewrite.closures locals.types make macros namespaces
 +parser quotations sequences vocabs.parser words words.symbol ;
  IN: functors
  
  ! This is a hack
@@@ -58,8 -58,6 +58,6 @@@ M: object (fake-quotations>) , 
      [ parse-definition* ] dip
      parsed ;
  
- : DEFINE* ( accum -- accum ) \ define-declared* parsed ;
- 
  SYNTAX: `TUPLE:
      scan-param parsed
      scan {
@@@ -111,11 -109,6 +109,11 @@@ SYNTAX: `GENERIC
      complete-effect parsed
      \ define-simple-generic* parsed ;
  
 +SYNTAX: `MACRO:
 +    scan-param parsed
 +    parse-declared*
 +    \ define-macro parsed ;
 +
  SYNTAX: `inline [ word make-inline ] over push-all ;
  
  SYNTAX: `call-next-method T{ fake-call-next-method } parsed ;
@@@ -147,7 -140,6 +145,7 @@@ DEFER: ;FUNCTOR delimite
          { "SYNTAX:" POSTPONE: `SYNTAX: }
          { "SYMBOL:" POSTPONE: `SYMBOL: }
          { "inline" POSTPONE: `inline }
 +        { "MACRO:" POSTPONE: `MACRO: }
          { "call-next-method" POSTPONE: `call-next-method }
      } ;