nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend/i18n: escape % in internationalized strings
[nit.git]
/
src
/
frontend
/
serialization_phase.nit
diff --git
a/src/frontend/serialization_phase.nit
b/src/frontend/serialization_phase.nit
index
a16aa6b
..
e48e537
100644
(file)
--- a/
src/frontend/serialization_phase.nit
+++ b/
src/frontend/serialization_phase.nit
@@
-56,7
+56,6
@@
redef class ADefinition
end
end
end
end
-# TODO add annotations on attributes (volatile, sensitive or do_not_serialize?)
private class SerializationPhasePreModel
super Phase
private class SerializationPhasePreModel
super Phase
@@
-140,7
+139,7
@@
private class SerializationPhasePreModel
# collect all classes
var auto_serializable_nclassdefs = new Array[AStdClassdef]
for nclassdef in nmodule.n_classdefs do
# 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
auto_serializable_nclassdefs.add nclassdef
end
end
@@
-251,9
+250,9
@@
do
end
for nclassdef in nclassdefs do
end
for nclassdef in nclassdefs do
- var name = nclassdef.n_id.text
+ var name = nclassdef.n_qid.n_id.text
if nclassdef.n_formaldefs.is_empty and
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
code.add " if name == \"{name}\" then return new {name}.from_deserializer(self)"
end
@@
-322,7
+321,7
@@
end
redef class AType
private fun type_name: String
do
redef class AType
private fun type_name: String
do
- var name = n_id.text
+ var name = n_qid.n_id.text
if n_kwnullable != null then name = "nullable {name}"
if n_kwnullable != null then name = "nullable {name}"
@@
-339,7
+338,7
@@
redef class AModule
private fun deserializer_nclassdef: nullable AStdClassdef
do
for nclassdef in n_classdefs do
private fun deserializer_nclassdef: nullable AStdClassdef
do
for nclassdef in n_classdefs do
- if nclassdef isa AStdClassdef and nclassdef.n_id.text == "Deserializer" then
+ if nclassdef isa AStdClassdef and nclassdef.n_qid.n_id.text == "Deserializer" then
return nclassdef
end
end
return nclassdef
end
end