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

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..96d1691 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
@@ -13,7 +13,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "interface"],
+	"modifiers": ["interface"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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"
 	}],
@@ -79,7 +79,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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": []
 }
@@ -163,7 +163,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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$>"
@@ -235,7 +235,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 14,
 		"column_start": 1,
@@ -277,7 +277,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 16,
 		"column_start": 1,
@@ -319,7 +319,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 17,
 		"column_start": 1,
@@ -367,7 +367,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "abstract class"],
+	"modifiers": ["abstract class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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"
@@ -467,7 +467,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -513,7 +513,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -559,7 +559,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -605,7 +605,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "abstract class"],
+	"modifiers": ["abstract class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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"
@@ -705,7 +705,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -751,7 +751,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -843,7 +843,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -889,7 +889,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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"
@@ -1119,7 +1119,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "interface"],
+	"modifiers": ["interface"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -1167,7 +1167,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "interface"],
+	"modifiers": ["interface"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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"
 	}],
@@ -1239,7 +1239,7 @@
 		}
 	},
 	"visibility": "public",
-	"modifiers": ["public", "interface"],
+	"modifiers": ["interface"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -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": []
@@ -1302,7 +1302,7 @@
 	"full_name": "test_prog$Starter",
 	"mdoc": null,
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 3,
 		"column_start": 1,
@@ -1341,7 +1341,7 @@
 	"full_name": "test_prog$Sys",
 	"mdoc": null,
 	"visibility": "public",
-	"modifiers": ["public", "class"],
+	"modifiers": ["class"],
 	"location": {
 		"column_end": 13,
 		"column_start": 1,