inference workaround

factor/jedit/FactorPlugin.java

@@ -99,10 +99,11 @@ public class FactorPlugin extends EditPlugin
 			{
 				String[] args = jEdit.getProperty("factor.external.args","-jedit")
 					.split(" ");
-				String[] nargs = new String[args.length + 3];
+				String[] nargs = new String[args.length + 4];
 				nargs[0] = jEdit.getProperty("factor.external.program");
 				nargs[1] = jEdit.getProperty("factor.external.image");
 				nargs[2] = "-no-ansi";
+				nargs[3] = "-no-smart-terminal";
 				System.arraycopy(args,0,nargs,3,args.length);
 				p = Runtime.getRuntime().exec(nargs);
 				p.getErrorStream().close();

library/bootstrap/init-stage2.factor

@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: kernel
-USE: ansi
 USE: alien
 USE: compiler
 USE: errors
@@ -92,8 +91,8 @@ init-error-handler
 
 0 [ drop succ ] each-word unparse write " words" print 
 
-! "Counting word usages..." print
-! tally-usages
+"Counting word usages..." print
+tally-usages
 ! 
 ! "Automatically inlining words called " write
 ! auto-inline-count unparse write

library/inference/branches.factor

@@ -108,7 +108,7 @@ USE: hashtables
         save-effect set
         dup value-recursion recursive-state set
         copy-interpreter
-        d-in [ vector-clone ] change
+        d-in [ [ vector-clone ] vector-map ] change
         dataflow-graph off
         literal-value infer-quot
         #values values-node

library/inference/words.factor

@@ -184,7 +184,7 @@ USE: prettyprint
         check-recursion recursive-word
     ] [
         drop dup "infer-effect" word-property dup [
-            apply-effect
+            dup cdr cons? [ old-effect ] when apply-effect
         ] [
             drop
             [

library/test/inspector.factor

@@ -1,9 +0,0 @@
-IN: scratchpad
-USE: inspector
-USE: namespaces
-USE: words
-
-"httpd" apropos.
-"car" usages.
-global describe
-vocabularies get describe

library/test/test.factor

@@ -83,7 +83,6 @@ USE: unparser
         "prettyprint"
         "image"
         "init"
-        "inspector"
         "io/io"
         "listener"
         "vectors"