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

diff --git a/c_src/nitc__modelize_property.sep.0.h b/c_src/nitc__modelize_property.sep.0.h
index d3b6b1b..bf955f8 100644
--- a/c_src/nitc__modelize_property.sep.0.h
+++ b/c_src/nitc__modelize_property.sep.0.h
@@ -6,7 +6,7 @@ extern const char FILE_nitc__parser_nodes[];
 val* nitc___nitc__ANodes___core__abstract_collection__Collection__iterator(val* self);
 #define COLOR_core__abstract_collection__Iterator__is_ok 12
 #define COLOR_core__abstract_collection__Iterator__item 13
-#define COLOR_nitc__modelize_class__AClassdef___all_defs 9
+#define COLOR_nitc__modelize_class__AClassdef___all_defs 6
 short int core___core__Array___core__kernel__Object___61d_61d(val* self, val* p0);
 #define COLOR_nitc__phase__Phase___toolcontext 0
 extern const char FILE_nitc__phase[];
@@ -17,74 +17,74 @@ void nitc__modelize_property___ModelBuilder___build_properties(val* self, val* p
 #define COLOR_nitc__modelize_property__ModelBuilder___mpropdef2npropdef 0
 val* core___core__HashMap___core__abstract_collection__MapRead__get_or_null(val* self, val* p0);
 #define COLOR_core__kernel__Object___61d_61d 4
-#define COLOR_nitc__modelbuilder_base__ModelBuilder___toolcontext 12
+#define COLOR_nitc__modelbuilder_base__ModelBuilder___toolcontext 13
 extern const char FILE_nitc__modelbuilder_base[];
 void nitc__phase___ToolContext___run_phases_on_npropdef(val* self, val* p0);
 extern const struct type type_nitc__MMethodDef;
 #define COLOR_nitc__model__MPropDef___mproperty 8
 extern const char FILE_nitc__model[];
-#define COLOR_nitc__model__MMethod___is_root_init 20
+#define COLOR_nitc__model__MMethod___is_root_init 21
 #define COLOR_nitc__modelize_class__ModelBuilder___mclassdef2nclassdef 2
 extern const char FILE_nitc__modelize_class[];
 #define COLOR_nitc__model__MPropDef___mclassdef 7
 val* NEW_core__Array(const struct type* type);
 extern const struct type type_core__Array__nitc__AAttrPropdef;
 void core___core__Array___core__kernel__Object__init(val* self);
-#define COLOR_nitc__parser_nodes__AClassdef___n_propdefs 10
+#define COLOR_nitc__parser_nodes__AClassdef___n_propdefs 7
 extern const struct type type_nitc__AAttrPropdef;
 void core___core__Array___core__abstract_collection__SimpleCollection__add(val* self, val* p0);
-#define COLOR_nitc__modelize_property__AClassdef___build_properties_is_done 5
-#define COLOR_nitc__modelize_class__AClassdef___mclassdef 8
+#define COLOR_nitc__modelize_property__AClassdef___build_properties_is_done 3
+#define COLOR_nitc__modelize_class__AClassdef___mclassdef 5
 #define COLOR_nitc__model__MClassDef___in_hierarchy 17
 val* poset___poset__POSetElement___direct_greaters(val* self);
-#define COLOR_core__abstract_collection__Collection__iterator 21
+#define COLOR_core__abstract_collection__Collection__iterator 24
 short int core___core__HashMap___core__abstract_collection__MapRead__has_key(val* self, val* p0);
 val* core___core__HashMap___core__abstract_collection__MapRead___91d_93d(val* self, val* p0);
 void nitc__modelize_property___MClassDef___build_self_type(val* self, val* p0, val* p1);
 val* core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(val* self);
-#define COLOR_nitc__modelize_property__APropdef__build_property 39
-#define COLOR_nitc__modelize_property__APropdef__build_signature 40
+#define COLOR_nitc__modelize_property__APropdef__build_property 34
+#define COLOR_nitc__modelize_property__APropdef__build_signature 35
 extern const struct type type_nitc__ATypePropdef;
-#define COLOR_nitc__modelize_property__APropdef___mpropdef 5
+#define COLOR_nitc__modelize_property__APropdef___mpropdef 3
 #define COLOR_nitc__model__MVirtualTypeDef___bound 15
 #define COLOR_nitc__model__MClassDef___bound_mtype 9
 #define COLOR_nitc__model__MClassDef___mmodule 7
 short int nitc__modelize_property___ModelBuilder___check_virtual_types_circularity(val* self, val* p0, val* p1, val* p2, val* p3);
 #define COLOR_nitc__model_base__MEntity___is_broken 0
-val* NEW_nitc__MBottomType(const struct type* type);
-extern const struct type type_nitc__MBottomType;
+val* NEW_nitc__MErrorType(const struct type* type);
+extern const struct type type_nitc__MErrorType;
 #define COLOR_nitc__mmodule__MModule___model 41
 extern const char FILE_nitc__mmodule[];
-#define COLOR_nitc__model__MBottomType__model_61d 56
+#define COLOR_nitc__model__MErrorType__model_61d 60
 #define COLOR_core__kernel__Object__init 0
 void nitc__modelize_property___ATypePropdef___APropdef__check_signature(val* self, val* p0);
-#define COLOR_nitc__modelize_property__APropdef__check_signature 42
+#define COLOR_nitc__modelize_property__APropdef__check_signature 37
 void nitc__modelize_property___ModelBuilder___process_default_constructors(val* self, val* p0);
 #define COLOR_nitc__modelize_property__ModelBuilder___the_root_init_mmethod 1
 short int nitc___nitc__MClassDef___is_intro(val* self);
 #define COLOR_nitc__model__MClassDef___mclass 8
 #define COLOR_nitc__model__MClass___name 8
-val* core__flat___NativeString___to_s_full(char* self, long p0, long p1);
+val* core__flat___CString___to_s_unsafe(char* self, val* p0, val* p1, val* p2, val* p3);
 val* NEW_nitc__MMethod(const struct type* type);
 extern const struct type type_nitc__MMethod;
-#define COLOR_nitc__model__MClass___visibility 16
-#define COLOR_nitc__model__MProperty__intro_mclassdef_61d 31
-#define COLOR_nitc__model__MProperty__name_61d 32
-#define COLOR_nitc__model__MProperty__visibility_61d 33
-val* NEW_nitc__MMethodDef(const struct type* type);
 #define COLOR_nitc__parser_nodes__ANode___location 1
-#define COLOR_nitc__model__MPropDef__mclassdef_61d 27
-#define COLOR_nitc__model__MPropDef__mproperty_61d 28
-#define COLOR_nitc__model__MPropDef__location_61d 29
+#define COLOR_nitc__model__MClass___visibility 17
+#define COLOR_nitc__model__MProperty__intro_mclassdef_61d 32
+#define COLOR_nitc__model__MProperty__name_61d 33
+#define COLOR_nitc__model__MProperty__location_61d 34
+#define COLOR_nitc__model__MProperty__visibility_61d 35
+val* NEW_nitc__MMethodDef(const struct type* type);
+#define COLOR_nitc__model__MPropDef__mclassdef_61d 29
+#define COLOR_nitc__model__MPropDef__mproperty_61d 30
+#define COLOR_nitc__model__MPropDef__location_61d 31
 extern const struct type type_core__Array__nitc__MParameter;
 val* NEW_nitc__MSignature(const struct type* type);
 extern const struct type type_nitc__MSignature;
-#define COLOR_nitc__model__MSignature__mparameters_61d 60
-#define COLOR_nitc__model__MSignature__return_mtype_61d 61
+#define COLOR_nitc__model__MSignature__mparameters_61d 64
+#define COLOR_nitc__model__MSignature__return_mtype_61d 65
 #define COLOR_nitc__model__MMethodDef___msignature 15
 #define COLOR_nitc__model__MMethodDef___new_msignature 16
-#define COLOR_nitc__model__MMethod___is_init 19
-#define COLOR_nitc__modelize_property__AClassdef___mfree_init 6
+#define COLOR_nitc__model__MMethod___is_init 20
 val* NEW_core__NativeArray(int length, const struct type* type);
 extern const struct type type_core__NativeArray__core__String;
 #define COLOR_core__abstract_text__Object__to_s 3
@@ -95,34 +95,35 @@ void nitc___nitc__ToolContext___info(val* self, val* p0, long p1);
 extern const struct type type_nitc__AStdClassdef;
 extern const struct type type_core__Array__nitc__MProperty;
 extern const struct type type_nitc__AMethPropdef;
-#define COLOR_nitc__modelize_property__AMethPropdef___is_autoinit 10
+#define COLOR_nitc__modelize_property__AMethPropdef___is_autoinit 14
 #define COLOR_nitc__model__MSignature___mparameters 9
 void core___core__Array___core__abstract_collection__SimpleCollection__add_all(val* self, val* p0);
-#define COLOR_nitc__model__MProperty___is_autoinit 13
-#define COLOR_nitc__modelize_property__AAttrPropdef___mreadpropdef 18
-#define COLOR_nitc__modelize_property__AAttrPropdef___noinit 14
+#define COLOR_nitc__model__MProperty___is_autoinit 14
+#define COLOR_nitc__modelize_property__AAttrPropdef___mreadpropdef 20
+#define COLOR_nitc__modelize_property__AAttrPropdef___noinit 15
 val* nitc__annotation___Prod___get_single_annotation(val* self, val* p0, val* p1);
-#define COLOR_nitc__modelize_property__AAttrPropdef___has_value 16
+#define COLOR_nitc__modelize_property__AAttrPropdef___has_value 18
+#define COLOR_nitc__modelize_property__AAttrPropdef___is_optional 17
+#define COLOR_nitc__modelize_property__AAttrPropdef___mwritepropdef 21
 #define COLOR_nitc__model__MSignature___return_mtype 10
 val* NEW_nitc__MParameter(const struct type* type);
 extern const struct type type_nitc__MParameter;
-#define COLOR_nitc__model__MParameter__name_61d 26
-#define COLOR_nitc__model__MParameter__mtype_61d 27
-#define COLOR_nitc__model__MParameter__is_vararg_61d 28
-#define COLOR_nitc__modelize_property__AAttrPropdef___mwritepropdef 19
+#define COLOR_nitc__model__MParameter__name_61d 28
+#define COLOR_nitc__model__MParameter__mtype_61d 29
+#define COLOR_nitc__model__MParameter__is_vararg_61d 30
 val* nitc___nitc__MProperty___lookup_super_definitions(val* self, val* p0, val* p1);
 short int core___core__AbstractArrayRead___core__abstract_collection__Collection__is_empty(val* self);
 #define COLOR_nitc__model__MProperty___intro_mclassdef 6
 val* nitc___nitc__ToolContext___error(val* self, val* p0, val* p1);
 void core___core__AbstractArray___core__abstract_collection__RemovableCollection__clear(val* self);
 void nitc___nitc__ModelBuilder___error(val* self, val* p0, val* p1);
-#define COLOR_nitc__parser_nodes__AAnnotation___n_args 15
+#define COLOR_nitc__parser_nodes__AAnnotation___n_args 16
 short int nitc___nitc__ANodes___core__abstract_collection__Collection__is_empty(val* self);
 val* nitc__parser_work___AExpr___as_id(val* self);
-#define COLOR_core__abstract_text__String___43d 76
+#define COLOR_core__abstract_text__Text___43d 39
 val* nitc___nitc__ModelBuilder___try_get_mproperty_by_name(val* self, val* p0, val* p1, val* p2);
-#define COLOR_nitc__model__MProperty___intro 15
-#define COLOR_nitc__model__MClass___mclass_type 19
+#define COLOR_nitc__model__MProperty___intro 16
+#define COLOR_nitc__model__MClass___mclass_type 20
 val* nitc___nitc__MSignature___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3);
 val* core___core__SequenceRead___Collection__first(val* self);
 #define COLOR_core__array__AbstractArrayRead___length 0
@@ -134,39 +135,40 @@ val* NEW_core__ArraySet(const struct type* type);
 extern const struct type type_core__ArraySet__nitc__MProperty;
 void core___core__ArraySet___core__kernel__Object__init(val* self);
 void core___core__SimpleCollection___add_all(val* self, val* p0);
-val* core__abstract_text___Collection___join(val* self, val* p0);
+val* core__abstract_text___Collection___join(val* self, val* p0, val* p1);
 void nitc___nitc__ModelBuilder___warning(val* self, val* p0, val* p1, val* p2);
 #define COLOR_nitc__modelize_property__MClass___root_init 6
 void core___core__Sequence___prepend(val* self, val* p0);
 #define COLOR_nitc__modelize_property__MPropDef___has_supercall 6
-#define COLOR_nitc__model__MType__undecorate 47
+#define COLOR_nitc__model__MType__undecorate 51
 extern const struct type type_nitc__MClassType;
 #define COLOR_nitc__model__MClassType___mclass 9
 #define COLOR_nitc__model__MClass___intro_mmodule 7
 extern const struct type type_nitc__MVirtualType;
 #define COLOR_nitc__model__MVirtualType___mproperty 11
-#define COLOR_nitc__model__MProperty___visibility 12
+#define COLOR_nitc__model__MProperty___visibility 13
 extern const struct type type_nitc__MParameterType;
 extern const struct type type_nitc__MNullType;
+extern const struct type type_nitc__MBottomType;
 void nitc___nitc__ANode___debug(val* self, val* p0);
 val* nitc___nitc__MModule___visibility_for(val* self, val* p0);
 short int core___core__Comparable____62d(val* self, val* p0);
 extern const struct type type_nitc__AType;
-#define COLOR_nitc__parser_nodes__AType___n_types 10
-#define COLOR_nitc__modelbuilder_base__AType___mtype 5
+#define COLOR_nitc__parser_nodes__AType___n_types 8
+#define COLOR_nitc__modelbuilder_base__AType___mtype 3
 void nitc__modelize_property___ModelBuilder___check_visibility(val* self, val* p0, val* p1, val* p2);
 extern const struct type type_nitc__MGenericType;
 #define COLOR_nitc__model__MGenericType___arguments 20
-#define COLOR_nitc__model__MVirtualTypeProp___mvirtualtype 18
+#define COLOR_nitc__model__MVirtualTypeProp___mvirtualtype 19
 val* NEW_poset__POSet(const struct type* type);
 extern const struct type type_poset__POSet__nitc__MType;
 val* NEW_core__List(const struct type* type);
 extern const struct type type_core__List__nitc__MType;
-#define COLOR_core___core__List___core__kernel__Object__init 27
+#define COLOR_core___core__List___core__kernel__Object__init 17
 void core___core__Sequence___SimpleCollection__add(val* self, val* p0);
 short int core___core__List___core__abstract_collection__Collection__is_empty(val* self);
 val* core___core__List___core__abstract_collection__Sequence__pop(val* self);
-#define COLOR_nitc__model__MType__need_anchor 29
+#define COLOR_nitc__model__MType__need_anchor 31
 extern const struct type type_nitc__MNullableType;
 extern const struct type type_core__Array__nitc__MType;
 void core___core__Array___with_capacity(val* self, long p0);
@@ -183,17 +185,18 @@ val* NEW_nitc__MVirtualTypeDef(const struct type* type);
 extern const struct type type_nitc__MVirtualTypeDef;
 #define COLOR_nitc__model__MClassDef___location 10
 #define COLOR_nullable__nitc__modelize_property__APropdef__MPROPDEF 0
-#define COLOR_nitc__modelbuilder_base__AVisibility__mvisibility 39
+#define COLOR_nitc__modelbuilder_base__AVisibility__mvisibility 34
 val* nitc__model_base___core__Sys___intrude_visibility(val* self);
 val* nitc__model_base___core__Sys___private_visibility(val* self);
 val* nitc__model_base___core__Sys___protected_visibility(val* self);
 void nitc___nitc__ModelBuilder___advice(val* self, val* p0, val* p1, val* p2);
-#define COLOR_nitc__parser_nodes__ADefinition___n_doc 11
+#define COLOR_nitc__parser_nodes__ADefinition___n_doc 8
 val* nitc__modelbuilder_base___ADoc___to_mdoc(val* self);
 #define COLOR_nitc__mdoc__MEntity___mdoc 2
 #define COLOR_nitc__mdoc__MDoc___original_mentity 1
 short int nitc___nitc__MPropDef___is_intro(val* self);
 short int core___core__Comparable____62d_61d(val* self, val* p0);
+val* nitc___nitc__MPropDef___nitc__model_base__MEntity__name(val* self);
 val* NEW_nitc__MDeprecationInfo(const struct type* type);
 extern const struct type type_nitc__MDeprecationInfo;
 #define COLOR_nitc__mdoc__MDeprecationInfo___mdoc 0
@@ -203,52 +206,52 @@ extern const struct type type_nitc__MDeprecationInfo;
 #define COLOR_nitc__location__Location___line_start 1
 val* core__flat___Int___core__abstract_text__Object__to_s(long self);
 #define COLOR_nitc__mmodule__MModule___mgroup 42
-#define COLOR_nitc__modelbuilder_base__ModelBuilder___model 11
+#define COLOR_nitc__modelbuilder_base__ModelBuilder___model 12
 val* nitc__model___Model___get_mproperties_by_name(val* self, val* p0);
 extern const char FILE_nitc__mpackage[];
-#define COLOR_nitc__mpackage__MGroup___mpackage 10
+#define COLOR_nitc__mpackage__MGroup___mpackage 11
 val* nitc___nitc__MProperty___nitc__model_base__MEntity__full_name(val* self);
-#define COLOR_nitc__modelize_property__ASignature___is_visited 5
-#define COLOR_nitc__modelize_property__ASignature___param_names 6
-#define COLOR_nitc__modelize_property__ASignature___param_types 7
-#define COLOR_nitc__modelize_property__ASignature___vararg_rank 8
-#define COLOR_nitc__modelize_property__ASignature___ret_type 9
+#define COLOR_nitc__modelize_property__ASignature___is_visited 3
+#define COLOR_nitc__modelize_property__ASignature___param_names 4
+#define COLOR_nitc__modelize_property__ASignature___param_types 5
+#define COLOR_nitc__modelize_property__ASignature___vararg_rank 6
+#define COLOR_nitc__modelize_property__ASignature___ret_type 7
 #define COLOR_nitc__parser_nodes__ASignature___n_params 11
-#define COLOR_nitc__parser_nodes__AParam___n_id 6
+#define COLOR_nitc__parser_nodes__AParam___n_id 4
 val* nitc__lexer_work___Token___text(val* self);
-#define COLOR_nitc__parser_nodes__AParam___n_type 7
+#define COLOR_nitc__parser_nodes__AParam___n_type 5
 val* nitc___nitc__ModelBuilder___resolve_mtype_unchecked(val* self, val* p0, val* p1, val* p2, short int p3);
 long core___core__Int___Discrete__successor(long self, long p0);
-#define COLOR_nitc__parser_nodes__AParam___n_dotdotdot 8
+#define COLOR_nitc__parser_nodes__AParam___n_dotdotdot 6
 #define COLOR_nitc__parser_nodes__ASignature___n_type 13
 val* nitc___nitc__ModelBuilder___resolve_mtype(val* self, val* p0, val* p1, val* p2);
 #define COLOR_nitc__modelbuilder_base__ANode___is_broken 0
-#define COLOR_nitc__modelize_property__AParam___mparameter 5
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_kwinit 15
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_methid 17
+#define COLOR_nitc__modelize_property__AParam___mparameter 3
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_kwinit 16
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_methid 18
 #define COLOR_nitc__parser_nodes__ANode___parent 2
 extern const struct type type_nitc__AModule;
-#define COLOR_nitc__parser_nodes__AModule___n_moduledecl 9
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_signature 18
+#define COLOR_nitc__parser_nodes__AModule___n_moduledecl 7
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_signature 19
 long nitc___nitc__ANodes___core__abstract_collection__Collection__length(val* self);
-#define COLOR_nitc__parser_nodes__ADefinition___n_visibility 13
+#define COLOR_nitc__parser_nodes__ADefinition___n_visibility 12
 extern const struct type type_nitc__APublicVisibility;
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_kwnew 16
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_kwnew 17
 extern const struct type type_nitc__AIdMethid;
-#define COLOR_nitc__parser_nodes__AIdMethid___n_id 5
+#define COLOR_nitc__parser_nodes__AIdMethid___n_id 3
 val* nitc__parser_work___Prod___collect_text(val* self);
-#define COLOR_nitc__modelize_property__AMethid__is_binary 39
-#define COLOR_nitc__modelize_property__AMethid__min_arity 40
+#define COLOR_nitc__modelize_property__AMethid__is_binary 34
+#define COLOR_nitc__modelize_property__AMethid__min_arity 35
 short int nitc__modelize_property___AMethPropdef___look_like_a_root_init(val* self, val* p0, val* p1);
-#define COLOR_nitc__parser_nodes__ADefinition___n_kwredef 12
+#define COLOR_nitc__parser_nodes__ADefinition___n_kwredef 11
 extern const struct type type_nullable__nitc__MMethod;
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_block 20
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_block 21
 extern const struct type type_nitc__ABlockExpr;
-#define COLOR_nitc__parser_nodes__ABlockExpr___n_expr 12
+#define COLOR_nitc__parser_nodes__ABlockExpr___n_expr 3
 val* nitc__modelize_property___APropdef___new_property_visibility(val* self, val* p0, val* p1, val* p2);
-#define COLOR_nitc__model__MMethod___is_new 21
-#define COLOR_nitc__model__MClass___has_new_factory 21
-#define COLOR_nitc__model__MMethod___is_toplevel 18
+#define COLOR_nitc__model__MMethod___is_new 22
+#define COLOR_nitc__model__MClass___has_new_factory 22
+#define COLOR_nitc__model__MMethod___is_toplevel 19
 short int nitc__modelize_property___APropdef___check_redef_keyword(val* self, val* p0, val* p1, val* p2, short int p3, val* p4);
 extern const struct type type_nitc__AMainMethPropdef;
 void nitc__modelize_property___APropdef___check_redef_property_visibility(val* self, val* p0, val* p1, val* p2);
@@ -257,11 +260,11 @@ void nitc__modelize_property___APropdef___check_redef_property_visibility(val* s
 #define COLOR_core__abstract_collection__MapIterator__key 13
 #define COLOR_core__abstract_collection__MapIterator__item 14
 #define COLOR_core__abstract_collection__MapIterator__next 15
-#define COLOR_core__abstract_collection__Map___91d_93d_61d 21
+#define COLOR_core__abstract_collection__Map___91d_93d_61d 22
 void nitc__modelize_property___APropdef___set_doc(val* self, val* p0, val* p1);
 void core___core__HashMap___core__abstract_collection__Map___91d_93d_61d(val* self, val* p0, val* p1);
-#define COLOR_nitc__modelize_property__AMethid__accept_special_last_parameter 41
-#define COLOR_nitc__modelize_property__AMethid__return_is_mandatory 42
+#define COLOR_nitc__modelize_property__AMethid__accept_special_last_parameter 36
+#define COLOR_nitc__modelize_property__AMethid__return_is_mandatory 37
 extern const struct type type_core__Array__core__String;
 short int nitc__modelize_property___ASignature___visit_signature(val* self, val* p0, val* p1);
 long nitc___nitc__MSignature___arity(val* self);
@@ -276,38 +279,37 @@ val* core___core__SequenceRead___last(val* self);
 #define COLOR_nitc__model__MParameter___is_vararg 8
 #define COLOR_nitc__model__MMethodDef___is_abstract 18
 #define COLOR_nitc__model__MMethodDef___is_intern 19
-#define COLOR_nitc__parser_nodes__AMethPropdef___n_extern_code_block 23
+#define COLOR_nitc__parser_nodes__AMethPropdef___n_extern_code_block 24
 #define COLOR_nitc__model__MMethodDef___is_extern 20
 short int nitc__modelize_property___ASignature___check_signature(val* self, val* p0, val* p1);
 short int nitc___nitc__ModelBuilder___check_sametype(val* self, val* p0, val* p1, val* p2, val* p3, val* p4);
 #define COLOR_nitc__model__MParameter___name 6
 short int nitc___nitc__ModelBuilder___check_subtype(val* self, val* p0, val* p1, val* p2, val* p3, val* p4);
 void nitc__modelize_property___AMethPropdef___APropdef__check_repeated_types(val* self, val* p0);
-val* nitc___nitc__MPropDef___nitc__model_base__MEntity__name(val* self);
-#define COLOR_nitc__modelize_property__AAttrPropdef___mtype 10
-#define COLOR_nitc__modelize_property__AAttrPropdef___is_lazy 15
-#define COLOR_nitc__modelize_property__AAttrPropdef___mlazypropdef 17
-#define COLOR_nitc__parser_nodes__AAttrPropdef___n_id2 21
-#define COLOR_nitc__model__MClass___kind 15
+#define COLOR_nitc__modelize_property__AAttrPropdef___mtype 14
+#define COLOR_nitc__modelize_property__AAttrPropdef___is_lazy 16
+#define COLOR_nitc__modelize_property__AAttrPropdef___mlazypropdef 19
+#define COLOR_nitc__parser_nodes__AAttrPropdef___n_id2 23
+#define COLOR_nitc__model__MClass___kind 16
 #define COLOR_nitc__model__MClassKind___need_init 1
 val* NEW_nitc__MAttribute(const struct type* type);
 extern const struct type type_nitc__MAttribute;
 val* NEW_nitc__MAttributeDef(const struct type* type);
 extern const struct type type_nitc__MAttributeDef;
 extern const char FILE_nitc__mdoc[];
-#define COLOR_nitc__parser_nodes__AAttrPropdef___n_expr 24
-#define COLOR_nitc__parser_nodes__AAttrPropdef___n_block 26
+#define COLOR_nitc__parser_nodes__AAttrPropdef___n_expr 26
+#define COLOR_nitc__parser_nodes__AAttrPropdef___n_block 28
 val* nitc__model_base___core__Sys___none_visibility(val* self);
 #define COLOR_nitc__model_base__MEntity___is_fictive 1
 val* nitc__annotation___AAnnotation___arg_as_id(val* self, val* p0);
-#define COLOR_nitc__parser_nodes__AAttrPropdef___n_type 22
-#define COLOR_nitc__model__MType__resolve_for 27
+#define COLOR_nitc__parser_nodes__AAttrPropdef___n_type 24
+#define COLOR_nitc__model__MType__resolve_for 29
 extern const struct type type_nitc__ANewExpr;
-#define COLOR_nitc__parser_nodes__ANewExpr___n_type 13
+#define COLOR_nitc__parser_nodes__ANewExpr___n_type 4
 extern const struct type type_nitc__AAsCastExpr;
-#define COLOR_nitc__parser_nodes__AAsCastExpr___n_type 16
+#define COLOR_nitc__parser_nodes__AAsCastExpr___n_type 7
 extern const struct type type_nitc__AIntegerExpr;
-#define COLOR_nitc__literal__AIntegerExpr___value 13
+#define COLOR_nitc__literal__AIntegerExpr___value 4
 val* nitc___nitc__ModelBuilder___try_get_mclass_by_name(val* self, val* p0, val* p1, val* p2);
 extern const struct type type_core__Byte;
 extern const struct type type_core__Int8;
@@ -317,16 +319,22 @@ extern const struct type type_core__Int32;
 extern const struct type type_core__UInt32;
 extern const struct type type_nitc__AFloatExpr;
 extern const struct type type_nitc__ACharExpr;
+short int nitc__literal___ACharExpr___is_ascii(val* self);
+short int nitc__literal___ACharExpr___is_code_point(val* self);
 extern const struct type type_nitc__ABoolExpr;
 extern const struct type type_nitc__ASuperstringExpr;
 extern const struct type type_nitc__AStringFormExpr;
+short int nitc___nitc__AugmentedStringFormExpr___is_bytestring(val* self);
+short int nitc___nitc__AugmentedStringFormExpr___is_re(val* self);
+short int nitc___nitc__AugmentedStringFormExpr___is_string(val* self);
 #define COLOR_nitc__model__MAttributeDef___static_mtype 15
-val* nitc__model___Model___get_mclasses_by_name(val* self, val* p0);
+#define COLOR_nitc__model__MType__as_nullable 35
+val* nitc__model___MModule___bool_type(val* self);
 void nitc__modelize_property___AAttrPropdef___APropdef__check_repeated_types(val* self, val* p0);
 void nitc__modelize_property___AAttrPropdef___check_method_signature(val* self, val* p0, val* p1);
-#define COLOR_nitc__parser_nodes__ATypePropdef___n_qid 14
-#define COLOR_nitc__parser_nodes__AQclassid___n_id 6
+#define COLOR_nitc__parser_nodes__ATypePropdef___n_qid 15
+#define COLOR_nitc__parser_nodes__AQclassid___n_id 4
 val* NEW_nitc__MVirtualTypeProp(const struct type* type);
-#define COLOR_core__abstract_text__Text__chars 23
+#define COLOR_core__abstract_text__Text__chars 27
 extern const struct type type_core__Char;
-#define COLOR_nitc__parser_nodes__ATypePropdef___n_type 15
+#define COLOR_nitc__parser_nodes__ATypePropdef___n_type 16