diff --git a/extra/24-game/24-game.factor b/extra/24-game/24-game.factor index 86940dfa95..569cef8302 100644 --- a/extra/24-game/24-game.factor +++ b/extra/24-game/24-game.factor @@ -2,7 +2,7 @@ ! 24, the Factor game! USING: kernel random namespaces shuffle sequences -parser io math prettyprint combinators +parser io math prettyprint combinators continuations vectors words quotations accessors math.parser backtrack math.ranges locals fry memoize macros assocs ; diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor index 45c6f1fb4d..e694b36007 100644 --- a/extra/shell/shell.factor +++ b/extra/shell/shell.factor @@ -50,7 +50,6 @@ DEFER: expansion METHOD: expand { back-quoted-expr } expr>> expr - ast>> command>> expansion utf8 @@ -122,7 +121,7 @@ DEFER: shell { [ dup f = ] [ drop ] } { [ dup "exit" = ] [ drop ] } { [ dup "" = ] [ drop shell ] } - { [ dup expr ] [ expr ast>> chant shell ] } + { [ dup expr ] [ expr chant shell ] } { [ t ] [ drop "ix: ignoring input" print shell ] } } cond ; diff --git a/extra/ui/gadgets/labelled/labelled.factor b/extra/ui/gadgets/labelled/labelled.factor index 686e940ae6..831ac1b1d8 100755 --- a/extra/ui/gadgets/labelled/labelled.factor +++ b/extra/ui/gadgets/labelled/labelled.factor @@ -12,9 +12,9 @@ TUPLE: labelled-gadget < track content ; : ( gadget title -- newgadget ) { 0 1 } labelled-gadget new-track - swap