From 47903e9188cb7483a11506358def912a2cc1b2d2 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 21 Oct 2015 21:43:18 -0400 Subject: Add (syntax-highlight utils) module. * syntax-highlight.scm (string->stream): Move it. * syntax-highlight/parsers.scm (stream->string): Likewise. * syntax-highlight/utils.scm: New file. * Makefile.am (SOURCES): Add it. --- syntax-highlight/parsers.scm | 3 +-- syntax-highlight/utils.scm | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 syntax-highlight/utils.scm (limited to 'syntax-highlight') diff --git a/syntax-highlight/parsers.scm b/syntax-highlight/parsers.scm index 41975d6..c631a59 100644 --- a/syntax-highlight/parsers.scm +++ b/syntax-highlight/parsers.scm @@ -28,6 +28,7 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-41) + #:use-module (syntax-highlight utils) #:export (parse-fail parse-bind parse-return @@ -141,8 +142,6 @@ parser always succeeds." (values (reverse results) remaining)))))) -(define stream->string (compose list->string stream->list)) - (define (parse-string str) "Create a parser that succeeds when the front of the stream contains the character sequence in STR." diff --git a/syntax-highlight/utils.scm b/syntax-highlight/utils.scm new file mode 100644 index 0000000..a400a8e --- /dev/null +++ b/syntax-highlight/utils.scm @@ -0,0 +1,37 @@ +;;; guile-syntax-highlight -- General-purpose syntax highlighter +;;; Copyright © 2015 David Thompson +;;; +;;; Guile-syntax-highlight is free software; you can redistribute it +;;; and/or modify it under the terms of the GNU Lesser General Public +;;; License as published by the Free Software Foundation; either +;;; version 3 of the License, or (at your option) any later version. +;;; +;;; Guile-syntax-highlight is distributed in the hope that it will be +;;; useful, but WITHOUT ANY WARRANTY; without even the implied +;;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +;;; See the GNU Lesser General Public License for more details. +;;; +;;; You should have received a copy of the GNU Lesser General Public +;;; License along with guile-syntax-highlight. If not, see +;;; . + +;;; Commentary: +;; +;; Utility procedures. +;; +;;; Code: + +(define-module (syntax-highlight utils) + #:use-module (srfi srfi-41) + #:export (string->stream + stream->string)) + +(define (string->stream str) + "Convert the string STR into a stream of characters." + (stream-map (lambda (i) + (string-ref str i)) + (stream-range 0 (string-length str)))) + +(define (stream->string stream) + "Convert STREAM, a SRFI-41 stream of characters, into a string." + (list->string (stream->list stream))) -- cgit v1.2.3