kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-11-13 01:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Fix unescaping in chuck, common-lisp, gst, guile, python

Browse Source
This commit is contained in:
Vasilij Schneidermann 2017-09-26 22:07:49 +02:00 committed by Joel Martin
parent 42aecee642
commit e91c55c2b6
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chuck/types/boxed/String.ck
View File

@ -112,9 +112,10 @@ public class String
fun static string parse(string input)
{
slice(input, 1, input.length() - 1) => string output;
replaceAll(output, "\\\\", "\177") => output;
replaceAll(output, "\\\"", "\"") => output;
replaceAll(output, "\\n", "\n") => output;
replaceAll(output, "\\\\", "\\") => output;
replaceAll(output, "\177", "\\") => output;
return output;
}

16
common-lisp/src/reader.lisp
View File

@ -90,12 +90,20 @@ raised"
reader)
(defun parse-string (token)
;; read-from-string doesn't handle \n
(if (and (> (length token) 1)
(scan *string-re* token))
(read-from-string (utils:replace-all token
"\\n"
"
"))
(let ((input (subseq token 1 (1- (length token)))))
(with-output-to-string (out)
(with-input-from-string (in input)
(loop while (peek-char nil in nil)
do (let ((char (read-char in)))
(if (eql char #\\ )
(let ((char (read-char in)))
(if (eql char #\n)
(terpri out)
(princ char out)))
(princ char out)))))))
(error 'eof :context "string")))
(defun expand-quote (reader)

6
gst/util.st
View File

@ -10,12 +10,14 @@ SequenceableCollection extend [
String extend [
parse [
|text|
|text canary|
canary := 8r177 asCharacter asString.
text := self copyFrom: 2 to: self size - 1.
text := text copyReplaceAll: '\\' with: canary.
text := text copyReplaceAll: '\"' with: '"'.
text := text copyReplaceAll: '\n' with: '
'.
text := text copyReplaceAll: '\\' with: '\'.
text := text copyReplaceAll: canary with: '\'.
^text
]

15
guile/reader.scm
View File

@ -78,21 +78,14 @@
(lp (cddr next)))))))))
(define (read_atom reader)
(define (->str s)
(string-sub
(string-sub
(string-sub s "\\\\\"" "\"")
"\\\\n" "\n")
"\\\\\\\\" "\\"))
(let ((token (reader 'next)))
(cond
((string-match "^-?[0-9][0-9.]*$" token)
=> (lambda (m) (string->number (match:substring m 0))))
((string-match "^\"(.*)(.)$" token)
=> (lambda (m)
(if (string=? "\"" (match:substring m 2))
(->str (match:substring m 1))
(throw 'mal-error "expected '\"'"))))
((eqv? (string-ref token 0) #\")
(if (eqv? (string-ref token (- (string-length token) 1)) #\")
(with-input-from-string token read)
(throw 'mal-error "expected '\"'")))
((string-match "^:(.*)" token)
=> (lambda (m) (string->keyword (match:substring m 1))))
((string=? "nil" token) nil)

4
python/reader.py
View File

@ -1,5 +1,5 @@
import re
from mal_types import (_symbol, _keyword, _list, _vector, _hash_map, _s2u)
from mal_types import (_symbol, _keyword, _list, _vector, _hash_map, _s2u, _u)
class Blank(Exception): pass
@ -23,7 +23,7 @@ def tokenize(str):
return [t for t in re.findall(tre, str) if t[0] != ';']
def _unescape(s):
return s.replace('\\"', '"').replace('\\n', '\n').replace('\\\\', '\\')
return s.replace('\\\\', _u('\u029e')).replace('\\"', '"').replace('\\n', '\n').replace(_u('\u029e'), '\\')
def read_atom(reader):
int_re = re.compile(r"-?[0-9]+$")