factor: fix breakage with word renamings.

db4
Doug Coleman 2015-07-20 05:51:16 -07:00
parent 2fd752536f
commit 2f6548d6d2
10 changed files with 77 additions and 77 deletions

View File

@ -15,7 +15,7 @@ IN: alien.remote-control.tests
ascii [ readln ] with-process-reader ; ascii [ readln ] with-process-reader ;
:: test-embedding ( code -- line ) :: test-embedding ( code -- line )
image :> image image-path :> image
[ [
I[ I[

View File

@ -25,4 +25,4 @@ IN: checksums.openssl.tests
] [ { [ unknown-digest? ] [ name>> "no such checksum" = ] } 1&& ] ] [ { [ unknown-digest? ] [ name>> "no such checksum" = ] } 1&& ]
must-fail-with must-fail-with
{ } [ image openssl-sha1 checksum-file drop ] unit-test { } [ image-path openssl-sha1 checksum-file drop ] unit-test

View File

@ -123,15 +123,15 @@ datagram-client delete-file
! Invalid parameter tests ! Invalid parameter tests
[ [
image binary [ input-stream get accept ] with-file-reader image-path binary [ input-stream get accept ] with-file-reader
] must-fail ] must-fail
[ [
image binary [ input-stream get receive ] with-file-reader image-path binary [ input-stream get receive ] with-file-reader
] must-fail ] must-fail
[ [
image binary [ image-path binary [
B{ 1 2 } datagram-server <local> B{ 1 2 } datagram-server <local>
input-stream get send input-stream get send
] with-file-reader ] with-file-reader
@ -141,7 +141,7 @@ datagram-client delete-file
{ } [ { } [
[ [
vm-path , vm-path ,
"-i=" image append , "-i=" image-path append ,
"-run=none" , "-run=none" ,
"-e=USING: destructors namespaces io calendar threads ; input-stream get dispose 1 seconds sleep" , "-e=USING: destructors namespaces io calendar threads ; input-stream get dispose 1 seconds sleep" ,
] { } make try-process ] { } make try-process

View File

@ -117,7 +117,7 @@ MIXIN: move-instance-declaration-mixin
{ } [ "IN: classes.mixin.tests.a" <string-reader> "move-mixin-test-1" parse-stream drop ] unit-test { } [ "IN: classes.mixin.tests.a" <string-reader> "move-mixin-test-1" parse-stream drop ] unit-test
{ { string } } [ move-instance-declaration-mixin members ] unit-test { { string } } [ move-instance-declaration-mixin class-members ] unit-test
MIXIN: silly-mixin MIXIN: silly-mixin
SYMBOL: not-a-class SYMBOL: not-a-class
@ -147,4 +147,4 @@ M: metaclass-change-mixin metaclass-change-generic ;
! Forgetting a mixin member class should remove it from the mixin ! Forgetting a mixin member class should remove it from the mixin
{ } [ [ metaclass-change forget-class ] with-compilation-unit ] unit-test { } [ [ metaclass-change forget-class ] with-compilation-unit ] unit-test
{ t } [ metaclass-change-mixin members empty? ] unit-test { t } [ metaclass-change-mixin class-members empty? ] unit-test

View File

@ -78,7 +78,7 @@ M: change-meta-test-predicate change-meta-test length>> ;
{ } [ "IN: classes.predicate.tests USE: arrays UNION: change-meta-test-class array ;" eval( -- ) ] unit-test { } [ "IN: classes.predicate.tests USE: arrays UNION: change-meta-test-class array ;" eval( -- ) ] unit-test
! Should not have changed ! Should not have changed
{ change-meta-test-class } [ change-meta-test-predicate superclass ] unit-test { change-meta-test-class } [ change-meta-test-predicate superclass-of ] unit-test
[ { } change-meta-test ] [ no-method? ] must-fail-with [ { } change-meta-test ] [ no-method? ] must-fail-with
{ 4 } [ { 1 2 3 4 } change-meta-test ] unit-test { 4 } [ { 1 2 3 4 } change-meta-test ] unit-test

View File

@ -10,7 +10,7 @@ TUPLE: test-1 ;
TUPLE: test-2 < test-1 ; TUPLE: test-2 < test-1 ;
{ t } [ test-2 "slots" word-prop empty? ] unit-test { t } [ test-2 "slots" word-prop empty? ] unit-test
{ test-1 } [ test-2 superclass ] unit-test { test-1 } [ test-2 superclass-of ] unit-test
TUPLE: test-3 a ; TUPLE: test-3 a ;

View File

@ -2,12 +2,12 @@ USING: alien.c-types classes.struct vm ;
IN: tools.image-analyzer.vm.32 IN: tools.image-analyzer.vm.32
STRUCT: boxed-float STRUCT: boxed-float
{ header cell } { header cell_t }
{ padding cell } { padding cell_t }
{ n double } ; { n double } ;
STRUCT: byte-array STRUCT: byte-array
{ header cell } { header cell_t }
{ capacity cell } { capacity cell_t }
{ padding0 cell } { padding0 cell_t }
{ padding1 cell } ; { padding1 cell_t } ;

View File

@ -2,9 +2,9 @@ USING: alien.c-types classes.struct vm ;
IN: tools.image-analyzer.vm.64 IN: tools.image-analyzer.vm.64
STRUCT: boxed-float STRUCT: boxed-float
{ header cell } { header cell_t }
{ n double } ; { n double } ;
STRUCT: byte-array STRUCT: byte-array
{ header cell } { header cell_t }
{ capacity cell } ; { capacity cell_t } ;

View File

@ -3,90 +3,90 @@ IN: tools.image-analyzer.vm
! These structs and words correspond to vm/image.hpp ! These structs and words correspond to vm/image.hpp
STRUCT: image-header STRUCT: image-header
{ magic cell } { magic cell_t }
{ version cell } { version cell_t }
{ data-relocation-base cell } { data-relocation-base cell_t }
{ data-size cell } { data-size cell_t }
{ code-relocation-base cell } { code-relocation-base cell_t }
{ code-size cell } { code-size cell_t }
{ true-object cell } { true-object cell_t }
{ bignum-zero cell } { bignum-zero cell_t }
{ bignum-pos-one cell } { bignum-pos-one cell_t }
{ bignum-neg-one cell } { bignum-neg-one cell_t }
{ special-objects cell[special-object-count] } ; { special-objects cell_t[special-object-count] } ;
! These structs and words correspond to vm/layouts.hpp ! These structs and words correspond to vm/layouts.hpp
STRUCT: object STRUCT: object
{ header cell } ; { header cell_t } ;
STRUCT: alien STRUCT: alien
{ header cell } { header cell_t }
{ base cell } { base cell_t }
{ expired cell } { expired cell_t }
{ displacement cell } { displacement cell_t }
{ address cell } ; { address cell_t } ;
STRUCT: array STRUCT: array
{ header cell } { header cell_t }
{ capacity cell } ; { capacity cell_t } ;
STRUCT: bignum STRUCT: bignum
{ header cell } { header cell_t }
{ capacity cell } ; { capacity cell_t } ;
STRUCT: callstack STRUCT: callstack
{ header cell } { header cell_t }
{ length cell } ; { length cell_t } ;
STRUCT: dll STRUCT: dll
{ header cell } { header cell_t }
{ path cell } { path cell_t }
{ handle void* } ; { handle void* } ;
STRUCT: quotation STRUCT: quotation
{ header cell } { header cell_t }
{ array cell } { array cell_t }
{ cached_effect cell } { cached_effect cell_t }
{ cache_counter cell } { cache_counter cell_t }
{ entry_point cell } ; { entry_point cell_t } ;
STRUCT: string STRUCT: string
{ header cell } { header cell_t }
{ length cell } { length cell_t }
{ aux cell } { aux cell_t }
{ hashcode cell } ; { hashcode cell_t } ;
STRUCT: tuple STRUCT: tuple
{ header cell } { header cell_t }
{ layout cell } ; { layout cell_t } ;
STRUCT: tuple-layout STRUCT: tuple-layout
{ header cell } { header cell_t }
{ capacity cell } { capacity cell_t }
{ klass cell } { klass cell_t }
{ size cell } { size cell_t }
{ echelon cell } ; { echelon cell_t } ;
STRUCT: word STRUCT: word
{ header cell } { header cell_t }
{ hashcode cell } { hashcode cell_t }
{ name cell } { name cell_t }
{ vocabulary cell } { vocabulary cell_t }
{ def cell } { def cell_t }
{ props cell } { props cell_t }
{ pic_def cell } { pic_def cell_t }
{ pic_tail_def cell } { pic_tail_def cell_t }
{ subprimitive cell } { subprimitive cell_t }
{ entry_point cell } ; { entry_point cell_t } ;
STRUCT: wrapper STRUCT: wrapper
{ header cell } { header cell_t }
{ object cell } ; { object cell_t } ;
! These structs and words correspond to vm/code_blocks.hpp ! These structs and words correspond to vm/code_blocks.hpp
STRUCT: code-block STRUCT: code-block
{ header cell } { header cell_t }
{ owner cell } { owner cell_t }
{ parameters cell } { parameters cell_t }
{ relocation cell } ; { relocation cell_t } ;

View File

@ -8,7 +8,7 @@ IN: variants
PREDICATE: variant-class < mixin-class "variant?" word-prop ; PREDICATE: variant-class < mixin-class "variant?" word-prop ;
M: variant-class initial-value* M: variant-class initial-value*
members [ f f ] [ class-members [ f f ] [
first dup word? [ t ] [ initial-value* ] if first dup word? [ t ] [ initial-value* ] if
] if-empty ; ] if-empty ;