Browse Source

Fixed some bugs caused by conflicts.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/276/head
Dimitar Dobrev 11 years ago
parent
commit
8438f112e5
  1. 20
      src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs

20
src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs

@ -23,7 +23,7 @@ namespace CppSharp.Passes
public PropertyGenerator(Class @class) public PropertyGenerator(Class @class)
{ {
foreach (var method in @class.Methods.Where( foreach (var method in @class.Methods.Where(
m => !m.IsConstructor && !m.IsDestructor && !m.IsOperator && !m.Ignore)) m => !m.IsConstructor && !m.IsDestructor && !m.IsOperator && !m.IsSynthetized))
DistributeMethod(method); DistributeMethod(method);
} }
@ -154,9 +154,9 @@ namespace CppSharp.Passes
property.Comment = comment; property.Comment = comment;
} }
type.Properties.Add(property); type.Properties.Add(property);
getter.GenerationKind = GenerationKind.None; getter.GenerationKind = GenerationKind.Internal;
if (setter != null) if (setter != null)
setter.GenerationKind = GenerationKind.None; setter.GenerationKind = GenerationKind.Internal;
} }
} }
@ -232,15 +232,23 @@ namespace CppSharp.Passes
private static void LoadVerbs() private static void LoadVerbs()
{ {
using (var resourceStream = Assembly.GetExecutingAssembly() var assembly = Assembly.GetExecutingAssembly();
.GetManifestResourceStream("CppSharp.Generator.Passes.verbs.txt")) using (var resourceStream = GetResourceStream(assembly))
{ {
using (StreamReader streamReader = new StreamReader(resourceStream)) using (var streamReader = new StreamReader(resourceStream))
while (!streamReader.EndOfStream) while (!streamReader.EndOfStream)
verbs.Add(streamReader.ReadLine()); verbs.Add(streamReader.ReadLine());
} }
} }
private static Stream GetResourceStream(Assembly assembly)
{
var stream = assembly.GetManifestResourceStream("CppSharp.Generator.Passes.verbs.txt");
// HACK: a bug in premake for OS X causes resources to be embedded with an incorrect location
return stream ?? assembly.GetManifestResourceStream("verbs.txt");
}
public GetterSetterToPropertyAdvancedPass() public GetterSetterToPropertyAdvancedPass()
{ {
Options.VisitClassProperties = false; Options.VisitClassProperties = false;

Loading…
Cancel
Save