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

Conflicts:
	basis/locals/locals.factor
	basis/peg/peg.factor
	extra/infix/infix.factor

diff --cc basis/alien/fortran/fortran.factor
Simple merge

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

diff --cc basis/io/encodings/gb18030/gb18030.factor
Simple merge

diff --cc basis/locals/locals.factor
index a35e1942f249305350922e83d6cd1ef792621e7d,aa0a064c0d0eee3b57ae7c85f3db8ae83976c249..8e940bfdd8b8100fb9eedc68c0253e0b8411d795
--- 1/basis/locals/locals.factor
--- 2/basis/locals/locals.factor
+++ b/basis/locals/locals.factor
@@@ -7,12 -7,16 +7,12 @@@ IN: local
  
  SYNTAX: :>
      scan locals get [ :>-outside-lambda-error ] unless*
-     parse-def parsed ;
 -    [ make-local ] bind <def> suffix! ;
++    parse-def suffix! ;
  
- SYNTAX: [| parse-lambda over push-all ;
+ SYNTAX: [| parse-lambda append! ;
  
- SYNTAX: [let parse-let over push-all ;
+ SYNTAX: [let parse-let append! ;
  
 -SYNTAX: [let* parse-let* append! ;
 -
 -SYNTAX: [wlet parse-wlet append! ;
 -
  SYNTAX: :: (::) define-declared ;
  
  SYNTAX: M:: (M::) define ;

diff --cc basis/locals/rewrite/sugar/sugar.factor
Simple merge

diff --cc basis/math/vectors/conversion/conversion.factor
Simple merge

diff --cc basis/peg/ebnf/ebnf.factor
Simple merge

diff --cc basis/peg/peg.factor
index ec22955b7a48419508724c36bf9d24a14f614f8f,4a247a8a0fffb0e581bb6d90fb627f53ec925ab3..d4397627e809d216665762b075b8360e0d837d33
--- 1/basis/peg/peg.factor
--- 2/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@@ -613,19 -622,20 +613,19 @@@ PRIVATE
  ERROR: parse-failed input word ;
  
  SYNTAX: PEG:
 -  (:)
 -  [let | effect [ ] def [ ] word [ ] |
 -    [
 -      [
 -        [let | compiled-def [ def call compile ] |
 +    [let
 +        (:) :> ( word def effect )
 +        [
            [
 -            dup compiled-def compiled-parse
 -            [ ast>> ] [ word parse-failed ] ?if
 -          ]
 -          word swap effect define-declared
 -        ]
 -      ] with-compilation-unit
 -    ] append!
 -  ] ;
 +            def call compile :> compiled-def
 +            [
 +              dup compiled-def compiled-parse
 +              [ ast>> ] [ word parse-failed ] ?if
 +            ]
 +            word swap effect define-declared
 +          ] with-compilation-unit
-         ] over push-all
++        ] append!
 +    ] ;
  
  USING: vocabs vocabs.loader ;
  

diff --cc extra/decimals/decimals.factor
Simple merge

diff --cc extra/infix/infix.factor
index 4efecb5fcf98a9920369f7c17136679f334d6846,ab578124f803ed12e8d0535af1fecea6427e0222..48ac35264b2081eb302d5c9624a20e1304a57537
--- 1/extra/infix/infix.factor
--- 2/extra/infix/infix.factor
+++ b/extra/infix/infix.factor
@@@ -82,4 -82,15 +82,4 @@@ M: ast-function infix-codege
  PRIVATE>
  
  SYNTAX: [infix
-     "infix]" [infix-parse parsed \ call parsed ;
+     "infix]" [infix-parse suffix! \ call suffix! ;
 -
 -<PRIVATE
 -
 -: parse-infix-locals ( assoc end -- quot )
 -    '[ _ [infix-parse prepare-operand ] ((parse-lambda)) ;
 -
 -PRIVATE>
 -
 -SYNTAX: [infix|
 -    "|" parse-bindings "infix]" parse-infix-locals <let>
 -    ?rewrite-closures append! ;