diff --git a/core/alien/syntax/syntax-docs.factor b/core/alien/syntax/syntax-docs.factor index 09169e63b4..6565ea0e2c 100755 --- a/core/alien/syntax/syntax-docs.factor +++ b/core/alien/syntax/syntax-docs.factor @@ -88,8 +88,6 @@ HELP: typedef { $description "Alises the C type " { $snippet "old" } " under the name " { $snippet "new" } "." } { $notes "Using this word in the same source file which defines C bindings can cause problems, because words are compiled before top-level forms are run. Use the " { $link POSTPONE: TYPEDEF: } " word instead." } ; -{ typedef POSTPONE: TYPEDEF: POSTPONE: TYPEDEF-IF: } related-words -{ POSTPONE: TYPEDEF: typedef POSTPONE: TYPEDEF-IF: } related-words { POSTPONE: TYPEDEF-IF: POSTPONE: TYPEDEF: typedef } related-words HELP: c-struct? diff --git a/extra/assocs/lib/lib.factor b/extra/assocs/lib/lib.factor old mode 100644 new mode 100755 index 50da66e669..00f330f0fc --- a/extra/assocs/lib/lib.factor +++ b/extra/assocs/lib/lib.factor @@ -7,18 +7,18 @@ IN: assocs.lib : >set ( seq -- hash ) [ dup ] H{ } map>assoc ; -: ref-hash ( table key -- value ) swap at ; +: ref-at ( table key -- value ) swap at ; -! set-hash with alternative stack effects +! set-at with alternative stack effects -: put-hash* ( table key value -- ) spin set-at ; +: put-at* ( table key value -- ) swap rot set-at ; -: put-hash ( table key value -- table ) swap pick set-at ; +: put-at ( table key value -- table ) swap pick set-at ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: set-hash-stack ( value key seq -- ) - dupd [ key? ] with find-last nip set-at ; +: set-assoc-stack ( value key seq -- ) + dupd [ key? ] with find-last nip set-at ; : at-default ( key assoc -- value/key ) dupd at [ nip ] when* ; diff --git a/extra/unicode/breaks/breaks.factor b/extra/unicode/breaks/breaks.factor index fc1e3071e7..fb893ed51b 100644 --- a/extra/unicode/breaks/breaks.factor +++ b/extra/unicode/breaks/breaks.factor @@ -1,10 +1,10 @@ -USING: unicode.categories kernel math const combinators splitting +USING: unicode.categories kernel math combinators splitting sequences math.parser io.files io assocs arrays namespaces combinators.lib assocs.lib math.ranges unicode.normalize -unicode.syntax unicode.data ; +unicode.syntax unicode.data compiler.units alien.syntax ; IN: unicode.breaks -ENUM: Any L V T Extend Control CR LF graphemes ; +C-ENUM: Any L V T Extend Control CR LF graphemes ; : jamo-class ( ch -- class ) dup initial? [ drop L ] @@ -71,9 +71,9 @@ SYMBOL: table : make-grapheme-table ( -- ) CR LF connect - { Control CR LF } graphemes break-around - L { L V } connect-before - V { V T } connect-before + Control CR LF 3array graphemes break-around + L L V 2array connect-before + V V T 2array connect-before T T connect graphemes Extend connect-after ;