diff --git a/examples/Makefile b/examples/Makefile index fc39c55448fc0246f0ddbba0c05e24c7bc2e0b1d..b217cff14e98788bc33b2063d363b08c71cd4f44 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -17,7 +17,7 @@ ifeq ($(UNAME_S),Darwin) else cd simple ; sh compile.sh && sh run.sh $(MAKE) -C wiki_example test - $(MAKE) -C user_types test + $(MAKE) -C user_types all endif $(MAKE) -C duck_typing test $(MAKE) -C twoway test diff --git a/lib/python/labcomm2014/LabComm.py b/lib/python/labcomm2014/LabComm.py index a11f9cd46883ffb21de4e6bbd1b0cd70ecb4697a..9976da625d08dfe97bc49d4fad2a4ed536f20127 100644 --- a/lib/python/labcomm2014/LabComm.py +++ b/lib/python/labcomm2014/LabComm.py @@ -637,8 +637,7 @@ class struct(type_decl): return not self.__eq__(other) def __hash__(self): - tmp = str(self.field) - return hash(self.__class__) ^ hash(tmp) + return hash(self.__class__) ^ hash(self.field) def encode_decl(self, encoder): encoder.encode_type(i_STRUCT) @@ -965,7 +964,7 @@ class Decoder(Codec): if key == decl: print "but value %s == decl %s" % (key,decl) print "hashes %d : %d" % (hash(key),hash(decl)) - + raise Exception() def decode(self): while True: