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

diff --git a/src/frontend/serialization_phase.nit b/src/frontend/serialization_phase.nit
index 87b7433..358f211 100644
--- a/src/frontend/serialization_phase.nit
+++ b/src/frontend/serialization_phase.nit
@@ -56,7 +56,6 @@ redef class ADefinition
 	end
 end
 
-# TODO add annotations on attributes (volatile, sensitive or do_not_serialize?)
 private class SerializationPhasePreModel
 	super Phase
 
@@ -116,33 +115,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
-
-		if not serialize and not nclassdef.is_noserialize then
-			# Is the module marked serialize?
-			serialize = nclassdef.parent.as(AModule).is_serialize
-		end
+		var serialize_by_default = nclassdef.how_serialize
 
-		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_by_default != null then
 
-		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 +139,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
@@ -269,7 +252,7 @@ do
 		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
@@ -380,4 +363,34 @@ redef class AStdClassdef
 
 		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