From 6206ef777729912bbd9b847c596415058aa8ef26 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 23 Jun 2016 21:53:47 -0700 Subject: [PATCH] txon: rename some backtick words. --- libs/txon/txon.factor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/txon/txon.factor b/libs/txon/txon.factor index 4cde54411d..44518b4fcf 100644 --- a/libs/txon/txon.factor +++ b/libs/txon/txon.factor @@ -12,14 +12,14 @@ PRIVATE< : decode-value ( string -- string' ) "\\`" "`" replace ; -: `? ( ch1 ch2 -- ? ) - [ char: \ = not ] [ char: ` = ] bi* and ; +: unescaped-backtick? ( ch1 ch2 -- ? ) + [ char: \ = not ] [ char: ` = ] bi* and ; inline -: (find-`) ( string -- n/f ) - 2 clump [ first2 `? ] find drop [ 1 + ] [ f ] if* ; +: (find-escaped-backtick) ( string -- n/f ) + 2 clump [ first2 unescaped-backtick? ] find drop [ 1 + ] [ f ] if* ; -: find-` ( string -- n/f ) - dup ?first char: ` = [ drop 0 ] [ (find-`) ] if ; +: find-escaped-backtick ( string -- n/f ) + dup ?first char: \` = [ drop 0 ] [ (find-escaped-backtick) ] if ; : parse-name ( string -- remain name ) ":`" split1 swap decode-value ; @@ -31,7 +31,7 @@ DEFER: name/values [ "" ] [ dup length 1 = [ first ] when ] if-empty ; : parse-value ( string -- remain value ) - dup find-` [ + dup find-escaped-backtick [ dup 1 - pick ?nth char: \: = [ drop name/values ] [ cut swap (parse-value) ] if [ rest [ blank? ] trim-head ] dip