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

struct-arrays: fix help lint, throw error if class parameter is not a struct class

db4
Slava Pestov 2009-09-01 14:58:49 -05:00
parent 3c4dc6d4de
commit b8aa894960
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/struct-arrays/struct-arrays-tests.factor
View File

@ -51,3 +51,5 @@ STRUCT: fixed-string { text char[100] } ;
[ { ALIEN: 123 ALIEN: 223 ALIEN: 323 ALIEN: 423 } ] [
ALIEN: 123 4 fixed-string <direct-struct-array> [ (underlying)>> ] { } map-as
] unit-test
[ 10 "int" <struct-array> ] must-fail

5
basis/struct-arrays/struct-arrays.factor
View File

@ -40,7 +40,10 @@ M: struct-array nth-unsafe
M: struct-array set-nth-unsafe
[ (nth-ptr) swap ] [ element-size>> ] bi memcpy ; inline
ERROR: not-a-struct-class struct-class ;
: <direct-struct-array> ( alien length struct-class -- struct-array )
dup struct-class? [ not-a-struct-class ] unless
[ heap-size ] [ ] [ struct-element-constructor ]
tri struct-array boa ; inline
@ -52,7 +55,7 @@ M: struct-array resize ( n seq -- newseq )
[ [ element-size>> * ] [ underlying>> ] bi resize ] [ class>> ] 2bi
<direct-struct-array> ; inline
: <struct-array> ( length c-type -- struct-array )
: <struct-array> ( length struct-class -- struct-array )
[ heap-size * <byte-array> ] 2keep <direct-struct-array> ; inline
ERROR: bad-byte-array-length byte-array ;