From 600974f6d815ee8b08a857be0c217cde0a55c11f Mon Sep 17 00:00:00 2001 From: slava Date: Mon, 6 Mar 2006 06:04:43 +0000 Subject: [PATCH] Small cleanup, and bugfix for command line parsing during bootstrap --- library/bootstrap/boot-stage2.factor | 2 ++ library/inference/dataflow.factor | 16 ++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor index f007a6f38b..007962484e 100644 --- a/library/bootstrap/boot-stage2.factor +++ b/library/bootstrap/boot-stage2.factor @@ -15,6 +15,8 @@ sequences sequences-internals words ; ] when ] when + parse-command-line + "Compiling base..." print flush { diff --git a/library/inference/dataflow.factor b/library/inference/dataflow.factor index fcd0abc0bd..9016d0ec7a 100644 --- a/library/inference/dataflow.factor +++ b/library/inference/dataflow.factor @@ -206,16 +206,6 @@ SYMBOL: current-node [ 2drop ] if ] each-node-with ; -: (clone-node) ( node -- node ) - clone dup node-shuffle clone over set-node-shuffle ; - -: clone-node ( node -- node ) - dup [ - (clone-node) - dup node-children [ clone-node ] map over set-node-children - dup node-successor clone-node over set-node-successor - ] when ; - GENERIC: calls-label* ( label node -- ? ) M: node calls-label* 2drop f ; @@ -237,7 +227,7 @@ SYMBOL: node-stack DEFER: iterate-nodes : iterate-children ( quot -- ) - node@ node-children [ swap iterate-nodes ] each ; + node@ node-children [ swap iterate-nodes ] each ; inline : iterate-next ( -- node ) node@ node-successor ; @@ -250,6 +240,4 @@ DEFER: iterate-nodes ] if ; inline : with-node-iterator ( quot -- ) - [ - V{ } clone node-stack set call - ] with-scope ; inline + [ V{ } clone node-stack set call ] with-scope ; inline