From 34e29cd690ccde13168cc56f586f7ea69d7d5948 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Wed, 12 Dec 2007 00:33:36 -0500 Subject: [PATCH] Multiline string literal naming --- extra/multiline/multiline-docs.factor | 4 ++-- extra/multiline/multiline.factor | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extra/multiline/multiline-docs.factor b/extra/multiline/multiline-docs.factor index 05ccdefe6f..7e7375cfad 100644 --- a/extra/multiline/multiline-docs.factor +++ b/extra/multiline/multiline-docs.factor @@ -14,8 +14,8 @@ HELP: parse-here { $values { "str" "a string" } } { $description "Parses a multiline string literal, as used by " { $link POSTPONE: STRING: } "." } ; -HELP: parse-literal +HELP: parse-multiline-string { $values { "end-text" "a string delineating the end" } { "str" "the parsed string" } } { $description "Parses a multiline string literal, as used by " { $link POSTPONE: <" } ". The end-text is the delimiter for the end." } ; -{ parse-here parse-literal } related-words +{ parse-here parse-multiline-string } related-words diff --git a/extra/multiline/multiline.factor b/extra/multiline/multiline.factor index e808b78997..89a6e06053 100644 --- a/extra/multiline/multiline.factor +++ b/extra/multiline/multiline.factor @@ -18,18 +18,18 @@ IN: multiline CREATE dup reset-generic parse-here 1quotation define-compound ; parsing -: (parse-literal) ( start-index end-text -- end-index ) +: (parse-multiline-string) ( start-index end-text -- end-index ) lexer get line-text 2dup start [ rot dupd >r >r swap subseq % r> r> length + ] [ rot tail % "\n" % 0 - lexer get next-line swap (parse-literal) + lexer get next-line swap (parse-multiline-string) ] if* ; -: parse-literal ( end-text -- str ) +: parse-multiline-string ( end-text -- str ) [ - lexer get lexer-column swap (parse-literal) + lexer get lexer-column swap (parse-multiline-string) lexer get set-lexer-column ] "" make 1 tail 1 head* ; : <" - "\">" parse-literal parsed ; parsing + "\">" parse-multiline-string parsed ; parsing