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

db: get rid of a hack no longer needed for semantic-db

db4
Alex Chapman 2008-03-06 12:38:28 +11:00
parent 4222b6299b
commit 0c2ceed71b
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/db/tuples/tuples.factor
View File

@ -87,7 +87,7 @@ HOOK: insert-tuple* db ( tuple statement -- )
[ bind-tuple ] keep execute-statement ; [ bind-tuple ] keep execute-statement ;
: insert-tuple ( tuple -- ) : insert-tuple ( tuple -- )
break ! break
dup class db-columns find-primary-key assigned-id? [ dup class db-columns find-primary-key assigned-id? [
insert-assigned insert-assigned
] [ ] [

26
extra/db/types/types.factor
View File

@ -195,33 +195,11 @@ TUPLE: no-slot-named ;
: offset-of-slot ( str obj -- n ) : offset-of-slot ( str obj -- n )
class slot-spec-named slot-spec-offset ; class slot-spec-named slot-spec-offset ;
DEFER: get-slot-named
: get-delegate-slot-named ( str obj -- value )
delegate [ get-slot-named ] [ drop no-slot-named ] if* ;
! : get-slot-named ( str obj -- value )
! tuck offset-of-slot [ no-slot-named ] unless* slot ;
: get-slot-named ( str obj -- value ) : get-slot-named ( str obj -- value )
2dup offset-of-slot [ tuck offset-of-slot [ no-slot-named ] unless* slot ;
rot drop slot
] [
get-delegate-slot-named
] if* ;
DEFER: set-slot-named
: set-delegate-slot-named ( value str obj -- )
delegate [ set-slot-named ] [ 2drop no-slot-named ] if* ;
! : set-slot-named ( value str obj -- )
! tuck offset-of-slot [ no-slot-named ] unless* set-slot ;
: set-slot-named ( value str obj -- ) : set-slot-named ( value str obj -- )
2dup offset-of-slot [ tuck offset-of-slot [ no-slot-named ] unless* set-slot ;
rot drop set-slot
] [
set-delegate-slot-named
] if* ;
: tuple>filled-slots ( tuple -- alist ) : tuple>filled-slots ( tuple -- alist )
dup <mirror> mirror-slots [ slot-spec-name ] map dup <mirror> mirror-slots [ slot-spec-name ] map