Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Aug 26, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f92f697
frontend/serialization: fix skipping type check for `nullable Object`…
xymus Aug 26, 2016
1a3f6ef
binary::serialization: fix if condition
xymus Aug 26, 2016
6f63770
lib/serialization: better doc for `AttributeTypeError`
xymus Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/binary/serialization.nit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/serialization/serialization.nit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/serialization_phase.nit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}}")
Expand Down