Merge: serialization: fix a bug, improve doc and clean weird condition

Pull-Request: #2297 Reviewed-by: Jean Privat <[email protected]>
nitlang · Aug 26, 2016 · 39f109b · 39f109b
2 parents f78a35b + 6f63770
commit 39f109b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/binary/serialization.nit b/lib/binary/serialization.nit
@@ -178,7 +178,7 @@ class BinaryDeserializer
 
 			# An invalid attribute name is an heuristic for invalid data.
 			# Hitting an object end marker will result in an empty string.
-			assert next_attribute_name.is_valid_id else
+			if not next_attribute_name.is_valid_id then
 
 				var error
 				if next_attribute_name.is_empty then

diff --git a/lib/serialization/serialization.nit b/lib/serialization/serialization.nit
@@ -148,7 +148,7 @@ abstract class Deserializer
 	var errors = new Array[Error]
 end
 
-# Deserialization got wrong attribute names
+# Error on invalid dynamic type for a deserialized attribute
 class AttributeTypeError
 	super Error
 

diff --git a/src/frontend/serialization_phase.nit b/src/frontend/serialization_phase.nit
@@ -310,7 +310,7 @@ do
 			if type_name == "nullable Object" then
 				# Don't type check
 				code.add """
-	var {{{name}}} = v.deserialize_attribute("{{{attribute.serialize_name}}}", "{{{type_name}}}")
+	self.{{{name}}} = v.deserialize_attribute("{{{attribute.serialize_name}}}", "{{{type_name}}}")
 """
 			else code.add """
 	var {{{name}}} = v.deserialize_attribute("{{{attribute.serialize_name}}}", "{{{type_name}}}")