fix load errors from bootstrapping

diff --git a/basis/compiler/cfg/intrinsics/alien/alien.factor b/basis/compiler/cfg/intrinsics/alien/alien.factor
index ad9b105767ef0b1e7883dd4dd5f49a56f5941ba4..fb993681e8b25aff4e7365484aff85075a4b9659 100644 (file)
--- 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 7c71a6a85f521c78059518c74bb28427f0909301..976ffc0dfaeea0b3596eca53f98756046897f962 100644 (file)
--- 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 \r
     ] [ \r
       [\r
-        "FROM: locals => [let ; FROM: sequences => nth ; [let " %\r
+        "FROM: locals => [let :> ; FROM: sequences => nth ; [let " %\r
           dup length [\r
             over ebnf-var? [\r
               " " % # " over nth :> " %\r
@@ -463,7 +463,7 @@ M: ebnf-sequence build-locals ( code ast -- code )
 \r
 M: ebnf-var build-locals ( code ast -- )\r
   [\r
-    "FROM: locals => [let ; FROM: kernel => dup nip ; [let " %\r
+    "FROM: locals => [let :> ; FROM: kernel => dup nip ; [let " %\r
     " dup :> " % name>> %\r
     " " %\r
     %  \r

diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index db45c3b766560b18fa1900e09d4ad5f2dfe7ce6c..2229c72b8a21bdf9a9eabd939b0ead597cd618cd 100644 (file)
--- 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 7fad97c5aa9fe0639f4e4c94c8ecc48bd53c0aa5..62a9526e20e7a8ccf1b975fbfb0d32a3d841c999 100644 (file)
--- 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