From: Alexis Laferrière Date: Mon, 13 Feb 2012 19:14:34 +0000 (-0500) Subject: ni: fix isa checks with new module names and updates c_src accordingly X-Git-Tag: v0.5~31^2~10 X-Git-Url: http://nitlanguage.org ni: fix isa checks with new module names and updates c_src accordingly Signed-off-by: Alexis Laferrière --- diff --git a/c_src/native_interface___frontier._sep.c b/c_src/native_interface___frontier._sep.c index 690083a..2f7837d 100644 --- a/c_src/native_interface___frontier._sep.c +++ b/c_src/native_interface___frontier._sep.c @@ -3749,7 +3749,7 @@ val_t native_interface___frontier___MMType___compile_condition_isa(val_t p0, val fra.me.REG[3] = fra.me.REG[3]; CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[3]); fra.me.REG[3] = CALL_metamodel___static_type___MMType___local_class(fra.me.REG[0])(fra.me.REG[0]); - fra.me.REG[3] = CALL_standard___string___Object___to_s(fra.me.REG[3])(fra.me.REG[3]); + fra.me.REG[3] = CALL_compiling___compiling_base___MMLocalClass___cname(fra.me.REG[3])(fra.me.REG[3]); CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[3]); if (!once_value_4) { fra.me.REG[3] = BOX_NativeString(" ): VALISA( "); @@ -3771,7 +3771,7 @@ val_t native_interface___frontier___MMType___compile_condition_isa(val_t p0, val fra.me.REG[1] = fra.me.REG[1]; CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]); fra.me.REG[0] = CALL_metamodel___static_type___MMType___local_class(fra.me.REG[0])(fra.me.REG[0]); - fra.me.REG[0] = CALL_standard___string___Object___to_s(fra.me.REG[0])(fra.me.REG[0]); + fra.me.REG[0] = CALL_compiling___compiling_base___MMLocalClass___cname(fra.me.REG[0])(fra.me.REG[0]); CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[0]); if (!once_value_6) { fra.me.REG[0] = BOX_NativeString(" ) )"); diff --git a/src/native_interface/frontier.nit b/src/native_interface/frontier.nit index 1f5d636..99a6e2f 100644 --- a/src/native_interface/frontier.nit +++ b/src/native_interface/frontier.nit @@ -451,7 +451,7 @@ redef class MMType # To be nested within a condition. fun compile_condition_isa( var_name : String ) : String do - return "( ISOBJ( {var_name} ) ? OBJISA( {var_name}, {local_class} ): VALISA( {var_name}, {local_class} ) )" + return "( ISOBJ( {var_name} ) ? OBJISA( {var_name}, {local_class.cname} ): VALISA( {var_name}, {local_class.cname} ) )" end # Defines a friendly type in C for a given Nit type.