Changeset 40467 in project


Ignore:
Timestamp:
09/08/21 23:31:33 (2 weeks ago)
Author:
Kon Lovett
Message:

fix proc type

Location:
release/5/string-utils/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/5/string-utils/trunk/string-interpolation-body.scm

    r38937 r40467  
    99
    1010(define (string-interpolate/sanity str #!key (eval-tag #\#) (bracing? #f))
     11  ;
     12  ;FIXME #"Ṣọpẹ́" ;=> umm, no
     13  (define read-codepoint read-char)
     14  (define peek-codepoint peek-char)
     15  ;
    1116  (let (
    1217    (inp (open-input-string str)) )
     
    3338      ;in the body or not
    3439      (let (
    35         (ch (read-char inp)) )
     40        (ch (read-codepoint inp)) )
    3641        (cond
    3742          ;
     
    4449            ;lookahead 1
    4550            (let (
    46               (ch (peek-char inp)) )
     51              (ch (peek-codepoint inp)) )
    4752              (cond
    4853                ;
     
    5358                ;read tag : <tag><tag> -> <tag>
    5459                ((char=? eval-tag ch)
    55                   (advance objs (push-char (read-char inp))) )
     60                  (advance objs (push-char (read-codepoint inp))) )
    5661                ;
    5762                ;WART read wrapped expression
  • release/5/string-utils/trunk/string-interpolator.scm

    r38937 r40467  
    1313;reverse-list->string
    1414
    15 (import scheme)
    16 (import (chicken base))
    17 (import (chicken platform))
    18 (import (chicken type))
    19 (import (only (chicken string) reverse-list->string))
    20 (import (only (srfi 1) reverse!))
    21 (import (only (srfi 13) string-concatenate-reverse))
     15(import scheme
     16  (chicken base)
     17  (chicken platform)
     18  (chicken type)
     19  (only (chicken string) reverse-list->string)
     20  (only (srfi 1) reverse!))
    2221
    23 (: string-interpolate/sanity (string #!rest --> list))
    24 (: string-interpolate (string #!rest --> list))
     22(: string-interpolate/sanity (string #!rest -> list))
     23(: string-interpolate (string #!rest -> list))
    2524
    26 (include "string-interpolation-body")
     25(include-relative "string-interpolation-body")
    2726
    2827) ;string-interpolator
  • release/5/string-utils/trunk/string-utils.egg

    r40460 r40467  
    33
    44((synopsis "String Utilities")
    5  (version "2.5.3")
     5 (version "2.5.4")
    66 (category data)
    77 (author "Kon Lovett")
  • release/5/string-utils/trunk/utf8-string-interpolator.scm

    r38937 r40467  
    1111  string-interpolate/sanity)
    1212
    13 (import (except scheme read-char #;peek-char #;read))
    14 (import (chicken base))
    15 (import (chicken platform))
    16 (import (chicken type))
    17 (import (only (srfi 1) reverse!))
    18 (import (only utf8 read-char list->string))
    19 (import (only utf8-srfi-13 string-concatenate-reverse))
     13(import scheme
     14  utf8
     15  (chicken base)
     16  (chicken platform)
     17  (chicken type)
     18  (only (srfi 1) reverse!))
    2019
    21 (: string-interpolate/sanity (string #!rest --> list))
    22 (: string-interpolate (string #!rest --> list))
     20(: string-interpolate/sanity (string #!rest -> list))
     21(: string-interpolate (string #!rest -> list))
    2322
    24 ;utf8 version (not same semantics!)
    25 (define-inline (reverse-list->string chs) (list->string (reverse! chs)))
    26 
    27 (include "string-interpolation-body")
     23(include-relative "string-interpolation-body")
    2824
    2925) ;utf8-string-interpolator
Note: See TracChangeset for help on using the changeset viewer.