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

diff --git a/c_src/rapid_type_analysis.sep.0.h b/c_src/rapid_type_analysis.sep.0.h
index c75bd79..ee69201 100644
--- a/c_src/rapid_type_analysis.sep.0.h
+++ b/c_src/rapid_type_analysis.sep.0.h
@@ -1,239 +1,207 @@
 #include "nit.common.h"
 val* NEW_rapid_type_analysis__RapidTypeAnalysis(const struct type* type);
 extern const struct type type_rapid_type_analysis__RapidTypeAnalysis;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__init;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__run_analysis;
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis__modelbuilder_61d 32
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis__mainmodule_61d 34
+#define COLOR_kernel__Object__init 7
+void rapid_type_analysis__RapidTypeAnalysis__run_analysis(val* self);
 val* rapid_type_analysis__ModelBuilder__do_rapid_type_analysis(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dmodelbuilder;
-val* rapid_type_analysis__RapidTypeAnalysis__modelbuilder(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__modelbuilder_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dmainmodule;
-val* rapid_type_analysis__RapidTypeAnalysis__mainmodule(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__mainmodule_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_types;
-val* rapid_type_analysis__RapidTypeAnalysis__live_types(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_types_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_open_types;
-val* rapid_type_analysis__RapidTypeAnalysis__live_open_types(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_open_types_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_classes;
-val* rapid_type_analysis__RapidTypeAnalysis__live_classes(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_classes_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_cast_types;
-val* rapid_type_analysis__RapidTypeAnalysis__live_cast_types(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_cast_types_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_open_cast_types;
-val* rapid_type_analysis__RapidTypeAnalysis__live_open_cast_types(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_open_cast_types_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_methoddefs;
-val* rapid_type_analysis__RapidTypeAnalysis__live_methoddefs(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_methoddefs_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_methods;
-val* rapid_type_analysis__RapidTypeAnalysis__live_methods(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_methods_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dlive_super_sends;
-val* rapid_type_analysis__RapidTypeAnalysis__live_super_sends(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__live_super_sends_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dtotry_methods;
-val* rapid_type_analysis__RapidTypeAnalysis__totry_methods(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__totry_methods_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis___64dtodo;
-val* rapid_type_analysis__RapidTypeAnalysis__todo(val* self);
-void rapid_type_analysis__RapidTypeAnalysis__todo_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__mainmodule;
-extern const int COLOR_model__MModule__sys_type;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__add_new;
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___modelbuilder 0
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___mainmodule 1
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_types 2
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_open_types 3
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_classes 4
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_cast_types 5
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_open_cast_types 6
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_methoddefs 7
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_methods 8
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_callsites 9
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_targets_cache 10
+#define COLOR_typing__CallSite___recv 1
+#define COLOR_typing__CallSite___anchor 3
+#define COLOR_kernel__Object___61d_61d 2
+#define COLOR_typing__CallSite___mmodule 2
+#define COLOR_model__MType__anchor_to 38
+#define COLOR_model__MType__as_notnullable 44
+extern const struct type type_model__MClassType;
+#define COLOR_model__MClassType___mclass 4
+#define COLOR_model__MClass___intro 9
+#define COLOR_model__MClassDef___bound_mtype 4
+#define COLOR_typing__CallSite___mproperty 5
+val* more_collections__HashMap2___91d_93d(val* self, val* p0, val* p1);
+val* NEW_array__ArraySet(const struct type* type);
+extern const struct type type_array__ArraySetmodel__MMethodDef;
+void more_collections__HashMap2___91d_93d_61d(val* self, val* p0, val* p1, val* p2);
+val* hash_collection__HashSet__iterator(val* self);
+#define COLOR_abstract_collection__Iterator__is_ok 33
+#define COLOR_abstract_collection__Iterator__item 31
+short int model__MType__is_subtype(val* self, val* p0, val* p1, val* p2);
+val* model__MProperty__lookup_first_definition(val* self, val* p0, val* p1);
+void array__ArraySet__add(val* self, val* p0);
+#define COLOR_abstract_collection__Iterator__next 32
+val* rapid_type_analysis__RapidTypeAnalysis__live_targets(val* self, val* p0);
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___live_super_sends 11
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___totry_methods 12
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___totry_methods_to_remove 13
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___try_methods 14
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis___todo 15
+#define COLOR_modelbuilder__ModelBuilder___model 0
+val* model__Model__get_mclasses_by_name(val* self, val* p0);
+val* array__AbstractArrayRead__iterator(val* self);
+short int array__ArrayIterator__is_ok(val* self);
+val* array__ArrayIterator__item(val* self);
+#define COLOR_model__MClass___mclass_type 10
+void rapid_type_analysis__RapidTypeAnalysis__add_new(val* self, val* p0, val* p1);
+void array__ArrayIterator__next(val* self);
+void rapid_type_analysis__RapidTypeAnalysis__force_alive(val* self, val* p0);
+val* model__MModule__sys_type(val* self);
 val* string__NativeString__to_s_with_length(char* self, long p0);
-extern const int COLOR_model__MClassType__mclass;
-extern const int COLOR_model__MModule__try_get_primitive_method;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__add_send;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__modelbuilder;
-extern const int COLOR_modelbuilder__ModelBuilder__model;
-extern const int COLOR_model__Model__get_mclasses_by_name;
-extern const int COLOR_abstract_collection__Collection__iterator;
-extern const int COLOR_abstract_collection__Iterator__is_ok;
-extern const int COLOR_abstract_collection__Iterator__item;
-extern const int COLOR_model__MClass__mclass_type;
-extern const int COLOR_abstract_collection__Iterator__next;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__todo;
-extern const int COLOR_abstract_collection__Collection__is_empty;
-extern const int COLOR_abstract_collection__Sequence__shift;
+val* model__MModule__try_get_primitive_method(val* self, val* p0, val* p1);
+void rapid_type_analysis__RapidTypeAnalysis__add_send(val* self, val* p0, val* p1);
+val* model__MModule__finalizable_type(val* self);
+short int list__List__is_empty(val* self);
+val* list__List__shift(val* self);
+#define COLOR_model__MPropDef___mproperty 4
 val* NEW_rapid_type_analysis__RapidTypeVisitor(const struct type* type);
 extern const struct type type_rapid_type_analysis__RapidTypeVisitor;
-extern const int COLOR_model__MPropDef__mclassdef;
-extern const int COLOR_model__MClassDef__bound_mtype;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__init;
-extern const int COLOR_model__MMethodDef__msignature;
-extern const int COLOR_model__MSignature__vararg_rank;
+#define COLOR_model__MPropDef___mclassdef 3
+void rapid_type_analysis__RapidTypeVisitor__init(val* self, val* p0, val* p1, val* p2);
+#define COLOR_model__MMethodDef___msignature 8
+#define COLOR_model__MSignature___vararg_rank 6
 extern const struct type type_kernel__Int;
-extern const int COLOR_modelize_property__ModelBuilder__mpropdef2npropdef;
-extern const int COLOR_abstract_collection__MapRead___91d_93d;
-extern const int COLOR_model__MSignature__mparameters;
-extern const int COLOR_abstract_collection__SequenceRead___91d_93d;
-extern const int COLOR_model__MParameter__mtype;
-extern const int COLOR_model__MModule__get_primitive_class;
+#define COLOR_modelize_property__ModelBuilder___mpropdef2npropdef 10
+val* hash_collection__HashMap___91d_93d(val* self, val* p0);
+#define COLOR_model__MSignature___mparameters 4
+val* array__Array___91d_93d(val* self, long p0);
+#define COLOR_model__MParameter___mtype 3
+val* model__MModule__get_primitive_class(val* self, val* p0);
 val* NEW_array__Array(const struct type* type);
 extern const struct type type_array__Arraymodel__MType;
-val* NEW_array__NativeArray(int length, const struct type* type);
-extern const struct type type_array__NativeArraymodel__MType;
-extern const int COLOR_array__Array__with_native;
-extern const int COLOR_model__MClass__get_mtype;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__add_type;
-extern const int COLOR_modelbuilder__ModelBuilder__force_get_primitive_method;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__add_monomorphic_send;
-val* NEW_range__Range(const struct type* type);
-extern const struct type type_range__Rangekernel__Int;
-extern const int COLOR_model__MSignature__arity;
-extern const int COLOR_range__Range__without_last;
-extern const int COLOR_model__MPropDef__mproperty;
-extern const int COLOR_model__MProperty__intro;
-extern const int COLOR_model__MType__need_anchor;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__add_cast;
-extern const int COLOR_abstract_collection__MapRead__has_key;
-extern const int COLOR_model__MProperty__name;
-extern const int COLOR_kernel__Object___61d_61d;
-extern const int COLOR_modelize_class__ModelBuilder__mclassdef2nclassdef;
-extern const int COLOR_modelize_property__AClassdef__super_inits;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__receiver;
-extern const struct type type_parser_nodes__AConcreteMethPropdef;
-extern const int COLOR_auto_super_init__AConcreteMethPropdef__auto_super_inits;
-extern const struct type type_parser_nodes__AInternMethPropdef;
-extern const struct type type_parser_nodes__AExternMethPropdef;
-extern const int COLOR_parser_nodes__AExternPropdef__n_extern;
-extern const int COLOR_model__MSignature__return_mtype;
-extern const struct type type_model__MClassType;
-extern const int COLOR_model__MClass__kind;
-extern const int COLOR_model__Object__abstract_kind;
-extern const int COLOR_kernel__Object___33d_61d;
-extern const int COLOR_model__Object__interface_kind;
-extern const int COLOR_parser_nodes__ANode__parent;
-extern const struct type type_parser_nodes__AClassdef;
-extern const int COLOR_parser_nodes__Visitor__enter_visit;
-extern const struct type type_parser_nodes__AExternInitPropdef;
+void array__Array__with_capacity(val* self, long p0);
+void array__AbstractArray__push(val* self, val* p0);
+val* model__MClass__get_mtype(val* self, val* p0);
+void rapid_type_analysis__RapidTypeVisitor__add_type(val* self, val* p0);
+val* modelbuilder__ModelBuilder__force_get_primitive_method(val* self, val* p0, val* p1, val* p2, val* p3);
+void rapid_type_analysis__RapidTypeVisitor__add_monomorphic_send(val* self, val* p0, val* p1);
+#define COLOR_model__MProperty___intro 6
+long model__MSignature__arity(val* self);
+#define COLOR_model__MType__need_anchor 39
+void rapid_type_analysis__RapidTypeAnalysis__add_cast(val* self, val* p0);
+long kernel__Int__successor(long self, long p0);
+short int abstract_collection__MapRead__has_key(val* self, val* p0);
+#define COLOR_model__MMethod___is_root_init 12
+#define COLOR_modelize_class__ModelBuilder___mclassdef2nclassdef 8
+#define COLOR_modelize_property__AClassdef___mfree_init 9
+short int model__MPropDef__is_intro(val* self);
+#define COLOR_rapid_type_analysis__RapidTypeVisitor___receiver 2
+void rapid_type_analysis__RapidTypeAnalysis__add_super_send(val* self, val* p0, val* p1);
+#define COLOR_model__MMethodDef___constant_value 14
+#define COLOR_kernel__Object___33d_61d 3
+#define COLOR_model__MSignature___return_mtype 5
+extern const struct type type_parser_nodes__AMethPropdef;
+#define COLOR_auto_super_init__AMethPropdef___auto_super_inits 19
+void rapid_type_analysis__RapidTypeVisitor__add_callsite(val* self, val* p0);
+#define COLOR_auto_super_init__AMethPropdef___auto_super_call 20
+#define COLOR_model__MMethodDef___is_intern 12
+#define COLOR_model__MMethodDef___is_extern 13
+#define COLOR_model__MClass___kind 6
+val* model__Object__abstract_kind(val* self);
+val* model__Object__interface_kind(val* self);
+void parser_nodes__Visitor__enter_visit(val* self, val* p0);
 val* NEW_list__List(const struct type* type);
 extern const struct type type_list__Listmodel__MClassType;
-extern const int COLOR_list__List__init;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_types;
-extern const int COLOR_abstract_collection__SimpleCollection__add_all;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_open_types;
-extern const int COLOR_model__MType__can_resolve_for;
-extern const int COLOR_model__MType__anchor_to;
-extern const int COLOR_abstract_collection__Collection__has;
-extern const int COLOR_abstract_collection__SimpleCollection__add;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__check_depth;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_open_cast_types;
-extern const struct type type_model__MNullableType;
-extern const int COLOR_model__MNullableType__mtype;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_cast_types;
-void rapid_type_analysis__RapidTypeAnalysis__run_analysis(val* self);
-extern const int COLOR_model__MType__length;
-extern const int COLOR_modelbuilder__ModelBuilder__toolcontext;
+void abstract_collection__SimpleCollection__add_all(val* self, val* p0);
+#define COLOR_model__MType__can_resolve_for 42
+val* model__MClassType__anchor_to(val* self, val* p0, val* p1);
+short int hash_collection__HashSet__has(val* self, val* p0);
+void hash_collection__HashSet__add(val* self, val* p0);
+void abstract_collection__Sequence__add(val* self, val* p0);
+void rapid_type_analysis__RapidTypeAnalysis__check_depth(val* self, val* p0);
+#define COLOR_model__MType__length 47
+#define COLOR_modelbuilder__ModelBuilder___toolcontext 1
 extern const struct type type_array__Arraykernel__Object;
+val* NEW_array__NativeArray(int length, const struct type* type);
 extern const struct type type_array__NativeArraykernel__Object;
-extern const int COLOR_string__Object__to_s;
-extern const int COLOR_toolcontext__ToolContext__fatal_error;
-void rapid_type_analysis__RapidTypeAnalysis__check_depth(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_classes;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__totry_methods;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__try_send;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_super_sends;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__try_super_send;
-extern const int COLOR_model__MType__collect_mclassdefs;
-extern const int COLOR_parser_nodes__AClassdef__n_propdefs;
-extern const struct type type_parser_nodes__AAttrPropdef;
-extern const int COLOR_parser_nodes__AAttrPropdef__n_expr;
-extern const int COLOR_modelize_property__APropdef__mpropdef;
-void rapid_type_analysis__RapidTypeAnalysis__add_new(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeAnalysis__add_cast(val* self, val* p0);
-extern const int COLOR_model__MClass__intro;
-extern const int COLOR_model__MType__has_mproperty;
-extern const int COLOR_model__MProperty__lookup_first_definition;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__add_call;
+val* BOX_kernel__Int(long);
+#define COLOR_array__Array__with_native 74
+#define COLOR_string__Object__to_s 9
+void toolcontext__ToolContext__fatal_error(val* self, val* p0, val* p1);
 void rapid_type_analysis__RapidTypeAnalysis__try_send(val* self, val* p0, val* p1);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_methoddefs;
-extern const int COLOR_model__MProperty__mpropdefs;
-extern const int COLOR_abstract_collection__Collection__length;
-extern const int COLOR_model__MMethodDef__is_abstract;
-extern const int COLOR_abstract_collection__RemovableCollection__remove;
-void rapid_type_analysis__RapidTypeAnalysis__add_call(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__live_methods;
-extern const int COLOR_abstract_collection__Collection__first;
-void rapid_type_analysis__RapidTypeAnalysis__add_send(val* self, val* p0, val* p1);
-extern const int COLOR_model__MPropDef__lookup_next_definition;
 void rapid_type_analysis__RapidTypeAnalysis__try_super_send(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeAnalysis__add_super_send(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeAnalysis__init(val* self, val* p0, val* p1);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor___64danalysis;
-val* rapid_type_analysis__RapidTypeVisitor__analysis(val* self);
-void rapid_type_analysis__RapidTypeVisitor__analysis_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor___64dreceiver;
-val* rapid_type_analysis__RapidTypeVisitor__receiver(val* self);
-void rapid_type_analysis__RapidTypeVisitor__receiver_61d(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor___64dmpropdef;
-val* rapid_type_analysis__RapidTypeVisitor__mpropdef(val* self);
-void rapid_type_analysis__RapidTypeVisitor__mpropdef_61d(val* self, val* p0);
-extern const int COLOR_parser_nodes__Visitor__init;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__analysis_61d;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__receiver_61d;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__mpropdef_61d;
-void rapid_type_analysis__RapidTypeVisitor__init(val* self, val* p0, val* p1, val* p2);
-extern const int COLOR_rapid_type_analysis__ANode__accept_rapid_type_visitor;
+void hash_collection__HashSet__remove(val* self, val* p0);
+void array__AbstractArray__clear(val* self);
+val* model__MClassType__collect_mclassdefs(val* self, val* p0);
+#define COLOR_abstract_collection__Collection__iterator 37
+#define COLOR_parser_nodes__AClassdef___n_propdefs 4
+val* parser_nodes__ANodes__iterator(val* self);
+extern const struct type type_parser_nodes__AAttrPropdef;
+#define COLOR_modelize_property__AAttrPropdef___has_value 18
+#define COLOR_modelize_property__APropdef___mpropdef 9
+#define COLOR_parser_nodes__AAttrPropdef___n_expr 14
+#define COLOR_parser_nodes__AAttrPropdef___n_block 15
+short int model__MType__has_mproperty(val* self, val* p0, val* p1);
+void rapid_type_analysis__RapidTypeAnalysis__add_call(val* self, val* p0);
+#define COLOR_model__MProperty___mpropdefs 5
+#define COLOR_array__AbstractArrayRead___length 0
+#define COLOR_model__MMethodDef___is_abstract 11
+void array__Array__add(val* self, val* p0);
+val* abstract_collection__SequenceRead__first(val* self);
+#define COLOR_abstract_collection__Collection__has 40
+val* model__MPropDef__lookup_next_definition(val* self, val* p0, val* p1);
+#define COLOR_modelize_property__MPropDef___has_supercall 6
+#define COLOR_rapid_type_analysis__RapidTypeAnalysis__init 60
+#define COLOR_rapid_type_analysis__RapidTypeVisitor___analysis 1
+#define COLOR_rapid_type_analysis__RapidTypeVisitor___mpropdef 3
+#define COLOR_rapid_type_analysis__ANode__accept_rapid_type_visitor 46
 extern const struct type type_parser_nodes__AExpr;
-extern const int COLOR_typing__AExpr__implicit_cast_to;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__add_cast_type;
+#define COLOR_typing__AExpr___implicit_cast_to 7
+void rapid_type_analysis__RapidTypeVisitor__add_cast_type(val* self, val* p0);
 extern const struct type type_parser_nodes__AAnnotations;
-extern const int COLOR_parser_nodes__ANode__visit_all;
+#define COLOR_parser_nodes__ANode__visit_all 39
 void rapid_type_analysis__RapidTypeVisitor__visit(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__analysis;
 extern const struct type type_model__MNullType;
 val* rapid_type_analysis__RapidTypeVisitor__cleanup_type(val* self, val* p0);
 val* rapid_type_analysis__RapidTypeVisitor__get_class(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__cleanup_type;
-extern const int COLOR_parser_nodes__Visitor__current_node;
+#define COLOR_parser_nodes__Visitor___current_node 0
 val* rapid_type_analysis__RapidTypeVisitor__get_method(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeVisitor__add_type(val* self, val* p0);
-void rapid_type_analysis__RapidTypeVisitor__add_monomorphic_send(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeVisitor__add_send(val* self, val* p0, val* p1);
-void rapid_type_analysis__RapidTypeVisitor__add_cast_type(val* self, val* p0);
-void rapid_type_analysis__ANode__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__AExpr__mtype;
+#define COLOR_typing__CallSite___mpropdef 6
+#define COLOR_model__MMethodDef___initializers 10
+extern const struct type type_model__MMethod;
+#define COLOR_typing__AExpr___mtype 5
 void rapid_type_analysis__AIntExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AFloatExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__ACharExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_model__MClassType__arguments;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__get_method;
+#define COLOR_model__MClassType___arguments 5
 void rapid_type_analysis__AArrayExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__get_class;
 void rapid_type_analysis__AStringFormExpr__accept_rapid_type_visitor(val* self, val* p0);
 extern const struct type type_array__Arraymodel__MClassType;
-extern const struct type type_array__NativeArraymodel__MClassType;
 void rapid_type_analysis__ASuperstringExpr__accept_rapid_type_visitor(val* self, val* p0);
+#define COLOR_typing__ARangeExpr___init_callsite 11
 void rapid_type_analysis__ACrangeExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AOrangeExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__ATrueExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AFalseExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__AIsaExpr__cast_type;
+#define COLOR_typing__AIsaExpr___cast_type 11
 void rapid_type_analysis__AIsaExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AAsCastExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__ASendExpr__mproperty;
-extern const int COLOR_parser_nodes__ASendExpr__n_expr;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__add_send;
+#define COLOR_typing__ASendExpr___callsite 10
 void rapid_type_analysis__ASendExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__AReassignFormExpr__read_type;
-extern const int COLOR_typing__AReassignFormExpr__reassign_property;
-extern const int COLOR_typing__ASendReassignFormExpr__write_mproperty;
-extern const struct type type_parser_nodes__ASelfExpr;
+#define COLOR_typing__AReassignFormExpr___reassign_callsite 13
+#define COLOR_typing__ASendReassignFormExpr___write_callsite 17
 void rapid_type_analysis__ASendReassignFormExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AVarReassignExpr__accept_rapid_type_visitor(val* self, val* p0);
 void rapid_type_analysis__AAttrReassignExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__ASuperExpr__mproperty;
-extern const int COLOR_rapid_type_analysis__RapidTypeVisitor__mpropdef;
-extern const struct type type_model__MMethodDef;
-extern const int COLOR_rapid_type_analysis__RapidTypeAnalysis__add_super_send;
+#define COLOR_typing__ASuperExpr___callsite 12
+#define COLOR_typing__ASuperExpr___mpropdef 13
 void rapid_type_analysis__ASuperExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_parser_nodes__AForExpr__n_expr;
-extern const int COLOR_typing__AForExpr__coltype;
-extern const int COLOR_scope__AForExpr__variables;
+#define COLOR_typing__AForExpr___method_iterator 19
+#define COLOR_typing__AForExpr___method_is_ok 20
+#define COLOR_scope__AForExpr___variables 15
+#define COLOR_typing__AForExpr___method_item 21
+#define COLOR_typing__AForExpr___method_key 23
+#define COLOR_typing__AForExpr___method_next 22
+#define COLOR_typing__AForExpr___method_finish 24
 void rapid_type_analysis__AForExpr__accept_rapid_type_visitor(val* self, val* p0);
-extern const int COLOR_typing__ANewExpr__mproperty;
+#define COLOR_typing__ANewExpr___recvtype 14
+#define COLOR_typing__ANewExpr___callsite 13
 void rapid_type_analysis__ANewExpr__accept_rapid_type_visitor(val* self, val* p0);