Browse Source

Yet another fix for qualified names when generating method/function calls.

pull/1/head
triton 12 years ago
parent
commit
b4ed2653a8
  1. 11
      src/Generator/Generators/CLI/CLISourcesTemplate.cs

11
src/Generator/Generators/CLI/CLISourcesTemplate.cs

@ -384,7 +384,7 @@ namespace Cxxi.Generators.CLI
GenerateDeclarationCommon(function); GenerateDeclarationCommon(function);
var classSig = string.Format("{0}::{1}{2}", QualifiedIdentifier(@namespace), var classSig = string.Format("{0}{1}{2}", QualifiedIdentifier(@namespace),
Library.Name, TranslationUnit.FileNameWithoutExtension); Library.Name, TranslationUnit.FileNameWithoutExtension);
Write("{0} {1}::{2}(", function.ReturnType, classSig, Write("{0} {1}::{2}(", function.ReturnType, classSig,
@ -426,19 +426,20 @@ namespace Cxxi.Generators.CLI
{ {
Write("this0->"); Write("this0->");
} }
else else if (IsInstanceFunction(function))
{ {
Write("((::{0}*)NativePtr)->", @class.QualifiedOriginalName);
}
if (IsInstanceFunction(function)) if (IsInstanceFunction(function))
{ {
Write("((::{0}*)NativePtr)->", @class.QualifiedOriginalName); Write("{0}(", function.OriginalName);
Write("{0}(", function.Name);
} }
else else
{ {
Write("::"); Write("::");
Write("{0}(", function.QualifiedOriginalName); Write("{0}(", function.QualifiedOriginalName);
} }
}
GenerateFunctionParams(@params); GenerateFunctionParams(@params);
WriteLine(");"); WriteLine(");");

Loading…
Cancel
Save