From b2e05012923fb392e31a0600a6ac93ad68259f20 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 25 Jun 2016 23:21:36 -0700 Subject: [PATCH] factor: escape/rename more @words. --- collections/digraphs/digraphs.factor | 6 +++--- language/peg/ebnf/ebnf.factor | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collections/digraphs/digraphs.factor b/collections/digraphs/digraphs.factor index ccbe90fb3c..82caa66cf6 100644 --- a/collections/digraphs/digraphs.factor +++ b/collections/digraphs/digraphs.factor @@ -19,9 +19,9 @@ TUPLE: vertex value edges ; : children ( key digraph -- seq ) at edges>> ; -: @edges ( from to digraph -- to edges ) swapd at edges>> ; -: add-edge ( from to digraph -- ) @edges push ; -: delete-edge ( from to digraph -- ) @edges remove! drop ; +: edges ( from to digraph -- to edges ) swapd at edges>> ; +: add-edge ( from to digraph -- ) edges push ; +: delete-edge ( from to digraph -- ) edges remove! drop ; : delete-to-edges ( to digraph -- ) [ nip dupd edges>> remove! drop ] assoc-each drop ; diff --git a/language/peg/ebnf/ebnf.factor b/language/peg/ebnf/ebnf.factor index 785f9a02f0..fa5c880d27 100644 --- a/language/peg/ebnf/ebnf.factor +++ b/language/peg/ebnf/ebnf.factor @@ -563,5 +563,5 @@ SYNTAX: \ EBNF: ( input -- ast ) define-declared "ebnf-parser" set-word-prop reset-tokenizer ; -SYNTAX: @ebnf +SYNTAX: \ @ebnf words:last-word dup "ebnf-parser" set-word-prop ;