From 2ecf3fb568fb9a558441b80c9e5ad4ebe2b30f81 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Wed, 28 Oct 2009 12:51:03 -0500
Subject: [PATCH] fix load errors from bootstrapping

---
 .../cfg/intrinsics/alien/alien.factor         |  2 +-
 basis/peg/ebnf/ebnf.factor                    |  4 ++--
 basis/peg/peg.factor                          | 22 ++++++++++---------
 .../known-words/known-words.factor            |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/basis/compiler/cfg/intrinsics/alien/alien.factor b/basis/compiler/cfg/intrinsics/alien/alien.factor
index ad9b105767..fb993681e8 100644
--- a/basis/compiler/cfg/intrinsics/alien/alien.factor
+++ b/basis/compiler/cfg/intrinsics/alien/alien.factor
@@ -25,7 +25,7 @@ IN: compiler.cfg.intrinsics.alien
     node node-input-infos :> infos
     infos test call
     [ infos quot call ]
-    [ node emit-primitive ] if ;
+    [ node emit-primitive ] if ; inline
 
 : inline-alien-getter? ( infos -- ? )
     [ first class>> c-ptr class<= ]
diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 7c71a6a85f..976ffc0dfa 100644
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -445,7 +445,7 @@ M: ebnf-sequence build-locals ( code ast -- code )
       drop 
     ] [ 
       [
-        "FROM: locals => [let ; FROM: sequences => nth ; [let " %
+        "FROM: locals => [let :> ; FROM: sequences => nth ; [let " %
           dup length [
             over ebnf-var? [
               " " % # " over nth :> " %
@@ -463,7 +463,7 @@ M: ebnf-sequence build-locals ( code ast -- code )
 
 M: ebnf-var build-locals ( code ast -- )
   [
-    "FROM: locals => [let ; FROM: kernel => dup nip ; [let " %
+    "FROM: locals => [let :> ; FROM: kernel => dup nip ; [let " %
     " dup :> " % name>> %
     " " %
     %  
diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index db45c3b766..2229c72b8a 100644
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -613,17 +613,19 @@ PRIVATE>
 ERROR: parse-failed input word ;
 
 SYNTAX: PEG:
-    (:) :> effect :> def :> word
-    [
-      [
-        def call compile :> compiled-def
+    [let
+        (:) :> effect :> def :> word
         [
-          dup compiled-def compiled-parse
-          [ ast>> ] [ word parse-failed ] ?if
-        ]
-        word swap effect define-declared
-      ] with-compilation-unit
-    ] over push-all ;
+          [
+            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
+    ] ;
 
 USING: vocabs vocabs.loader ;
 
diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index 7fad97c5aa..62a9526e20 100644
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/basis/stack-checker/known-words/known-words.factor
@@ -192,7 +192,7 @@ M: bad-executable summary
 
 \ load-local [ infer-load-local ] "special" set-word-prop
 
-: infer-get-local ( -- )
+:: infer-get-local ( -- )
     pop-literal nip 1 swap - :> n
     n consume-r :> in-r
     in-r first copy-value 1array :> out-d