X-Git-Url: https://code.kerkeslager.com/?p=sandbox;a=blobdiff_plain;f=serial%2Fserial%2Ftext.py;fp=serial%2Fserial%2Ftext.py;h=0f19a0ea3a6faaef7ed6418f398948c141fb1ac0;hp=7a09f96f4c7ce6bee43362d1a09dd9d69f164b13;hb=6cb74967b5b52c7b072c0477aa19e52f30b67d7a;hpb=9e1f1cb3fc3668dbddca9c6e0461ffca8543fd50

diff --git a/serial/serial/text.py b/serial/serial/text.py
index 7a09f96..0f19a0e 100644
--- a/serial/serial/text.py
+++ b/serial/serial/text.py
@@ -28,6 +28,24 @@ def _make_signed_integer_serializer(bit_length):
 def _serialize_binary(to):
     return 'bin"{}"'.format(binascii.hexlify(to.instance).decode('ascii'))
 
+_ESCAPES = {
+    '\\': '\\\\',
+    '"': '\\"',
+}
+
+def _escape_character(ch):
+    return _ESCAPES.get(ch, ch)
+
+def _escape(s):
+    return ''.join(_escape_character(ch) for ch in s)
+
+def _make_string_serializer(prefix):
+    def serializer(to):
+        assert isinstance(to.instance, str)
+        return '{}"{}"'.format(prefix, _escape(to.instance))
+
+    return serializer
+
 _SERIALIZERS = {
     tags.NULL: _make_literal_serializer(None, 'null'),
     tags.TRUE: _make_literal_serializer(True, 'true'),
@@ -41,6 +59,9 @@ _SERIALIZERS = {
     tags.INT32: _make_signed_integer_serializer(32),
     tags.INT64: _make_signed_integer_serializer(64),
     tags.BINARY: _serialize_binary,
+    tags.UTF8: _make_string_serializer('utf8'),
+    tags.UTF16: _make_string_serializer('utf16'),
+    tags.UTF32: _make_string_serializer('utf32'),
 }
 
 def serialize(to):
@@ -104,6 +125,52 @@ def _deserialize_binary(s):
 
     return True, result, s[match.end():]
 
+def _make_string_matcher(prefix):
+    return re.compile(prefix + r'"(([^"]|\\.)*)"').match
+
+_UNESCAPE_CHARACTERS = {
+    '\\': '\\',
+    '"': '"',
+}
+
+def _unescape_character(ch):
+    return _UNESCAPE_CHARACTERS[ch]
+
+def _unescape(s):
+    characters = []
+    escaping = False
+
+    for ch in s:
+        if escaping:
+            characters.append(_unescape_character(ch))
+            escaping = False
+
+        elif ch == '\\':
+            escaping = True
+
+        else:
+            characters.append(ch)
+
+    return ''.join(characters)
+
+def _make_string_deserializer(tag, prefix):
+    matcher = _make_string_matcher(prefix)
+
+    def deserializer(s):
+        match = matcher(s)
+
+        if match is None:
+            return False, None, None
+
+        result = tags.TaggedObject(
+            tag = tag,
+            instance = _unescape(match.group(1)),
+        )
+
+        return True, result, s[match.end():]
+
+    return deserializer
+
 _DESERIALIZERS = [
     _make_literal_deserializer(tags.NULL, None, 'null'),
     _make_literal_deserializer(tags.TRUE, True, 'true'),
@@ -117,6 +184,9 @@ _DESERIALIZERS = [
     _make_signed_int_deserializer(tags.INT32, 32),
     _make_signed_int_deserializer(tags.INT64, 64),
     _deserialize_binary,
+    _make_string_deserializer(tags.UTF8, 'utf8'),
+    _make_string_deserializer(tags.UTF16, 'utf16'),
+    _make_string_deserializer(tags.UTF32, 'utf32'),
 ]
 
 def deserialize(s):