steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conflicts

db4
Doug Coleman 2010-06-16 16:21:00 -05:00
parent 6e9235b54b
commit ec2b8da7c7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/classes/struct/struct-tests.factor
View File

@ -9,7 +9,6 @@ system tools.test parser lexer eval layouts generic.single classes
vocabs ; vocabs ;
FROM: math => float ; FROM: math => float ;
FROM: specialized-arrays.private => specialized-array-vocab ; FROM: specialized-arrays.private => specialized-array-vocab ;
FROM: classes.struct.private => binary-zero? ;
QUALIFIED-WITH: alien.c-types c QUALIFIED-WITH: alien.c-types c
SPECIALIZED-ARRAY: char SPECIALIZED-ARRAY: char
SPECIALIZED-ARRAY: int SPECIALIZED-ARRAY: int
@ -475,3 +474,7 @@ CONSULT: struct-test-delegate struct-test-delegator del>> ;
7 >>a 7 >>a
8 >>b 8 >>b
] unit-test ] unit-test
<<<<<<< HEAD
=======
>>>>>>> alien.data: make binary-zero? public and move it from classes.struct.private

1
basis/classes/struct/struct.factor
View File

@ -11,7 +11,6 @@ namespaces assocs vocabs.parser math.functions
classes.struct.bit-accessors bit-arrays classes.struct.bit-accessors bit-arrays
stack-checker.dependencies system layouts ; stack-checker.dependencies system layouts ;
FROM: delegate.private => group-words slot-group-words ; FROM: delegate.private => group-words slot-group-words ;
FROM: math => float ;
QUALIFIED: math QUALIFIED: math
IN: classes.struct IN: classes.struct