X-Git-Url: http://nitlanguage.org

diff --git a/src/frontend/serialization_phase.nit b/src/frontend/serialization_phase.nit
index ccecc98..3a70e66 100644
--- a/src/frontend/serialization_phase.nit
+++ b/src/frontend/serialization_phase.nit
@@ -116,33 +116,17 @@ private class SerializationPhasePreModel
 	do
 		if not nclassdef isa AStdClassdef then return
 
-		# Is there a declaration on the classdef or the module?
-		var serialize = nclassdef.is_serialize
+		var serialize_by_default = nclassdef.how_serialize
 
-		if not serialize and not nclassdef.is_noserialize then
-			# Is the module marked serialize?
-			serialize = nclassdef.parent.as(AModule).is_serialize
-		end
+		if serialize_by_default != null then
 
-		var per_attribute = false
-		if not serialize then
-			# Is there an attribute marked serialize?
-			for npropdef in nclassdef.n_propdefs do
-				if npropdef.is_serialize then
-					serialize = true
-					per_attribute = true
-					break
-				end
-			end
-		end
-
-		if serialize then
 			# Add `super Serializable`
 			var sc = toolcontext.parse_superclass("Serializable")
 			sc.location = nclassdef.location
 			nclassdef.n_propdefs.add sc
 
 			# Add services
+			var per_attribute = not serialize_by_default
 			generate_serialization_method(nclassdef, per_attribute)
 			generate_deserialization_init(nclassdef, per_attribute)
 		end
@@ -156,7 +140,7 @@ private class SerializationPhasePreModel
 		# collect all classes
 		var auto_serializable_nclassdefs = new Array[AStdClassdef]
 		for nclassdef in nmodule.n_classdefs do
-			if nclassdef isa AStdClassdef and nclassdef.is_serialize then
+			if nclassdef isa AStdClassdef and nclassdef.how_serialize != null then
 				auto_serializable_nclassdefs.add nclassdef
 			end
 		end
@@ -213,7 +197,7 @@ do
 			var n_type = attribute.n_type
 			var type_name
 			if n_type == null then
-				# Use a place holder, we will replace it with the infered type after the model phases
+				# Use a place holder, we will replace it with the inferred type after the model phases
 				type_name = toolcontext.place_holder_type_name
 			else
 				type_name = n_type.type_name
@@ -222,8 +206,17 @@ do
 
 			code.add """
 	var {{{name}}} = v.deserialize_attribute("{{{name}}}")
-	assert {{{name}}} isa {{{type_name}}} else print "Unsupported type for `{class_name}::{{{name}}}`, got '{{{{name}}}.class_name}'; expected {{{type_name}}}"
-	self.{{{name}}} = {{{name}}}"""
+	if not {{{name}}} isa {{{type_name}}} then
+		# Check if it was a subjectent error
+		v.errors.add new AttributeTypeError("TODO remove this arg on c_src regen",
+			self, "{{{name}}}", {{{name}}}, "{{{type_name}}}")
+
+		# Clear subjacent error
+		if v.keep_going == false then return
+	else
+		self.{{{name}}} = {{{name}}}
+	end
+"""
 		end
 
 		code.add "end"
@@ -250,17 +243,17 @@ do
 
 		if deserializer_npropdef == null then
 			# create the property
-			code.add "	redef fun deserialize_class(name)"
+			code.add "	redef fun deserialize_class_intern(name)"
 			code.add "	do"
 		else
-			toolcontext.error(deserializer_npropdef.location, "Error: you cannot define `Deserializer::deserialize_class` in a module where you use `auto_serializable`.")
+			toolcontext.error(deserializer_npropdef.location, "Error: `Deserializer::deserialize_class_intern` is generated and must not be defined, use `deserialize_class` instead.")
 			return
 		end
 
 		for nclassdef in nclassdefs do
 			var name = nclassdef.n_id.text
 			if nclassdef.n_formaldefs.is_empty and
-				not nclassdef.n_classkind isa AAbstractClasskind then
+			   nclassdef.n_classkind isa AConcreteClasskind then
 
 				code.add "		if name == \"{name}\" then return new {name}.from_deserializer(self)"
 			end
@@ -346,7 +339,7 @@ redef class AModule
 	private fun deserializer_nclassdef: nullable AStdClassdef
 	do
 		for nclassdef in n_classdefs do
-			if nclassdef isa AStdClassdef and nclassdef.n_id.text == "Deserialization" then
+			if nclassdef isa AStdClassdef and nclassdef.n_id.text == "Deserializer" then
 				return nclassdef
 			end
 		end
@@ -364,11 +357,41 @@ redef class AStdClassdef
 	do
 		for npropdef in n_propdefs do if npropdef isa AMethPropdef then
 			var id = npropdef.n_methid
-			if id isa AIdMethid and id.n_id.text == "deserialize_class" then
+			if id isa AIdMethid and id.n_id.text == "deserialize_class_intern" then
 				return npropdef
 			end
 		end
 
 		return null
 	end
+
+	# Is this classed marked `serialize`? in part or fully?
+	#
+	# This method returns 3 possible values:
+	# * `null`, this class is not to be serialized.
+	# * `true`, the attributes of this class are to be serialized by default.
+	# * `false`, the attributes of this class are to be serialized on demand only.
+	fun how_serialize: nullable Bool
+	do
+		# Is there a declaration on the classdef or the module?
+		var serialize = is_serialize
+
+		if not serialize and not is_noserialize then
+			# Is the module marked serialize?
+			serialize = parent.as(AModule).is_serialize
+		end
+
+		if serialize then return true
+
+		if not serialize then
+			# Is there an attribute marked serialize?
+			for npropdef in n_propdefs do
+				if npropdef.is_serialize then
+					return false
+				end
+			end
+		end
+
+		return null
+	end
 end