[[ Bug 14993 ]] Emit 'undefined' type as 'nothing' in interface file.

runrevmark · runrevmark · commit 23f881209132 · 2015-03-31T13:28:50.000+01:00
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -1136,15 +1136,22 @@ static void def_to_name(MCScriptModuleRef self, uindex_t p_index, MCStringRef& r
 {
     MCScriptDefinition *t_def;
     t_def = self -> definitions[p_index];
+    
+    MCNameRef t_name;
     if (t_def -> kind == kMCScriptDefinitionKindExternal)
     {
         MCScriptExternalDefinition *t_ext_def;
         t_ext_def = static_cast<MCScriptExternalDefinition *>(t_def);
         
-        MCStringFormat(r_string, "%@", /*self -> dependencies[self -> imported_definitions[t_ext_def -> index] . module] . name, */self -> imported_definitions[t_ext_def -> index] . name);
+        t_name = self -> imported_definitions[t_ext_def -> index] . name;
     }
     else
-        MCStringFormat(r_string, "%@", self -> definition_names[p_index]);
+        t_name = self -> definition_names[p_index];
+    
+    if (!MCNameIsEqualTo(t_name, MCNAME("undefined")))
+        MCStringFormat(r_string, "%@", t_name);
+    else
+        MCStringFormat(r_string, "nothing");
 }
 
 static void type_to_string(MCScriptModuleRef self, uindex_t p_type, MCStringRef& r_string)

Original file line number	Diff line number	Diff line change
`@@ -1136,15 +1136,22 @@ static void def_to_name(MCScriptModuleRef self, uindex_t p_index, MCStringRef& r`
`1136`	`1136`	`{`
`1137`	`1137`	`MCScriptDefinition *t_def;`
`1138`	`1138`	`t_def = self -> definitions[p_index];`
	`1139`	`+`
	`1140`	`+ MCNameRef t_name;`
`1139`	`1141`	`if (t_def -> kind == kMCScriptDefinitionKindExternal)`
`1140`	`1142`	`{`
`1141`	`1143`	`MCScriptExternalDefinition *t_ext_def;`
`1142`	`1144`	`t_ext_def = static_cast<MCScriptExternalDefinition *>(t_def);`
`1143`	`1145`
`1144`		`- MCStringFormat(r_string, "%@", /self -> dependencies[self -> imported_definitions[t_ext_def -> index] . module] . name, /self -> imported_definitions[t_ext_def -> index] . name);`
	`1146`	`+ t_name = self -> imported_definitions[t_ext_def -> index] . name;`
`1145`	`1147`	`}`
`1146`	`1148`	`else`
`1147`		`- MCStringFormat(r_string, "%@", self -> definition_names[p_index]);`
	`1149`	`+ t_name = self -> definition_names[p_index];`
	`1150`	`+`
	`1151`	`+ if (!MCNameIsEqualTo(t_name, MCNAME("undefined")))`
	`1152`	`+ MCStringFormat(r_string, "%@", t_name);`
	`1153`	`+ else`
	`1154`	`+ MCStringFormat(r_string, "nothing");`
`1148`	`1155`	`}`
`1149`	`1156`
`1150`	`1157`	`static void type_to_string(MCScriptModuleRef self, uindex_t p_type, MCStringRef& r_string)`