return serializer
-def _serialize_float(f):
- return '{}f'.format(f)
-
-def _serialize_double(d):
- return '{}d'.format(d)
-
def _serialize_binary(b):
return '"{}"b'.format(binascii.hexlify(b).decode('ascii'))
tags.INT16: _integer_size_to_string_serializer(16),
tags.INT32: _integer_size_to_string_serializer(32),
tags.INT64: _integer_size_to_string_serializer(64),
- tags.FLOAT: _serialize_float,
- tags.DOUBLE: _serialize_double,
tags.BINARY: _serialize_binary,
tags.UTF8: _utf_encoding_to_serializer('utf8'),
tags.UTF16: _utf_encoding_to_serializer('utf16'),
}
def serialize(o):
- o = tags._tag(o)
+ o = tags.autotag(o)
return _STRING_SERIALIZERS[o.tag](o.value)
return integer_parser
-_BINARY32_MATCHER = re.compile(r'(-?\d+\.\d+)f')
-_BINARY64_MATCHER = re.compile(r'(-?\d+\.\d+)d')
-
-@_consume_leading_whitespace
-def _binary32_parser(s):
- match = _BINARY32_MATCHER.match(s)
-
- if match:
- # TODO Validate that the float is in range
- return _shared.ParseResult(
- success = True,
- value = float(match.group(1)),
- remaining = s[match.end():],
- )
-
- return _shared._FAILED_PARSE_RESULT
-
-@_consume_leading_whitespace
-def _binary64_parser(s):
- match = _BINARY64_MATCHER.match(s)
-
- if match:
- # TODO Validate that the double is in range
- return _shared.ParseResult(
- success = True,
- value = float(match.group(1)),
- remaining = s[match.end():],
- )
-
- return _shared._FAILED_PARSE_RESULT
-
_BINARY_MATCHER = re.compile(r'"([\da-f]*)"b')
+@_consume_leading_whitespace
def _binary_parser(s):
match = _BINARY_MATCHER.match(s)
def _make_utf_parser(encoding):
matcher = re.compile(r'"(.*?)"' + encoding)
- def parser(s):
+ @_consume_leading_whitespace
+ def utf_parser(s):
match = matcher.match(s)
if match:
return _shared._FAILED_PARSE_RESULT
- return parser
+ return utf_parser
+
+def _make_consume_constant_parser(constant):
+ @_consume_leading_whitespace
+ def consume_character_parser(s):
+ if s.startswith(constant):
+ return _shared.ParseResult(
+ success = True,
+ value = None,
+ remaining = s[len(constant):],
+ )
+ return _shared._FAILED_PARSE_RESULT
+
+ return consume_character_parser
+
+_consume_comma_parser = _make_consume_constant_parser(',')
def _prefix_with_comma(parser):
def wrapped(s):
- if s.startswith(','):
- s = s[1:]
+ result = _consume_comma_parser(s)
+ if result.success:
+ s = result.remaining
+ else:
+ return _shared._FAILED_PARSE_RESULT
- result = parser(s)
- if not result.success:
- raise Exception('Trailing comma before "{}"'.format(s))
+ result = parser(s)
+ if not result.success:
+ raise Exception('Trailing comma before "{}"'.format(s))
- return result
-
- return _shared._FAILED_PARSE_RESULT
+ return result
return wrapped
def _comma_separate_and_wrap(wrapped_parser, start_wrap, end_wrap, typecaster):
parser_prefixed_with_comma = _prefix_with_comma(wrapped_parser)
+ start_wrap_parser = _make_consume_constant_parser(start_wrap)
+ end_wrap_parser = _make_consume_constant_parser(end_wrap)
def parser(s):
- if s.startswith(start_wrap):
- s = s[1:]
+ result = start_wrap_parser(s)
+ if result.success:
+ s = result.remaining
else:
return _shared._FAILED_PARSE_RESULT
s = parse_result.remaining
parse_result = parser_prefixed_with_comma(s)
- if s.startswith(end_wrap):
- s = s[1:]
+ result = end_wrap_parser(s)
+ if result.success:
+ s = result.remaining
else:
return _shared._FAILED_PARSE_RESULT
_list_parser = _comma_separate_and_wrap(_object_parser, '[', ']', list)
+_consume_colon_parser = _make_consume_constant_parser(':')
+
def _kvp_parser(s):
key_parse_result = _object_parser(s)
if key_parse_result.success:
else:
return _shared._FAILED_PARSE_RESULT
- if s.startswith(':'):
- s = s[1:]
+ result = _consume_colon_parser(s)
+ if result.success:
+ s = result.remaining
else:
return _shared._FAILED_PARSE_RESULT
_make_integer_parser(16),
_make_integer_parser(32),
_make_integer_parser(64),
- _binary32_parser,
- _binary64_parser,
_binary_parser,
_make_utf_parser('utf8'),
_make_utf_parser('utf16'),