M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-26 03:38:25 +08:00
Code Issues Projects Releases Wiki Activity

pyon: support slices

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2016-06-15 19:18:46 +08:00
parent 60657c30b0
commit 033aa33c9e
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/protocols/pyon.py
View File

@ -40,6 +40,7 @@ _encode_map = {
list: "list", list: "list",
set: "set", set: "set",
dict: "dict", dict: "dict",
slice: "slice",
wrapping_int: "number", wrapping_int: "number",
Fraction: "fraction", Fraction: "fraction",
OrderedDict: "ordereddict", OrderedDict: "ordereddict",
@ -134,6 +135,9 @@ class _Encoder:
r += "}" r += "}"
return r return r
def encode_slice(self, x):
return repr(x)
def encode_fraction(self, x): def encode_fraction(self, x):
return "Fraction({}, {})".format(self.encode(x.numerator), return "Fraction({}, {})".format(self.encode(x.numerator),
self.encode(x.denominator)) self.encode(x.denominator))
@ -186,6 +190,7 @@ _eval_dict = {
"null": None, "null": None,
"false": False, "false": False,
"true": True, "true": True,
"slice": slice,
"int": wrapping_int, "int": wrapping_int,
"Fraction": Fraction, "Fraction": Fraction,

1
artiq/test/test_serialization.py
View File

@ -9,6 +9,7 @@ from artiq.protocols import pyon
_pyon_test_object = { _pyon_test_object = {
(1, 2): [(3, 4.2), (2, )], (1, 2): [(3, 4.2), (2, )],
"slice": slice(3),
Fraction(3, 4): np.linspace(5, 10, 1), Fraction(3, 4): np.linspace(5, 10, 1),
"set": {"testing", "sets"}, "set": {"testing", "sets"},
"a": np.int8(9), "b": np.int16(-98), "c": np.int32(42), "d": np.int64(-5), "a": np.int8(9), "b": np.int16(-98), "c": np.int32(42), "d": np.int64(-5),

1
artiq/test/test_sync_struct.py
View File

@ -18,6 +18,7 @@ def write_test_data(test_dict):
test_dict[key] = value test_dict[key] = value
test_dict[1.5] = 1.5 test_dict[1.5] = 1.5
test_dict["list"] = [] test_dict["list"] = []
test_dict["list"][:] = [34, 31]
test_dict["list"].append(42) test_dict["list"].append(42)
test_dict["list"].insert(1, 1) test_dict["list"].insert(1, 1)
test_dict[100] = 0 test_dict[100] = 0