From a143bf497d16cfbc75011e42b65730f81549ca37 Mon Sep 17 00:00:00 2001
From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Mon, 5 Dec 2016 13:23:09 -0500
Subject: [PATCH] tests: fix model_json output with alphabetical order

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
---
 .../test_classdefs_to_full_json.res                |  282 ++++++-------
 .../test_classes_to_full_json.res                  |  434 ++++++++++----------
 .../test_modules_to_full_json.res                  |   84 ++--
 .../test_packages_to_full_json.res                 |    4 +-
 .../test_props_to_full_json.res                    |    6 +-
 5 files changed, 405 insertions(+), 405 deletions(-)

diff --git a/src/model/test_model_json.sav/test_classdefs_to_full_json.res b/src/model/test_model_json.sav/test_classdefs_to_full_json.res
index 2dd320b..404065b 100644
--- a/src/model/test_model_json.sav/test_classdefs_to_full_json.res
+++ b/src/model/test_model_json.sav/test_classdefs_to_full_json.res
@@ -30,20 +30,20 @@
 		"full_name": "test_prog::Object"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Object$OTHER"
+		"full_name": "test_prog$Object$!="
 	}, {
 		"full_name": "test_prog$Object$=="
 	}, {
-		"full_name": "test_prog$Object$!="
+		"full_name": "test_prog$Object$OTHER"
 	}, {
 		"full_name": "test_prog$Object$init"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -54,11 +54,11 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Object$OTHER"
+		"full_name": "test_prog$Object$!="
 	}, {
 		"full_name": "test_prog$Object$=="
 	}, {
-		"full_name": "test_prog$Object$!="
+		"full_name": "test_prog$Object$OTHER"
 	}, {
 		"full_name": "test_prog$Object$init"
 	}],
@@ -96,34 +96,34 @@
 		"full_name": "test_prog::Int"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Int$unary -"
+		"full_name": "test_prog$Int$*"
 	}, {
 		"full_name": "test_prog$Int$+"
 	}, {
 		"full_name": "test_prog$Int$-"
 	}, {
-		"full_name": "test_prog$Int$*"
-	}, {
 		"full_name": "test_prog$Int$/"
 	}, {
 		"full_name": "test_prog$Int$>"
 	}, {
 		"full_name": "test_prog$Int$to_f"
+	}, {
+		"full_name": "test_prog$Int$unary -"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Int::unary -"
+		"full_name": "test_prog::Int::*"
 	}, {
 		"full_name": "test_prog::Int::+"
 	}, {
 		"full_name": "test_prog::Int::-"
 	}, {
-		"full_name": "test_prog::Int::*"
-	}, {
 		"full_name": "test_prog::Int::/"
 	}, {
 		"full_name": "test_prog::Int::>"
 	}, {
 		"full_name": "test_prog::Int::to_f"
+	}, {
+		"full_name": "test_prog::Int::unary -"
 	}],
 	"intro": {
 		"full_name": "test_prog$Int"
@@ -132,19 +132,19 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Int$unary -"
+		"full_name": "test_prog$Int$*"
 	}, {
 		"full_name": "test_prog$Int$+"
 	}, {
 		"full_name": "test_prog$Int$-"
 	}, {
-		"full_name": "test_prog$Int$*"
-	}, {
 		"full_name": "test_prog$Int$/"
 	}, {
 		"full_name": "test_prog$Int$>"
 	}, {
 		"full_name": "test_prog$Int$to_f"
+	}, {
+		"full_name": "test_prog$Int$unary -"
 	}],
 	"redef_mpropdefs": []
 }
@@ -180,23 +180,23 @@
 		"full_name": "test_prog::Float"
 	},
 	"mpropdefs": [{
+		"full_name": "test_prog$Float$*"
+	}, {
 		"full_name": "test_prog$Float$+"
 	}, {
 		"full_name": "test_prog$Float$-"
 	}, {
-		"full_name": "test_prog$Float$*"
-	}, {
 		"full_name": "test_prog$Float$/"
 	}, {
 		"full_name": "test_prog$Float$>"
 	}],
 	"intro_mproperties": [{
+		"full_name": "test_prog::Float::*"
+	}, {
 		"full_name": "test_prog::Float::+"
 	}, {
 		"full_name": "test_prog::Float::-"
 	}, {
-		"full_name": "test_prog::Float::*"
-	}, {
 		"full_name": "test_prog::Float::/"
 	}, {
 		"full_name": "test_prog::Float::>"
@@ -208,12 +208,12 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
+		"full_name": "test_prog$Float$*"
+	}, {
 		"full_name": "test_prog$Float$+"
 	}, {
 		"full_name": "test_prog$Float$-"
 	}, {
-		"full_name": "test_prog$Float$*"
-	}, {
 		"full_name": "test_prog$Float$/"
 	}, {
 		"full_name": "test_prog$Float$>"
@@ -384,44 +384,44 @@
 		"full_name": "test_prog::Career"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Career$_strength_bonus"
-	}, {
-		"full_name": "test_prog$Career$strength_bonus"
+		"full_name": "test_prog$Career$_endurance_bonus"
 	}, {
-		"full_name": "test_prog$Career$strength_bonus="
+		"full_name": "test_prog$Career$_intelligence_bonus"
 	}, {
-		"full_name": "test_prog$Career$_endurance_bonus"
+		"full_name": "test_prog$Career$_strength_bonus"
 	}, {
 		"full_name": "test_prog$Career$endurance_bonus"
 	}, {
 		"full_name": "test_prog$Career$endurance_bonus="
 	}, {
-		"full_name": "test_prog$Career$_intelligence_bonus"
+		"full_name": "test_prog$Career$Object::init"
 	}, {
 		"full_name": "test_prog$Career$intelligence_bonus"
 	}, {
 		"full_name": "test_prog$Career$intelligence_bonus="
 	}, {
-		"full_name": "test_prog$Career$Object::init"
+		"full_name": "test_prog$Career$strength_bonus"
+	}, {
+		"full_name": "test_prog$Career$strength_bonus="
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::careers::Career::_strength_bonus"
-	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
 	}, {
-		"full_name": "test_prog::careers::Career::_endurance_bonus"
+		"full_name": "test_prog::careers::Career::_strength_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
-	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
+	}, {
+		"full_name": "test_prog::Career::strength_bonus"
+	}, {
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"intro": {
 		"full_name": "test_prog$Career"
@@ -430,23 +430,23 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Career$_strength_bonus"
-	}, {
-		"full_name": "test_prog$Career$strength_bonus"
+		"full_name": "test_prog$Career$_endurance_bonus"
 	}, {
-		"full_name": "test_prog$Career$strength_bonus="
+		"full_name": "test_prog$Career$_intelligence_bonus"
 	}, {
-		"full_name": "test_prog$Career$_endurance_bonus"
+		"full_name": "test_prog$Career$_strength_bonus"
 	}, {
 		"full_name": "test_prog$Career$endurance_bonus"
 	}, {
 		"full_name": "test_prog$Career$endurance_bonus="
 	}, {
-		"full_name": "test_prog$Career$_intelligence_bonus"
-	}, {
 		"full_name": "test_prog$Career$intelligence_bonus"
 	}, {
 		"full_name": "test_prog$Career$intelligence_bonus="
+	}, {
+		"full_name": "test_prog$Career$strength_bonus"
+	}, {
+		"full_name": "test_prog$Career$strength_bonus="
 	}],
 	"redef_mpropdefs": [{
 		"full_name": "test_prog$Career$Object::init"
@@ -622,44 +622,44 @@
 		"full_name": "test_prog::Race"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Race$_base_strength"
-	}, {
-		"full_name": "test_prog$Race$base_strength"
+		"full_name": "test_prog$Race$_base_endurance"
 	}, {
-		"full_name": "test_prog$Race$base_strength="
+		"full_name": "test_prog$Race$_base_intelligence"
 	}, {
-		"full_name": "test_prog$Race$_base_endurance"
+		"full_name": "test_prog$Race$_base_strength"
 	}, {
 		"full_name": "test_prog$Race$base_endurance"
 	}, {
 		"full_name": "test_prog$Race$base_endurance="
 	}, {
-		"full_name": "test_prog$Race$_base_intelligence"
-	}, {
 		"full_name": "test_prog$Race$base_intelligence"
 	}, {
 		"full_name": "test_prog$Race$base_intelligence="
 	}, {
+		"full_name": "test_prog$Race$base_strength"
+	}, {
+		"full_name": "test_prog$Race$base_strength="
+	}, {
 		"full_name": "test_prog$Race$Object::init"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::races::Race::_base_strength"
-	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::races::Race::_base_intelligence"
 	}, {
-		"full_name": "test_prog::races::Race::_base_endurance"
+		"full_name": "test_prog::races::Race::_base_strength"
 	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
+	}, {
+		"full_name": "test_prog::Race::base_strength"
+	}, {
+		"full_name": "test_prog::Race::base_strength="
 	}],
 	"intro": {
 		"full_name": "test_prog$Race"
@@ -668,23 +668,23 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Race$_base_strength"
-	}, {
-		"full_name": "test_prog$Race$base_strength"
+		"full_name": "test_prog$Race$_base_endurance"
 	}, {
-		"full_name": "test_prog$Race$base_strength="
+		"full_name": "test_prog$Race$_base_intelligence"
 	}, {
-		"full_name": "test_prog$Race$_base_endurance"
+		"full_name": "test_prog$Race$_base_strength"
 	}, {
 		"full_name": "test_prog$Race$base_endurance"
 	}, {
 		"full_name": "test_prog$Race$base_endurance="
 	}, {
-		"full_name": "test_prog$Race$_base_intelligence"
-	}, {
 		"full_name": "test_prog$Race$base_intelligence"
 	}, {
 		"full_name": "test_prog$Race$base_intelligence="
+	}, {
+		"full_name": "test_prog$Race$base_strength"
+	}, {
+		"full_name": "test_prog$Race$base_strength="
 	}],
 	"redef_mpropdefs": [{
 		"full_name": "test_prog$Race$Object::init"
@@ -906,100 +906,100 @@
 		"full_name": "test_prog::Character"
 	},
 	"mpropdefs": [{
+		"full_name": "test_prog$Character$_age"
+	}, {
+		"full_name": "test_prog$Character$_career"
+	}, {
+		"full_name": "test_prog$Character$_health"
+	}, {
+		"full_name": "test_prog$Character$_name"
+	}, {
 		"full_name": "test_prog$Character$_race"
 	}, {
-		"full_name": "test_prog$Character$race"
+		"full_name": "test_prog$Character$_sex"
 	}, {
-		"full_name": "test_prog$Character$race="
+		"full_name": "test_prog$Character$age"
 	}, {
-		"full_name": "test_prog$Character$_career"
+		"full_name": "test_prog$Character$age="
 	}, {
 		"full_name": "test_prog$Character$career"
 	}, {
 		"full_name": "test_prog$Character$career="
 	}, {
-		"full_name": "test_prog$Character$quit"
+		"full_name": "test_prog$Character$health"
 	}, {
-		"full_name": "test_prog$Character$_name"
+		"full_name": "test_prog$Character$health="
+	}, {
+		"full_name": "test_prog$Character$Object::init"
+	}, {
+		"full_name": "test_prog$Character$max_health"
 	}, {
 		"full_name": "test_prog$Character$name"
 	}, {
 		"full_name": "test_prog$Character$name="
 	}, {
-		"full_name": "test_prog$Character$_age"
-	}, {
-		"full_name": "test_prog$Character$age"
+		"full_name": "test_prog$Character$quit"
 	}, {
-		"full_name": "test_prog$Character$age="
+		"full_name": "test_prog$Character$race"
 	}, {
-		"full_name": "test_prog$Character$_sex"
+		"full_name": "test_prog$Character$race="
 	}, {
 		"full_name": "test_prog$Character$sex"
 	}, {
 		"full_name": "test_prog$Character$sex="
 	}, {
-		"full_name": "test_prog$Character$total_strengh"
-	}, {
 		"full_name": "test_prog$Character$total_endurance"
 	}, {
 		"full_name": "test_prog$Character$total_intelligence"
 	}, {
-		"full_name": "test_prog$Character$max_health"
+		"full_name": "test_prog$Character$total_strengh"
+	}],
+	"intro_mproperties": [{
+		"full_name": "test_prog::character::Character::_age"
 	}, {
-		"full_name": "test_prog$Character$_health"
+		"full_name": "test_prog::character::Character::_career"
 	}, {
-		"full_name": "test_prog$Character$health"
+		"full_name": "test_prog::character::Character::_health"
 	}, {
-		"full_name": "test_prog$Character$health="
+		"full_name": "test_prog::character::Character::_name"
 	}, {
-		"full_name": "test_prog$Character$Object::init"
-	}],
-	"intro_mproperties": [{
 		"full_name": "test_prog::character::Character::_race"
 	}, {
-		"full_name": "test_prog::Character::race"
+		"full_name": "test_prog::character::Character::_sex"
 	}, {
-		"full_name": "test_prog::Character::race="
+		"full_name": "test_prog::Character::age"
 	}, {
-		"full_name": "test_prog::character::Character::_career"
+		"full_name": "test_prog::Character::age="
 	}, {
 		"full_name": "test_prog::Character::career"
 	}, {
 		"full_name": "test_prog::Character::career="
 	}, {
-		"full_name": "test_prog::Character::quit"
+		"full_name": "test_prog::Character::health"
 	}, {
-		"full_name": "test_prog::character::Character::_name"
+		"full_name": "test_prog::Character::health="
+	}, {
+		"full_name": "test_prog::Character::max_health"
 	}, {
 		"full_name": "test_prog::Character::name"
 	}, {
 		"full_name": "test_prog::Character::name="
 	}, {
-		"full_name": "test_prog::character::Character::_age"
-	}, {
-		"full_name": "test_prog::Character::age"
+		"full_name": "test_prog::Character::quit"
 	}, {
-		"full_name": "test_prog::Character::age="
+		"full_name": "test_prog::Character::race"
 	}, {
-		"full_name": "test_prog::character::Character::_sex"
+		"full_name": "test_prog::Character::race="
 	}, {
 		"full_name": "test_prog::Character::sex"
 	}, {
 		"full_name": "test_prog::Character::sex="
 	}, {
-		"full_name": "test_prog::Character::total_strengh"
-	}, {
 		"full_name": "test_prog::Character::total_endurance"
 	}, {
 		"full_name": "test_prog::Character::total_intelligence"
 	}, {
-		"full_name": "test_prog::Character::max_health"
-	}, {
-		"full_name": "test_prog::character::Character::_health"
-	}, {
-		"full_name": "test_prog::Character::health"
-	}, {
-		"full_name": "test_prog::Character::health="
+		"full_name": "test_prog::Character::total_strengh"
 	}],
 	"intro": {
 		"full_name": "test_prog$Character"
@@ -1008,51 +1008,51 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
+		"full_name": "test_prog$Character$_age"
+	}, {
+		"full_name": "test_prog$Character$_career"
+	}, {
+		"full_name": "test_prog$Character$_health"
+	}, {
+		"full_name": "test_prog$Character$_name"
+	}, {
 		"full_name": "test_prog$Character$_race"
 	}, {
-		"full_name": "test_prog$Character$race"
+		"full_name": "test_prog$Character$_sex"
 	}, {
-		"full_name": "test_prog$Character$race="
+		"full_name": "test_prog$Character$age"
 	}, {
-		"full_name": "test_prog$Character$_career"
+		"full_name": "test_prog$Character$age="
 	}, {
 		"full_name": "test_prog$Character$career"
 	}, {
 		"full_name": "test_prog$Character$career="
 	}, {
-		"full_name": "test_prog$Character$quit"
+		"full_name": "test_prog$Character$health"
 	}, {
-		"full_name": "test_prog$Character$_name"
+		"full_name": "test_prog$Character$health="
+	}, {
+		"full_name": "test_prog$Character$max_health"
 	}, {
 		"full_name": "test_prog$Character$name"
 	}, {
 		"full_name": "test_prog$Character$name="
 	}, {
-		"full_name": "test_prog$Character$_age"
-	}, {
-		"full_name": "test_prog$Character$age"
+		"full_name": "test_prog$Character$quit"
 	}, {
-		"full_name": "test_prog$Character$age="
+		"full_name": "test_prog$Character$race"
 	}, {
-		"full_name": "test_prog$Character$_sex"
+		"full_name": "test_prog$Character$race="
 	}, {
 		"full_name": "test_prog$Character$sex"
 	}, {
 		"full_name": "test_prog$Character$sex="
 	}, {
-		"full_name": "test_prog$Character$total_strengh"
-	}, {
 		"full_name": "test_prog$Character$total_endurance"
 	}, {
 		"full_name": "test_prog$Character$total_intelligence"
 	}, {
-		"full_name": "test_prog$Character$max_health"
-	}, {
-		"full_name": "test_prog$Character$_health"
-	}, {
-		"full_name": "test_prog$Character$health"
-	}, {
-		"full_name": "test_prog$Character$health="
+		"full_name": "test_prog$Character$total_strengh"
 	}],
 	"redef_mpropdefs": [{
 		"full_name": "test_prog$Character$Object::init"
@@ -1184,24 +1184,24 @@
 		"full_name": "test_prog::Combatable"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Combatable$hit_points"
-	}, {
 		"full_name": "test_prog$Combatable$attack"
 	}, {
+		"full_name": "test_prog$Combatable$defend"
+	}, {
 		"full_name": "test_prog$Combatable$direct_attack"
 	}, {
-		"full_name": "test_prog$Combatable$defend"
+		"full_name": "test_prog$Combatable$hit_points"
 	}, {
 		"full_name": "test_prog$Combatable$is_dead"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Combatable::hit_points"
-	}, {
 		"full_name": "test_prog::Combatable::attack"
 	}, {
+		"full_name": "test_prog::Combatable::defend"
+	}, {
 		"full_name": "test_prog::Combatable::direct_attack"
 	}, {
-		"full_name": "test_prog::Combatable::defend"
+		"full_name": "test_prog::Combatable::hit_points"
 	}, {
 		"full_name": "test_prog::Combatable::is_dead"
 	}],
@@ -1212,13 +1212,13 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Combatable$hit_points"
-	}, {
 		"full_name": "test_prog$Combatable$attack"
 	}, {
+		"full_name": "test_prog$Combatable$defend"
+	}, {
 		"full_name": "test_prog$Combatable$direct_attack"
 	}, {
-		"full_name": "test_prog$Combatable$defend"
+		"full_name": "test_prog$Combatable$hit_points"
 	}, {
 		"full_name": "test_prog$Combatable$is_dead"
 	}],
@@ -1256,25 +1256,25 @@
 		"full_name": "test_prog::Game"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Game$player_characters"
-	}, {
 		"full_name": "test_prog$Game$computer_characters"
 	}, {
-		"full_name": "test_prog$Game$start_game"
-	}, {
 		"full_name": "test_prog$Game$pause_game"
 	}, {
+		"full_name": "test_prog$Game$player_characters"
+	}, {
+		"full_name": "test_prog$Game$start_game"
+	}, {
 		"full_name": "test_prog$Game$stop_game"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Game::player_characters"
-	}, {
 		"full_name": "test_prog::Game::computer_characters"
 	}, {
-		"full_name": "test_prog::Game::start_game"
-	}, {
 		"full_name": "test_prog::Game::pause_game"
 	}, {
+		"full_name": "test_prog::Game::player_characters"
+	}, {
+		"full_name": "test_prog::Game::start_game"
+	}, {
 		"full_name": "test_prog::Game::stop_game"
 	}],
 	"intro": {
@@ -1284,14 +1284,14 @@
 		"full_name": "test_prog"
 	},
 	"intro_mpropdefs": [{
-		"full_name": "test_prog$Game$player_characters"
-	}, {
 		"full_name": "test_prog$Game$computer_characters"
 	}, {
-		"full_name": "test_prog$Game$start_game"
-	}, {
 		"full_name": "test_prog$Game$pause_game"
 	}, {
+		"full_name": "test_prog$Game$player_characters"
+	}, {
+		"full_name": "test_prog$Game$start_game"
+	}, {
 		"full_name": "test_prog$Game$stop_game"
 	}],
 	"redef_mpropdefs": []
diff --git a/src/model/test_model_json.sav/test_classes_to_full_json.res b/src/model/test_model_json.sav/test_classes_to_full_json.res
index 2fc7104..d5eb364 100644
--- a/src/model/test_model_json.sav/test_classes_to_full_json.res
+++ b/src/model/test_model_json.sav/test_classes_to_full_json.res
@@ -35,20 +35,20 @@
 		"full_name": "test_prog$Object"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -92,42 +92,42 @@
 		"full_name": "test_prog$Int"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Int::unary -"
+		"full_name": "test_prog::Object::!="
+	}, {
+		"full_name": "test_prog::Int::*"
 	}, {
 		"full_name": "test_prog::Int::+"
 	}, {
 		"full_name": "test_prog::Int::-"
 	}, {
-		"full_name": "test_prog::Int::*"
-	}, {
 		"full_name": "test_prog::Int::/"
 	}, {
-		"full_name": "test_prog::Int::>"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Int::to_f"
+		"full_name": "test_prog::Int::>"
 	}, {
 		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Object::init"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Int::to_f"
 	}, {
-		"full_name": "test_prog::Object::init"
+		"full_name": "test_prog::Int::unary -"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Int::unary -"
+		"full_name": "test_prog::Int::*"
 	}, {
 		"full_name": "test_prog::Int::+"
 	}, {
 		"full_name": "test_prog::Int::-"
 	}, {
-		"full_name": "test_prog::Int::*"
-	}, {
 		"full_name": "test_prog::Int::/"
 	}, {
 		"full_name": "test_prog::Int::>"
 	}, {
 		"full_name": "test_prog::Int::to_f"
+	}, {
+		"full_name": "test_prog::Int::unary -"
 	}],
 	"redef_mproperties": [],
 	"parents": [{
@@ -171,31 +171,31 @@
 		"full_name": "test_prog$Float"
 	}],
 	"all_mproperties": [{
+		"full_name": "test_prog::Object::!="
+	}, {
+		"full_name": "test_prog::Float::*"
+	}, {
 		"full_name": "test_prog::Float::+"
 	}, {
 		"full_name": "test_prog::Float::-"
 	}, {
-		"full_name": "test_prog::Float::*"
-	}, {
 		"full_name": "test_prog::Float::/"
 	}, {
+		"full_name": "test_prog::Object::=="
+	}, {
 		"full_name": "test_prog::Float::>"
 	}, {
 		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Object::=="
-	}, {
-		"full_name": "test_prog::Object::!="
-	}, {
 		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [{
+		"full_name": "test_prog::Float::*"
+	}, {
 		"full_name": "test_prog::Float::+"
 	}, {
 		"full_name": "test_prog::Float::-"
 	}, {
-		"full_name": "test_prog::Float::*"
-	}, {
 		"full_name": "test_prog::Float::/"
 	}, {
 		"full_name": "test_prog::Float::>"
@@ -242,11 +242,11 @@
 		"full_name": "test_prog$Bool"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -293,11 +293,11 @@
 		"full_name": "test_prog$String"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -350,11 +350,11 @@
 		"full_name": "test_prog$List"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -401,50 +401,50 @@
 		"full_name": "test_prog$Career"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::careers::Career::_strength_bonus"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+	}, {
+		"full_name": "test_prog::careers::Career::_strength_bonus"
+	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+		"full_name": "test_prog::Object::init"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
 	}, {
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::Object::OTHER"
-	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Career::strength_bonus"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::careers::Career::_strength_bonus"
-	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
 	}, {
-		"full_name": "test_prog::careers::Career::_endurance_bonus"
+		"full_name": "test_prog::careers::Career::_strength_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
-	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
+	}, {
+		"full_name": "test_prog::Career::strength_bonus"
+	}, {
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"redef_mproperties": [{
 		"full_name": "test_prog::Object::init"
@@ -490,31 +490,31 @@
 		"full_name": "test_prog$Warrior"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::careers::Career::_strength_bonus"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+	}, {
+		"full_name": "test_prog::careers::Career::_strength_bonus"
+	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+		"full_name": "test_prog::Object::init"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
-	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Career::strength_bonus"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
@@ -561,31 +561,31 @@
 		"full_name": "test_prog$Magician"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::careers::Career::_strength_bonus"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+	}, {
+		"full_name": "test_prog::careers::Career::_strength_bonus"
+	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+		"full_name": "test_prog::Object::init"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
-	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Career::strength_bonus"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
@@ -632,31 +632,31 @@
 		"full_name": "test_prog$Alcoholic"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::careers::Career::_strength_bonus"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Career::strength_bonus="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::careers::Career::_endurance_bonus"
 	}, {
+		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+	}, {
+		"full_name": "test_prog::careers::Career::_strength_bonus"
+	}, {
 		"full_name": "test_prog::Career::endurance_bonus"
 	}, {
 		"full_name": "test_prog::Career::endurance_bonus="
 	}, {
-		"full_name": "test_prog::careers::Career::_intelligence_bonus"
+		"full_name": "test_prog::Object::init"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus"
 	}, {
 		"full_name": "test_prog::Career::intelligence_bonus="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
-	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Career::strength_bonus"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Career::strength_bonus="
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
@@ -703,50 +703,50 @@
 		"full_name": "test_prog$Race"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::races::Race::_base_strength"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
+		"full_name": "test_prog::races::Race::_base_intelligence"
+	}, {
+		"full_name": "test_prog::races::Race::_base_strength"
+	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
 	}, {
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Race::base_strength"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Race::base_strength="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::races::Race::_base_strength"
-	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::races::Race::_base_intelligence"
 	}, {
-		"full_name": "test_prog::races::Race::_base_endurance"
+		"full_name": "test_prog::races::Race::_base_strength"
 	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
+	}, {
+		"full_name": "test_prog::Race::base_strength"
+	}, {
+		"full_name": "test_prog::Race::base_strength="
 	}],
 	"redef_mproperties": [{
 		"full_name": "test_prog::Object::init"
@@ -792,31 +792,31 @@
 		"full_name": "test_prog$Human"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::races::Race::_base_strength"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
+		"full_name": "test_prog::races::Race::_base_intelligence"
+	}, {
+		"full_name": "test_prog::races::Race::_base_strength"
+	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Race::base_strength"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Race::base_strength="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
@@ -865,39 +865,39 @@
 		"full_name": "test_prog::combat$Dwarf"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Weapon::dps"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::races::Race::_base_strength"
+		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::races::Race::_base_intelligence"
 	}, {
-		"full_name": "test_prog::races::Race::_base_endurance"
+		"full_name": "test_prog::races::Race::_base_strength"
 	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Race::base_strength"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Race::base_strength="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Weapon::dps"
+	}, {
+		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
 		"full_name": "test_prog::Weapon::dps"
+	}, {
+		"full_name": "test_prog::Object::init"
 	}],
 	"parents": [{
 		"full_name": "test_prog::Race"
@@ -942,31 +942,31 @@
 		"full_name": "test_prog$Elf"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
-		"full_name": "test_prog::races::Race::_base_strength"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Race::base_strength"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Race::base_strength="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::races::Race::_base_endurance"
 	}, {
+		"full_name": "test_prog::races::Race::_base_intelligence"
+	}, {
+		"full_name": "test_prog::races::Race::_base_strength"
+	}, {
 		"full_name": "test_prog::Race::base_endurance"
 	}, {
 		"full_name": "test_prog::Race::base_endurance="
 	}, {
-		"full_name": "test_prog::races::Race::_base_intelligence"
-	}, {
 		"full_name": "test_prog::Race::base_intelligence"
 	}, {
 		"full_name": "test_prog::Race::base_intelligence="
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Race::base_strength"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Race::base_strength="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::init"
 	}],
 	"intro_mproperties": [],
 	"redef_mproperties": [{
@@ -1015,126 +1015,126 @@
 		"full_name": "test_prog::combat$Character"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::character::Character::_race"
-	}, {
-		"full_name": "test_prog::Character::race"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Character::race="
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::character::Character::_career"
+		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Character::career"
+		"full_name": "test_prog::character::Character::_age"
 	}, {
-		"full_name": "test_prog::Character::career="
+		"full_name": "test_prog::character::Character::_career"
 	}, {
-		"full_name": "test_prog::Character::quit"
+		"full_name": "test_prog::character::Character::_health"
 	}, {
 		"full_name": "test_prog::character::Character::_name"
 	}, {
-		"full_name": "test_prog::Character::name"
-	}, {
-		"full_name": "test_prog::Character::name="
+		"full_name": "test_prog::character::Character::_race"
 	}, {
-		"full_name": "test_prog::character::Character::_age"
+		"full_name": "test_prog::character::Character::_sex"
 	}, {
 		"full_name": "test_prog::Character::age"
 	}, {
 		"full_name": "test_prog::Character::age="
 	}, {
-		"full_name": "test_prog::character::Character::_sex"
-	}, {
-		"full_name": "test_prog::Character::sex"
-	}, {
-		"full_name": "test_prog::Character::sex="
-	}, {
-		"full_name": "test_prog::Character::total_strengh"
+		"full_name": "test_prog::Combatable::attack"
 	}, {
-		"full_name": "test_prog::Character::total_endurance"
+		"full_name": "test_prog::Character::career"
 	}, {
-		"full_name": "test_prog::Character::total_intelligence"
+		"full_name": "test_prog::Character::career="
 	}, {
-		"full_name": "test_prog::Character::max_health"
+		"full_name": "test_prog::Combatable::defend"
 	}, {
-		"full_name": "test_prog::character::Character::_health"
+		"full_name": "test_prog::Combatable::direct_attack"
 	}, {
 		"full_name": "test_prog::Character::health"
 	}, {
 		"full_name": "test_prog::Character::health="
 	}, {
+		"full_name": "test_prog::Combatable::hit_points"
+	}, {
 		"full_name": "test_prog::Object::init"
 	}, {
-		"full_name": "test_prog::Combatable::hit_points"
+		"full_name": "test_prog::Combatable::is_dead"
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Character::max_health"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Character::name"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Character::name="
 	}, {
-		"full_name": "test_prog::Combatable::attack"
+		"full_name": "test_prog::Character::quit"
 	}, {
-		"full_name": "test_prog::Combatable::direct_attack"
+		"full_name": "test_prog::Character::race"
 	}, {
-		"full_name": "test_prog::Combatable::defend"
+		"full_name": "test_prog::Character::race="
 	}, {
-		"full_name": "test_prog::Combatable::is_dead"
+		"full_name": "test_prog::Character::sex"
+	}, {
+		"full_name": "test_prog::Character::sex="
+	}, {
+		"full_name": "test_prog::Character::total_endurance"
+	}, {
+		"full_name": "test_prog::Character::total_intelligence"
+	}, {
+		"full_name": "test_prog::Character::total_strengh"
 	}],
 	"intro_mproperties": [{
+		"full_name": "test_prog::character::Character::_age"
+	}, {
+		"full_name": "test_prog::character::Character::_career"
+	}, {
+		"full_name": "test_prog::character::Character::_health"
+	}, {
+		"full_name": "test_prog::character::Character::_name"
+	}, {
 		"full_name": "test_prog::character::Character::_race"
 	}, {
-		"full_name": "test_prog::Character::race"
+		"full_name": "test_prog::character::Character::_sex"
 	}, {
-		"full_name": "test_prog::Character::race="
+		"full_name": "test_prog::Character::age"
 	}, {
-		"full_name": "test_prog::character::Character::_career"
+		"full_name": "test_prog::Character::age="
 	}, {
 		"full_name": "test_prog::Character::career"
 	}, {
 		"full_name": "test_prog::Character::career="
 	}, {
-		"full_name": "test_prog::Character::quit"
+		"full_name": "test_prog::Character::health"
 	}, {
-		"full_name": "test_prog::character::Character::_name"
+		"full_name": "test_prog::Character::health="
+	}, {
+		"full_name": "test_prog::Character::max_health"
 	}, {
 		"full_name": "test_prog::Character::name"
 	}, {
 		"full_name": "test_prog::Character::name="
 	}, {
-		"full_name": "test_prog::character::Character::_age"
-	}, {
-		"full_name": "test_prog::Character::age"
+		"full_name": "test_prog::Character::quit"
 	}, {
-		"full_name": "test_prog::Character::age="
+		"full_name": "test_prog::Character::race"
 	}, {
-		"full_name": "test_prog::character::Character::_sex"
+		"full_name": "test_prog::Character::race="
 	}, {
 		"full_name": "test_prog::Character::sex"
 	}, {
 		"full_name": "test_prog::Character::sex="
 	}, {
-		"full_name": "test_prog::Character::total_strengh"
-	}, {
 		"full_name": "test_prog::Character::total_endurance"
 	}, {
 		"full_name": "test_prog::Character::total_intelligence"
 	}, {
-		"full_name": "test_prog::Character::max_health"
-	}, {
-		"full_name": "test_prog::character::Character::_health"
-	}, {
-		"full_name": "test_prog::Character::health"
-	}, {
-		"full_name": "test_prog::Character::health="
+		"full_name": "test_prog::Character::total_strengh"
 	}],
 	"redef_mproperties": [{
-		"full_name": "test_prog::Object::init"
-	}, {
 		"full_name": "test_prog::Combatable::hit_points"
+	}, {
+		"full_name": "test_prog::Object::init"
 	}],
 	"parents": [{
-		"full_name": "test_prog::Object"
-	}, {
 		"full_name": "test_prog::Combatable"
+	}, {
+		"full_name": "test_prog::Object"
 	}]
 }
 {
@@ -1174,13 +1174,13 @@
 		"full_name": "test_prog$Weapon"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Weapon::dps"
-	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
+	}, {
+		"full_name": "test_prog::Weapon::dps"
 	}, {
 		"full_name": "test_prog::Object::init"
 	}],
@@ -1229,32 +1229,32 @@
 		"full_name": "test_prog$Combatable"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Combatable::hit_points"
-	}, {
-		"full_name": "test_prog::Combatable::attack"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Combatable::direct_attack"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Combatable::defend"
+		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Combatable::is_dead"
+		"full_name": "test_prog::Combatable::attack"
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Combatable::defend"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Combatable::direct_attack"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Combatable::hit_points"
 	}, {
 		"full_name": "test_prog::Object::init"
+	}, {
+		"full_name": "test_prog::Combatable::is_dead"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Combatable::hit_points"
-	}, {
 		"full_name": "test_prog::Combatable::attack"
 	}, {
+		"full_name": "test_prog::Combatable::defend"
+	}, {
 		"full_name": "test_prog::Combatable::direct_attack"
 	}, {
-		"full_name": "test_prog::Combatable::defend"
+		"full_name": "test_prog::Combatable::hit_points"
 	}, {
 		"full_name": "test_prog::Combatable::is_dead"
 	}],
@@ -1300,33 +1300,33 @@
 		"full_name": "test_prog$Game"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Game::player_characters"
+		"full_name": "test_prog::Object::!="
 	}, {
-		"full_name": "test_prog::Game::computer_characters"
+		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Game::start_game"
+		"full_name": "test_prog::Object::OTHER"
 	}, {
-		"full_name": "test_prog::Game::pause_game"
+		"full_name": "test_prog::Game::computer_characters"
 	}, {
-		"full_name": "test_prog::Game::stop_game"
+		"full_name": "test_prog::Object::init"
 	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Game::pause_game"
 	}, {
-		"full_name": "test_prog::Object::=="
+		"full_name": "test_prog::Game::player_characters"
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Game::start_game"
 	}, {
-		"full_name": "test_prog::Object::init"
+		"full_name": "test_prog::Game::stop_game"
 	}],
 	"intro_mproperties": [{
-		"full_name": "test_prog::Game::player_characters"
-	}, {
 		"full_name": "test_prog::Game::computer_characters"
 	}, {
-		"full_name": "test_prog::Game::start_game"
-	}, {
 		"full_name": "test_prog::Game::pause_game"
 	}, {
+		"full_name": "test_prog::Game::player_characters"
+	}, {
+		"full_name": "test_prog::Game::start_game"
+	}, {
 		"full_name": "test_prog::Game::stop_game"
 	}],
 	"redef_mproperties": [],
@@ -1362,15 +1362,15 @@
 		"full_name": "test_prog$Starter"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Starter::start"
-	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
+	}, {
+		"full_name": "test_prog::Starter::start"
 	}],
 	"intro_mproperties": [{
 		"full_name": "test_prog::Starter::start"
@@ -1408,15 +1408,15 @@
 		"full_name": "test_prog$Sys"
 	}],
 	"all_mproperties": [{
-		"full_name": "test_prog::Sys::main"
-	}, {
-		"full_name": "test_prog::Object::OTHER"
+		"full_name": "test_prog::Object::!="
 	}, {
 		"full_name": "test_prog::Object::=="
 	}, {
-		"full_name": "test_prog::Object::!="
+		"full_name": "test_prog::Object::OTHER"
 	}, {
 		"full_name": "test_prog::Object::init"
+	}, {
+		"full_name": "test_prog::Sys::main"
 	}],
 	"intro_mproperties": [{
 		"full_name": "test_prog::Sys::main"
diff --git a/src/model/test_model_json.sav/test_modules_to_full_json.res b/src/model/test_model_json.sav/test_modules_to_full_json.res
index 92690d1..e0c653a 100644
--- a/src/model/test_model_json.sav/test_modules_to_full_json.res
+++ b/src/model/test_model_json.sav/test_modules_to_full_json.res
@@ -97,43 +97,43 @@
 		"full_name": "test_prog>platform>"
 	},
 	"intro_mclasses": [{
-		"full_name": "test_prog::Object"
+		"full_name": "test_prog::Bool"
+	}, {
+		"full_name": "test_prog::Float"
 	}, {
 		"full_name": "test_prog::Int"
 	}, {
-		"full_name": "test_prog::Float"
+		"full_name": "test_prog::List"
 	}, {
-		"full_name": "test_prog::Bool"
+		"full_name": "test_prog::Object"
 	}, {
 		"full_name": "test_prog::String"
-	}, {
-		"full_name": "test_prog::List"
 	}],
 	"mclassdefs": [{
-		"full_name": "test_prog$Object"
+		"full_name": "test_prog$Bool"
+	}, {
+		"full_name": "test_prog$Float"
 	}, {
 		"full_name": "test_prog$Int"
 	}, {
-		"full_name": "test_prog$Float"
+		"full_name": "test_prog$List"
 	}, {
-		"full_name": "test_prog$Bool"
+		"full_name": "test_prog$Object"
 	}, {
 		"full_name": "test_prog$String"
-	}, {
-		"full_name": "test_prog$List"
 	}],
 	"intro_mclassdefs": [{
-		"full_name": "test_prog$Object"
+		"full_name": "test_prog$Bool"
+	}, {
+		"full_name": "test_prog$Float"
 	}, {
 		"full_name": "test_prog$Int"
 	}, {
-		"full_name": "test_prog$Float"
+		"full_name": "test_prog$List"
 	}, {
-		"full_name": "test_prog$Bool"
+		"full_name": "test_prog$Object"
 	}, {
 		"full_name": "test_prog$String"
-	}, {
-		"full_name": "test_prog$List"
 	}],
 	"redef_mclassdefs": [],
 	"imports": []
@@ -168,31 +168,31 @@
 		"full_name": "test_prog>rpg>"
 	},
 	"intro_mclasses": [{
-		"full_name": "test_prog::Career"
+		"full_name": "test_prog::Alcoholic"
 	}, {
-		"full_name": "test_prog::Warrior"
+		"full_name": "test_prog::Career"
 	}, {
 		"full_name": "test_prog::Magician"
 	}, {
-		"full_name": "test_prog::Alcoholic"
+		"full_name": "test_prog::Warrior"
 	}],
 	"mclassdefs": [{
-		"full_name": "test_prog$Career"
+		"full_name": "test_prog$Alcoholic"
 	}, {
-		"full_name": "test_prog$Warrior"
+		"full_name": "test_prog$Career"
 	}, {
 		"full_name": "test_prog$Magician"
 	}, {
-		"full_name": "test_prog$Alcoholic"
+		"full_name": "test_prog$Warrior"
 	}],
 	"intro_mclassdefs": [{
-		"full_name": "test_prog$Career"
+		"full_name": "test_prog$Alcoholic"
 	}, {
-		"full_name": "test_prog$Warrior"
+		"full_name": "test_prog$Career"
 	}, {
 		"full_name": "test_prog$Magician"
 	}, {
-		"full_name": "test_prog$Alcoholic"
+		"full_name": "test_prog$Warrior"
 	}],
 	"redef_mclassdefs": [],
 	"imports": [{
@@ -274,23 +274,23 @@
 		"full_name": "test_prog>rpg>"
 	},
 	"intro_mclasses": [{
-		"full_name": "test_prog::Weapon"
-	}, {
 		"full_name": "test_prog::Combatable"
+	}, {
+		"full_name": "test_prog::Weapon"
 	}],
 	"mclassdefs": [{
-		"full_name": "test_prog$Weapon"
+		"full_name": "test_prog::combat$Character"
 	}, {
 		"full_name": "test_prog$Combatable"
 	}, {
-		"full_name": "test_prog::combat$Character"
-	}, {
 		"full_name": "test_prog::combat$Dwarf"
+	}, {
+		"full_name": "test_prog$Weapon"
 	}],
 	"intro_mclassdefs": [{
-		"full_name": "test_prog$Weapon"
-	}, {
 		"full_name": "test_prog$Combatable"
+	}, {
+		"full_name": "test_prog$Weapon"
 	}],
 	"redef_mclassdefs": [{
 		"full_name": "test_prog::combat$Character"
@@ -331,31 +331,31 @@
 		"full_name": "test_prog>rpg>"
 	},
 	"intro_mclasses": [{
-		"full_name": "test_prog::Race"
-	}, {
-		"full_name": "test_prog::Human"
-	}, {
 		"full_name": "test_prog::Dwarf"
 	}, {
 		"full_name": "test_prog::Elf"
-	}],
-	"mclassdefs": [{
-		"full_name": "test_prog$Race"
 	}, {
-		"full_name": "test_prog$Human"
+		"full_name": "test_prog::Human"
 	}, {
+		"full_name": "test_prog::Race"
+	}],
+	"mclassdefs": [{
 		"full_name": "test_prog$Dwarf"
 	}, {
 		"full_name": "test_prog$Elf"
-	}],
-	"intro_mclassdefs": [{
-		"full_name": "test_prog$Race"
 	}, {
 		"full_name": "test_prog$Human"
 	}, {
+		"full_name": "test_prog$Race"
+	}],
+	"intro_mclassdefs": [{
 		"full_name": "test_prog$Dwarf"
 	}, {
 		"full_name": "test_prog$Elf"
+	}, {
+		"full_name": "test_prog$Human"
+	}, {
+		"full_name": "test_prog$Race"
 	}],
 	"redef_mclassdefs": [],
 	"imports": [{
diff --git a/src/model/test_model_json.sav/test_packages_to_full_json.res b/src/model/test_model_json.sav/test_packages_to_full_json.res
index 81a0cae..ef7ced3 100644
--- a/src/model/test_model_json.sav/test_packages_to_full_json.res
+++ b/src/model/test_model_json.sav/test_packages_to_full_json.res
@@ -25,13 +25,13 @@
 		"full_name": "test_prog>"
 	},
 	"mgroups": [{
-		"full_name": "test_prog>"
-	}, {
 		"full_name": "test_prog>game>"
 	}, {
 		"full_name": "test_prog>platform>"
 	}, {
 		"full_name": "test_prog>rpg>"
+	}, {
+		"full_name": "test_prog>"
 	}],
 	"ini": {
 		"upstream.issues": "https://github.com/nitlang/nit/issues",
diff --git a/src/model/test_model_json.sav/test_props_to_full_json.res b/src/model/test_model_json.sav/test_props_to_full_json.res
index d61dd81..f3c8146 100644
--- a/src/model/test_model_json.sav/test_props_to_full_json.res
+++ b/src/model/test_model_json.sav/test_props_to_full_json.res
@@ -172,7 +172,7 @@
 		"full_name": "test_prog$Object"
 	},
 	"mpropdefs": [{
-		"full_name": "test_prog$Object$init"
+		"full_name": "test_prog$Elf$Object::init"
 	}, {
 		"full_name": "test_prog$Career$Object::init"
 	}, {
@@ -188,9 +188,9 @@
 	}, {
 		"full_name": "test_prog$Dwarf$Object::init"
 	}, {
-		"full_name": "test_prog$Elf$Object::init"
-	}, {
 		"full_name": "test_prog$Character$Object::init"
+	}, {
+		"full_name": "test_prog$Object$init"
 	}],
 	"intro_mclass": {
 		"full_name": "test_prog::Object"
-- 
1.7.9.5