From a345d4fc37e8142b2c91f14c1fdae2c2e5bb15a5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 11 Feb 2008 16:32:36 -0600 Subject: [PATCH 1/5] delete a couple files in misc/Factor.tmbundle --- .../Commands/Eval Selection:Line.tmCommand | 27 ------------------- .../Run Selection:Line in Listener.tmCommand | 27 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 misc/Factor.tmbundle/Commands/Eval Selection:Line.tmCommand delete mode 100644 misc/Factor.tmbundle/Commands/Run Selection:Line in Listener.tmCommand diff --git a/misc/Factor.tmbundle/Commands/Eval Selection:Line.tmCommand b/misc/Factor.tmbundle/Commands/Eval Selection:Line.tmCommand deleted file mode 100644 index 37867a2737..0000000000 --- a/misc/Factor.tmbundle/Commands/Eval Selection:Line.tmCommand +++ /dev/null @@ -1,27 +0,0 @@ - - - - - beforeRunningCommand - nop - command - #!/usr/bin/env ruby - -require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/tm_factor" -puts factor_eval(STDIN.read) - fallbackInput - line - input - selection - keyEquivalent - ^E - name - Eval Selection/Line - output - replaceSelectedText - scope - source.factor - uuid - 8E01DDAF-959B-4237-ADB9-C133A4ACCE90 - - diff --git a/misc/Factor.tmbundle/Commands/Run Selection:Line in Listener.tmCommand b/misc/Factor.tmbundle/Commands/Run Selection:Line in Listener.tmCommand deleted file mode 100644 index 5028bd8db3..0000000000 --- a/misc/Factor.tmbundle/Commands/Run Selection:Line in Listener.tmCommand +++ /dev/null @@ -1,27 +0,0 @@ - - - - - beforeRunningCommand - nop - command - #!/usr/bin/env ruby - -require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/tm_factor" -factor_run(STDIN.read) - fallbackInput - line - input - selection - keyEquivalent - ^~e - name - Run Selection/Line in Listener - output - discard - scope - source.factor - uuid - 15A984BD-BC65-43E8-878A-267788C8DA70 - - From d976b114455c819363ffd9c7b350a9757aca40cb Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 11 Feb 2008 16:44:13 -0600 Subject: [PATCH 2/5] Fix multiple reload issue --- core/vocabs/loader/loader.factor | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 50ae55f506..8e548b3043 100755 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -160,13 +160,18 @@ SYMBOL: load-help? : load-failures. ( failures -- ) [ load-error. nl ] each ; +SYMBOL: blacklist + : require-all ( vocabs -- failures ) [ + V{ } clone blacklist set [ [ [ require ] - [ error-continuation get 3array , ] - recover + [ + over vocab-name blacklist get push + error-continuation get 3array , + ] recover ] each ] { } make ] with-compiler-errors ; @@ -182,7 +187,7 @@ SYMBOL: load-help? : refresh-all ( -- ) "" refresh ; GENERIC: (load-vocab) ( name -- vocab ) - +! M: vocab (load-vocab) dup vocab-root [ dup vocab-source-loaded? [ dup load-source ] unless @@ -195,8 +200,25 @@ M: string (load-vocab) M: vocab-link (load-vocab) vocab-name (load-vocab) ; -[ [ dup vocab [ ] [ ] ?if (load-vocab) ] with-compiler-errors ] -load-vocab-hook set-global +TUPLE: blacklisted-vocab name ; +! +: blacklisted-vocab ( name -- * ) + \ blacklisted-vocab construct-boa throw ; + +M: blacklisted-vocab error. + "This vocabulary depends on the " write + blacklisted-vocab-name write + " vocabulary which failed to load" print ; + +[ + dup vocab-name blacklist get member? [ + vocab-name blacklisted-vocab + ] [ + [ + dup vocab [ ] [ ] ?if (load-vocab) + ] with-compiler-errors + ] if +] load-vocab-hook set-global : vocab-where ( vocab -- loc ) vocab-source-path dup [ 1 2array ] when ; From 008da8a6baf32758726e55d4217008c1514b5e7b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 11 Feb 2008 16:45:38 -0600 Subject: [PATCH 3/5] cleanup on aisle DECIMAL: --- extra/money/money.factor | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/extra/money/money.factor b/extra/money/money.factor index d742a3be5a..4058ee9e6a 100644 --- a/extra/money/money.factor +++ b/extra/money/money.factor @@ -12,18 +12,21 @@ IN: money "$" % swap number>string 3 group "," join % - "." % number>string 2 48 pad-left % + "." % number>string 2 CHAR: 0 pad-left % ] "" make print ; TUPLE: not-a-decimal ; -: DECIMAL: - scan - "." split dup length 1 2 between? [ - T{ not-a-decimal } throw - ] unless - ?first2 - >r dup ?first CHAR: - = [ drop t "0" ] [ f swap ] if r> + +: not-a-decimal ( -- * ) + T{ not-a-decimal } throw ; + +: parse-decimal ( str -- ratio ) + "." split1 + >r dup "-" head? [ drop t "0" ] [ f swap ] if r> [ dup empty? [ drop "0" ] when ] 2apply dup length - >r [ string>number dup [ T{ not-a-decimal } throw ] unless ] 2apply r> - 10 swap ^ / + swap [ neg ] when parsed ; parsing + >r [ string>number dup [ not-a-decimal ] unless ] 2apply r> + 10 swap ^ / + swap [ neg ] when ; + +: DECIMAL: + scan parse-decimal parsed ; parsing From a6ba0cb392217eb0a0fafbb76ab9308f72b6858f Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 11 Feb 2008 16:47:35 -0600 Subject: [PATCH 4/5] Clean up code a bit --- core/vocabs/loader/loader.factor | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 8e548b3043..5e8a5630b2 100755 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -155,7 +155,6 @@ SYMBOL: load-help? dup first vocab-heading. dup second print-error drop ; - ! third "Traceback" swap write-object ; : load-failures. ( failures -- ) [ load-error. nl ] each ; @@ -166,14 +165,11 @@ SYMBOL: blacklist [ V{ } clone blacklist set [ - [ - [ require ] - [ - over vocab-name blacklist get push - error-continuation get 3array , - ] recover - ] each - ] { } make + [ require ] + [ >r vocab-name r> 2array blacklist get push ] + recover + ] each + blacklist get ] with-compiler-errors ; : do-refresh ( modified-sources modified-docs -- ) @@ -201,7 +197,7 @@ M: vocab-link (load-vocab) vocab-name (load-vocab) ; TUPLE: blacklisted-vocab name ; -! + : blacklisted-vocab ( name -- * ) \ blacklisted-vocab construct-boa throw ; @@ -211,7 +207,7 @@ M: blacklisted-vocab error. " vocabulary which failed to load" print ; [ - dup vocab-name blacklist get member? [ + dup vocab-name blacklist get key? [ vocab-name blacklisted-vocab ] [ [ From 41c85c7edc56d49aa11a04f7dd2891cd4e7085b3 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 11 Feb 2008 16:56:48 -0600 Subject: [PATCH 5/5] Structure alignment fixes --- core/cpu/ppc/ppc.factor | 4 ++++ core/cpu/x86/32/32.factor | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/cpu/ppc/ppc.factor b/core/cpu/ppc/ppc.factor index 901b339d7e..75de49acda 100755 --- a/core/cpu/ppc/ppc.factor +++ b/core/cpu/ppc/ppc.factor @@ -13,3 +13,7 @@ namespaces alien.c-types kernel system combinators ; } cond T{ ppc-backend } compiler-backend set-global + +macosx? [ + 4 "double" c-type set-c-type-align +] when diff --git a/core/cpu/x86/32/32.factor b/core/cpu/x86/32/32.factor index 4ed186d769..ecae55e69a 100755 --- a/core/cpu/x86/32/32.factor +++ b/core/cpu/x86/32/32.factor @@ -261,9 +261,9 @@ windows? [ cell "ulonglong" c-type set-c-type-align ] unless -macosx? [ - cell "double" c-type set-c-type-align -] when +windows? [ + 4 "double" c-type set-c-type-align +] unless T{ x86-backend f 4 } compiler-backend set-global