From 22946a0c2f629ea33730a25c94dfae93e21318ed Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 24 Apr 2016 14:24:41 +0200 Subject: [PATCH] pyon: complex types --- artiq/protocols/pyon.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/artiq/protocols/pyon.py b/artiq/protocols/pyon.py index f78583421..8577896ed 100644 --- a/artiq/protocols/pyon.py +++ b/artiq/protocols/pyon.py @@ -5,7 +5,7 @@ objects. Its main features are: * Human-readable format compatible with the Python syntax. * Each object is serialized on a single line, with only ASCII characters. * Supports all basic Python data structures: None, booleans, integers, - floats, strings, tuples, lists, dictionaries. + floats, complex numbers, strings, tuples, lists, dictionaries. * Those data types are accurately reconstructed (unlike JSON where e.g. tuples become lists, and dictionary keys are turned into strings). * Supports Numpy arrays. @@ -33,6 +33,7 @@ _encode_map = { bool: "bool", int: "number", float: "number", + complex: "number", str: "str", bytes: "bytes", tuple: "tuple", @@ -46,8 +47,10 @@ _encode_map = { } _numpy_scalar = { - "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", - "float16", "float32", "float64" + "int8", "int16", "int32", "int64", + "uint8", "uint16", "uint32", "uint64", + "float16", "float32", "float64", "float128", + "complex64", "complex128", "complex256", } @@ -132,7 +135,7 @@ class _Encoder: self.encode(x.denominator)) def encode_ordereddict(self, x): - return "OrderedDict("+ self.encode(list(x.items())) +")" + return "OrderedDict(" + self.encode(list(x.items())) + ")" def encode_nparray(self, x): r = "nparray(" @@ -186,6 +189,7 @@ _eval_dict = { "npscalar": _npscalar } + def decode(s): """Parses a string in the Python syntax, reconstructs the corresponding object, and returns it."""