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

basis: rename the only four words with backtick in their name.

locals-and-roots
Doug Coleman 2016-03-20 21:03:44 -07:00
parent 2f371a83a0
commit 2f7a4a26cd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/classes/struct/struct.factor
View File

@ -397,17 +397,17 @@ SYNTAX: S@
! functor support
<PRIVATE
: scan-c-type` ( -- c-type/param )
: scan-c-type* ( -- c-type/param )
scan-token dup "{" = [ drop \ } parse-until >array ] [ search ] if ;
: parse-struct-slot` ( accum -- accum )
scan-string-param scan-c-type` \ } parse-until
: parse-struct-slot* ( accum -- accum )
scan-string-param scan-c-type* \ } parse-until
[ <struct-slot-spec> suffix! ] 3curry append! ;
: parse-struct-slots` ( accum -- accum more? )
: parse-struct-slots* ( accum -- accum more? )
scan-token {
{ ";" [ f ] }
{ "{" [ parse-struct-slot` t ] }
{ "{" [ parse-struct-slot* t ] }
[ invalid-struct-slot ]
} case ;
@ -416,7 +416,7 @@ PRIVATE>
FUNCTOR-SYNTAX: STRUCT:
scan-param suffix!
[ 8 <vector> ] append!
[ parse-struct-slots` ] [ ] while
[ parse-struct-slots* ] [ ] while
[ >array define-struct-class ] append! ;
{ "classes.struct" "prettyprint" } "classes.struct.prettyprint" require-when

2
basis/regexp/regexp.factor
View File

@ -207,7 +207,6 @@ PRIVATE>
{ "R' " "'" }
{ "R( " ")" }
{ "R@ " "@" }
{ "R` " "`" }
{ "R| " "|" }
} swap [ subseq? not nip ] curry assoc-find drop ;
@ -233,7 +232,6 @@ SYNTAX: R' CHAR: ' parsing-regexp ;
SYNTAX: R( CHAR: ) parsing-regexp ;
SYNTAX: R/ CHAR: / parsing-regexp ;
SYNTAX: R@ CHAR: @ parsing-regexp ;
SYNTAX: R` CHAR: ` parsing-regexp ;
SYNTAX: R| CHAR: | parsing-regexp ;
USE: vocabs.loader