Rename complete-effect to scan-effect

db4
Doug Coleman 2011-10-16 22:50:30 -07:00
parent 54e075c76c
commit f21fee3b73
10 changed files with 30 additions and 11 deletions

View File

@ -46,7 +46,7 @@ M: object (fake-quotations>) , ;
[ fake-quotations> first ] append! ;
: parse-declared* ( accum -- accum )
complete-effect
scan-effect
[ parse-definition* ] dip
suffix! ;
@ -84,7 +84,7 @@ FUNCTOR-SYNTAX: M:
FUNCTOR-SYNTAX: C:
scan-param suffix!
scan-param suffix!
complete-effect
scan-effect
[ [ [ boa ] curry ] append! ] dip suffix!
\ define-declared* suffix! ;
@ -109,7 +109,7 @@ FUNCTOR-SYNTAX: INSTANCE:
FUNCTOR-SYNTAX: GENERIC:
scan-param suffix!
complete-effect suffix!
scan-effect suffix!
\ define-simple-generic* suffix! ;
FUNCTOR-SYNTAX: MACRO:

View File

@ -64,7 +64,7 @@ M: lambda-parser parse-quotation ( -- quotation )
H{ } clone (parse-lambda) <let> ?rewrite-closures ;
: parse-locals ( -- effect vars assoc )
complete-effect
scan-effect
dup
in>> [ dup pair? [ first ] when ] map make-locals ;

View File

@ -59,7 +59,7 @@ PRIVATE>
SYNTAX: ROMAN-OP:
scan-word [ name>> "roman" prepend create-in ] keep
1quotation '[ _ binary-roman-op ]
complete-effect define-declared ;
scan-effect define-declared ;
>>

View File

@ -0,0 +1 @@
Doug Coleman

View File

@ -0,0 +1,18 @@
! Copyright (C) 2011 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
USING: combinators.short-circuit io.directories.search io.files
io.files.info io.pathnames kernel sequences ;
IN: tools.rename
ERROR: directory-contains-files-error path ;
: directory-contains-files? ( path -- ? )
qualified-directory-files [ link-info directory? ] all? not ;
: check-new-vocab-path ( old new -- old new )
2dup [ vocab-path parent-directory ] dip append-path
{ [ exists? ] [ directory-contains-files? ] } 1&&
[ directory-contains-files-error ] unless ;
: rename-vocab ( old new -- )
check-new-vocab-path 2drop ;

View File

@ -28,7 +28,7 @@ M: no-tag summary
PRIVATE>
SYNTAX: TAGS:
scan-new-word complete-effect
scan-new-word scan-effect
[ drop H{ } clone "xtable" set-word-prop ]
[ define-tags ]
2bi ;

View File

@ -51,7 +51,7 @@ PRIVATE>
[ "--" parse-effect-tokens ] dip parse-effect-tokens
<variable-effect> ;
: complete-effect ( -- effect )
: scan-effect ( -- effect )
"(" expect ")" parse-effect ;
: parse-call( ( accum word -- accum )
@ -59,5 +59,5 @@ PRIVATE>
: (:) ( -- word def effect )
scan-new-word
complete-effect
scan-effect
parse-definition swap ;

View File

@ -9,7 +9,7 @@ ERROR: not-in-a-method-error ;
: scan-new-generic ( -- word ) scan-new dup reset-word ;
: (GENERIC:) ( quot -- )
[ scan-new-generic ] dip call complete-effect define-generic ; inline
[ scan-new-generic ] dip call scan-effect define-generic ; inline
: create-method-in ( class generic -- method )
create-method dup set-word dup save-location ;

View File

@ -224,7 +224,7 @@ M: no-method error.
] if ;
! Syntax
SYNTAX: GENERIC: scan-new-word complete-effect define-generic ;
SYNTAX: GENERIC: scan-new-word scan-effect define-generic ;
: parse-method ( -- quot classes generic )
parse-definition [ 2 tail ] [ second ] [ first ] tri ;

View File

@ -37,7 +37,7 @@ ERROR: no-pair-method a b generic ;
[ drop make-pair-generic ] 2tri ;
: (PAIR-GENERIC:) ( -- )
scan-new-generic complete-effect define-pair-generic ;
scan-new-generic scan-effect define-pair-generic ;
SYNTAX: PAIR-GENERIC: (PAIR-GENERIC:) ;