carp-lang/Carp
1
1
Fork 0
mirror of https://github.com/carp-lang/Carp.git synced 2024-09-11 13:37:57 +03:00
Code Issues Projects Releases Wiki Activity

core: format works!

Browse Source
This commit is contained in:
hellerve 2017-12-30 15:04:01 +01:00
parent eccddd00fe
commit ff34744dc4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/Format.carp
View File

@ -1,10 +1,10 @@
(defdynamic fmt-internal [s args]
(let [idx (String.index-of s \%)
len (String.count s)]
(if (= idx -1) s ; no more splits found, just return string
(if (= idx -1) (list 'copy s) ; no more splits found, just return string
(if (= \% (String.char-at s (inc idx))) ; this is an escaped %
(list 'String.append
(String.substring s 0 (+ idx 2))
(list 'copy (String.substring s 0 (+ idx 2)))
(fmt-internal (String.substring s (+ idx 2) len)))
(if (= 0 (count args)) ; we need to insert something, but have nothing
(macro-error "error in format string: not enough arguments for format string")
@ -12,12 +12,11 @@
; get the next % after our escaper
(let [next (String.index-of (String.substring s (inc idx) len) \%)]
(if (= 0 next)
(list 'fmt slice (car args))
(let [offs (+ idx 2)
slice (String.substring s 0 (+ idx 2))]
(list 'String.append (list 'fmt slice (car args))
(fmt-internal (String.substring s offs len)
(list 'format (list 'copy slice) (car args))
(let [slice (String.substring s 0 (+ (inc idx) next))]
(list 'String.append (list 'format (list 'copy slice) (car args))
(fmt-internal (String.substring s (+ (inc idx) next) len)
(cdr args)))))))))))
(defmacro format [s :rest args]
(defmacro fmt [s :rest args]
(fmt-internal s args))

4
core/core.h
View File

@ -297,8 +297,8 @@ char String_char_MINUS_at(string* s, int i) {
string String_format(string str, string s) {
int n = strlen(s);
string buffer = CARP_MALLOC(n);
snprintf(buffer, n, str, *s);
string buffer = CARP_MALLOC(n+1);
snprintf(buffer, n+2, str, s);
return buffer;
}