From 2f7a4a26cd1e635d01c68dd0b9cda034f21f4343 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 20 Mar 2016 21:03:44 -0700 Subject: [PATCH] basis: rename the only four words with backtick in their name. --- basis/classes/struct/struct.factor | 12 ++++++------ basis/regexp/regexp.factor | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor index 744c961452..0d14fa12cc 100644 --- a/basis/classes/struct/struct.factor +++ b/basis/classes/struct/struct.factor @@ -397,17 +397,17 @@ SYNTAX: S@ ! functor support 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 [ 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 ] append! - [ parse-struct-slots` ] [ ] while + [ parse-struct-slots* ] [ ] while [ >array define-struct-class ] append! ; { "classes.struct" "prettyprint" } "classes.struct.prettyprint" require-when diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index 699c61e4c6..6c7699bce3 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -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