|
|
@ -128,7 +128,7 @@ namespace CppSharp.Passes |
|
|
|
declarations.AddRange(decl.Namespace.Variables); |
|
|
|
declarations.AddRange(decl.Namespace.Variables); |
|
|
|
declarations.AddRange(from typedefDecl in decl.Namespace.Typedefs |
|
|
|
declarations.AddRange(from typedefDecl in decl.Namespace.Typedefs |
|
|
|
let pointerType = typedefDecl.Type.Desugar() as PointerType |
|
|
|
let pointerType = typedefDecl.Type.Desugar() as PointerType |
|
|
|
where pointerType != null && pointerType.Pointee is FunctionType |
|
|
|
where pointerType != null && pointerType.GetFinalPointee() is FunctionType |
|
|
|
select typedefDecl); |
|
|
|
select typedefDecl); |
|
|
|
var specialization = decl as ClassTemplateSpecialization; |
|
|
|
var specialization = decl as ClassTemplateSpecialization; |
|
|
|
if (specialization != null) |
|
|
|
if (specialization != null) |
|
|
@ -347,6 +347,9 @@ namespace CppSharp.Passes |
|
|
|
if (sb[0] == '@') |
|
|
|
if (sb[0] == '@') |
|
|
|
sb.Remove(0, 1); |
|
|
|
sb.Remove(0, 1); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// do not remove underscores from ALL_CAPS names
|
|
|
|
|
|
|
|
if (!decl.Name.Where(char.IsLetter).All(char.IsUpper)) |
|
|
|
|
|
|
|
{ |
|
|
|
for (int i = sb.Length - 1; i >= 0; i--) |
|
|
|
for (int i = sb.Length - 1; i >= 0; i--) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (sb[i] == '_' && i < sb.Length - 1) |
|
|
|
if (sb[i] == '_' && i < sb.Length - 1) |
|
|
@ -355,6 +358,7 @@ namespace CppSharp.Passes |
|
|
|
sb.Remove(i, 1); |
|
|
|
sb.Remove(i, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var @class = decl as Class; |
|
|
|
var @class = decl as Class; |
|
|
|
switch (pattern) |
|
|
|
switch (pattern) |
|
|
|