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

fix another tuple definition bug

db4
Doug Coleman 2009-09-01 11:36:06 -05:00
parent d46d063f5f
commit 26cc551049
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/classes/tuple/parser/parser-tests.factor
View File

@ -147,3 +147,9 @@ TUPLE: bad-inheritance-tuple ;
[ [
"IN: classes.tuple.parser.tests TUPLE: bad-inheritance-tuple < bad-inheritance-tuple ;" eval( -- ) "IN: classes.tuple.parser.tests TUPLE: bad-inheritance-tuple < bad-inheritance-tuple ;" eval( -- )
] [ error>> bad-inheritance? ] must-fail-with ] [ error>> bad-inheritance? ] must-fail-with
TUPLE: bad-inheritance-tuple2 ;
TUPLE: bad-inheritance-tuple3 < bad-inheritance-tuple2 ;
[
"IN: classes.tuple.parser.tests TUPLE: bad-inheritance-tuple2 < bad-inheritance-tuple3 ;" eval( -- )
] [ error>> bad-inheritance? ] must-fail-with

8
core/classes/tuple/parser/parser.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel sets namespaces make sequences parser USING: accessors kernel sets namespaces make sequences parser
lexer combinators words classes.parser classes.tuple arrays lexer combinators words classes.parser classes.tuple arrays
slots math assocs parser.notes ; slots math assocs parser.notes classes.algebra ;
IN: classes.tuple.parser IN: classes.tuple.parser
: slot-names ( slots -- seq ) : slot-names ( slots -- seq )
@ -58,15 +58,15 @@ ERROR: invalid-slot-name name ;
ERROR: bad-inheritance class superclass ; ERROR: bad-inheritance class superclass ;
: check-self-inheritance ( class1 class2 -- class1 class2 ) : check-inheritance ( class1 class2 -- class1 class2 )
2dup = [ bad-inheritance ] when ; 2dup swap class<= [ bad-inheritance ] when ;
: parse-tuple-definition ( -- class superclass slots ) : parse-tuple-definition ( -- class superclass slots )
CREATE-CLASS CREATE-CLASS
scan 2dup = [ ] when { scan 2dup = [ ] when {
{ ";" [ tuple f ] } { ";" [ tuple f ] }
{ "<" [ { "<" [
scan-word check-self-inheritance [ parse-tuple-slots ] { } make scan-word check-inheritance [ parse-tuple-slots ] { } make
] } ] }
[ tuple swap [ parse-slot-name [ parse-tuple-slots ] when ] { } make ] [ tuple swap [ parse-slot-name [ parse-tuple-slots ] when ] { } make ]
} case } case