pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Revert "Fixed bug caused by a type in the new parser." 

This reverts commit f1f6c2e5e9.
pull/123/head
triton 12 years ago
parent
c5f43c8d06
commit
4a29db6bcd
18 changed files with 324 additions and 541 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AST/Declaration.cs
  2. 116
      src/Core/Parser/ASTConverter.cs
  3. 31
      src/Core/Parser/Parser.cs
  4. 5
      src/Core/Project.cs
  5. 552
      src/CppParser/Bindings/CSharp/AST.cs
  6. 56
      src/CppParser/Bindings/CSharp/CppParser.cs
  7. 1
      src/CppParser/CppParser.h
  8. 2
      src/CppParser/Parser.cpp
  9. 15
      src/Generator/Driver.cs
  10. 3
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  11. 8
      src/Generator/Passes/CheckAmbiguousFunctions.cs
  12. 7
      src/Generator/Passes/CheckIgnoredDecls.cs
  13. 5
      src/Generator/Utils/TestsUtils.cs
  14. 21
      src/Parser/Main.cpp
  15. 18
      src/Parser/Parser.cpp
  16. 6
      src/Parser/Parser.h
  17. 6
      tests/Basic/Basic.cs
  18. 9
      tests/Basic/Basic.h

4
src/AST/Declaration.cs
Unescape View File

@ -200,9 +200,6 @@ namespace CppSharp.AST
public IntPtr OriginalPtr; public IntPtr OriginalPtr;
private string originalName; private string originalName;
// Reference to a data object associated with this declaration.
public object Data;
protected Declaration() protected Declaration()
{ {
Access = AccessSpecifier.Public; Access = AccessSpecifier.Public;
@ -236,7 +233,6 @@ namespace CppSharp.AST
PreprocessedEntities = new List<PreprocessedEntity>( PreprocessedEntities = new List<PreprocessedEntity>(
declaration.PreprocessedEntities); declaration.PreprocessedEntities);
OriginalPtr = declaration.OriginalPtr; OriginalPtr = declaration.OriginalPtr;
Data = declaration.Data;
} }
public override string ToString() public override string ToString()

116
src/Core/Parser/ASTConverter.cs
Unescape View File

@ -1,116 +0,0 @@
using System;
using System.Collections.Generic;
using CppSharp.AST;
#if !OLD_PARSER
namespace CppSharp.Parser
{
/// <summary>
/// Converts from native parser ASTs to managed ASTs.
/// </summary>
public class ASTConverter
{
public AST.ASTContext OriginalContext;
public ASTContext NewContext;
public ASTConverter(AST.ASTContext context)
{
OriginalContext = context;
}
public ASTContext Convert()
{
NewContext = new ASTContext();
foreach (var unit in OriginalContext.TranslationUnits)
{
var newUnit = ConvertTranslationUnit(unit);
NewContext.TranslationUnits.Add(newUnit);
}
return NewContext;
}
public TranslationUnit ConvertTranslationUnit(AST.TranslationUnit unit)
{
var newUnit = ConvertDeclaration<TranslationUnit>(unit);
newUnit.FilePath = unit.FileName;
foreach (var macro in unit.Macros)
{
var newMacro = ConvertMacroDefinition(macro);
newUnit.Macros.Add(newMacro);
}
return newUnit;
}
public T ConvertDeclaration<T>(AST.Declaration decl)
where T : Declaration, new()
{
var newDecl = new T
{
Access = ConvertAccessSpecifier(decl.Access),
//Comment = ConvertRawComment(),
//CompleteDeclaration =
// ConvertDeclaration<Declaration>(decl.CompleteDeclaration)
DebugText = decl.DebugText,
DefinitionOrder = decl.DefinitionOrder,
IsDependent = decl.IsDependent,
IsIncomplete = decl.IsIncomplete,
Name = decl.Name,
PreprocessedEntities =
ConvertPreprocessedEntities(decl.PreprocessedEntities),
Namespace = ConvertNamespace(decl._Namespace),
};
return newDecl;
}
IList<PreprocessedEntity>
ConvertPreprocessedEntities(IEnumerable<AST.PreprocessedEntity> entities)
{
var newEntities = new List<PreprocessedEntity>();
foreach (var entity in entities)
{
//var newEntity = ConvertDeclaration<PreprocessedEntity>(entity);
//newEntities.Add(newEntity);
}
return newEntities;
}
DeclarationContext ConvertNamespace(AST.DeclarationContext context)
{
var newNamespace = new Namespace();
return newNamespace;
}
AccessSpecifier ConvertAccessSpecifier(AST.AccessSpecifier access)
{
switch (access)
{
case AST.AccessSpecifier.Private:
return AccessSpecifier.Private;
case AST.AccessSpecifier.Protected:
return AccessSpecifier.Protected;
case AST.AccessSpecifier.Public:
return AccessSpecifier.Public;
}
throw new NotSupportedException();
}
MacroDefinition ConvertMacroDefinition(AST.MacroDefinition macro)
{
var newMacro = ConvertDeclaration<MacroDefinition>(macro);
newMacro.Expression = macro.Expression;
return newMacro;
}
}
}
#endif

31
src/Core/Parser/Parser.cs
Unescape View File

@ -31,10 +31,10 @@ namespace CppSharp
/// </summary> /// </summary>
public Action<string, ParserResult> LibraryParsed = delegate {}; public Action<string, ParserResult> LibraryParsed = delegate {};
public ClangParser(ASTContext astContext, SymbolContext symbolContext) public ClangParser()
{ {
ASTContext = astContext; ASTContext = new ASTContext();
SymbolsContext = symbolContext; SymbolsContext = new SymbolContext();
} }
/// <summary> /// <summary>
@ -51,20 +51,6 @@ namespace CppSharp
return result; return result;
} }
/// <summary>
/// Parses a serialized AST file to a translation unit.
/// </summary>
public ParserResult ParseASTFile(SourceFile file, ParserOptions options)
{
options.ASTContext = ASTContext;
options.FileName = file.Path;
var result = Parser.ClangParser.ParseHeader(options);
SourceParsed(file, result);
return result;
}
/// <summary> /// <summary>
/// Parses the project source files. /// Parses the project source files.
/// </summary> /// </summary>
@ -74,19 +60,8 @@ namespace CppSharp
// TODO: Do multi-threaded parsing of source files // TODO: Do multi-threaded parsing of source files
foreach (var source in project.Sources) foreach (var source in project.Sources)
{
// Search for a serialized AST of the source file.
var path = LookupSerializedAST(project, source);
ParseSourceFile(source, options); ParseSourceFile(source, options);
} }
}
private string LookupSerializedAST(Project project, SourceFile source)
{
var cachePath = project.Cache;
return string.Empty;
}
/// <summary> /// <summary>
/// Parses a library file with symbols. /// Parses a library file with symbols.

5
src/Core/Project.cs
Unescape View File

@ -48,11 +48,6 @@ namespace CppSharp
/// </summary> /// </summary>
public class Project public class Project
{ {
/// <summary>
/// Path to the cache repository.
/// </summary>
public string Cache { get; private set; }
/// <summary> /// <summary>
/// List of per-project C/C++ preprocessor defines. /// List of per-project C/C++ preprocessor defines.
/// </summary> /// </summary>

552
src/CppParser/Bindings/CSharp/AST.cs
View File

File diff suppressed because it is too large Load Diff

56
src/CppParser/Bindings/CSharp/CppParser.cs
Unescape View File

@ -80,14 +80,14 @@ namespace CppSharp
public bool Verbose; public bool Verbose;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserOptions@CppParser@CppSharp@@QAE@XZ")] EntryPoint="??0ParserOptions@CppParser@CppSharp@@QAE@XZ")]
public static extern global::System.IntPtr ParserOptions_0(global::System.IntPtr instance); public static extern global::System.IntPtr ParserOptions0(global::System.IntPtr instance);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserOptions@CppParser@CppSharp@@QAE@ABU012@@Z")] EntryPoint="??0ParserOptions@CppParser@CppSharp@@QAE@ABU012@@Z")]
public static extern global::System.IntPtr ParserOptions_2(global::System.IntPtr instance, global::System.IntPtr _0); public static extern global::System.IntPtr ParserOptions2(global::System.IntPtr instance, global::System.IntPtr _0);
} }
public global::System.IntPtr __Instance { get; protected set; } public global::System.IntPtr __Instance { get; protected set; }
@ -123,7 +123,7 @@ namespace CppSharp
public ParserOptions() public ParserOptions()
{ {
__Instance = Marshal.AllocHGlobal(112); __Instance = Marshal.AllocHGlobal(112);
Internal.ParserOptions_0(__Instance); Internal.ParserOptions0(__Instance);
} }
public void Dispose() public void Dispose()
@ -224,7 +224,7 @@ namespace CppSharp
set set
{ {
var __ptr = (Internal*)__Instance.ToPointer(); var __ptr = (Internal*)__Instance.ToPointer();
__ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; __ptr->ASTContext = value.__Instance;
} }
} }
@ -355,14 +355,14 @@ namespace CppSharp
public int ColumnNumber; public int ColumnNumber;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserDiagnostic@CppParser@CppSharp@@QAE@XZ")] EntryPoint="??0ParserDiagnostic@CppParser@CppSharp@@QAE@XZ")]
public static extern global::System.IntPtr ParserDiagnostic_1(global::System.IntPtr instance); public static extern global::System.IntPtr ParserDiagnostic1(global::System.IntPtr instance);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserDiagnostic@CppParser@CppSharp@@QAE@ABU012@@Z")] EntryPoint="??0ParserDiagnostic@CppParser@CppSharp@@QAE@ABU012@@Z")]
public static extern global::System.IntPtr ParserDiagnostic_2(global::System.IntPtr instance, global::System.IntPtr _0); public static extern global::System.IntPtr ParserDiagnostic2(global::System.IntPtr instance, global::System.IntPtr _0);
} }
public global::System.IntPtr __Instance { get; protected set; } public global::System.IntPtr __Instance { get; protected set; }
@ -398,7 +398,7 @@ namespace CppSharp
public ParserDiagnostic() public ParserDiagnostic()
{ {
__Instance = Marshal.AllocHGlobal(60); __Instance = Marshal.AllocHGlobal(60);
Internal.ParserDiagnostic_1(__Instance); Internal.ParserDiagnostic1(__Instance);
} }
public void Dispose() public void Dispose()
@ -506,14 +506,14 @@ namespace CppSharp
public global::System.IntPtr Library; public global::System.IntPtr Library;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@XZ")] EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@XZ")]
public static extern global::System.IntPtr ParserResult_1(global::System.IntPtr instance); public static extern global::System.IntPtr ParserResult1(global::System.IntPtr instance);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@ABU012@@Z")] EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@ABU012@@Z")]
public static extern global::System.IntPtr ParserResult_2(global::System.IntPtr instance, global::System.IntPtr _0); public static extern global::System.IntPtr ParserResult2(global::System.IntPtr instance, global::System.IntPtr _0);
} }
public global::System.IntPtr __Instance { get; protected set; } public global::System.IntPtr __Instance { get; protected set; }
@ -549,7 +549,7 @@ namespace CppSharp
public ParserResult() public ParserResult()
{ {
__Instance = Marshal.AllocHGlobal(24); __Instance = Marshal.AllocHGlobal(24);
Internal.ParserResult_1(__Instance); Internal.ParserResult1(__Instance);
} }
public void Dispose() public void Dispose()
@ -605,7 +605,7 @@ namespace CppSharp
set set
{ {
var __ptr = (Internal*)__Instance.ToPointer(); var __ptr = (Internal*)__Instance.ToPointer();
__ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; __ptr->ASTContext = value.__Instance;
} }
} }
@ -621,7 +621,7 @@ namespace CppSharp
set set
{ {
var __ptr = (Internal*)__Instance.ToPointer(); var __ptr = (Internal*)__Instance.ToPointer();
__ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance; __ptr->Library = value.__Instance;
} }
} }
} }
@ -632,19 +632,19 @@ namespace CppSharp
public struct Internal public struct Internal
{ {
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.ThisCall,
EntryPoint="??0ClangParser@CppParser@CppSharp@@QAE@ABV012@@Z")] EntryPoint="??0ClangParser@CppParser@CppSharp@@QAE@ABV012@@Z")]
public static extern global::System.IntPtr ClangParser_1(global::System.IntPtr instance, global::System.IntPtr _0); public static extern global::System.IntPtr ClangParser1(global::System.IntPtr instance, global::System.IntPtr _0);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl,
EntryPoint="?ParseHeader@ClangParser@CppParser@CppSharp@@SAPAUParserResult@23@PAUParserOptions@23@@Z")] EntryPoint="?ParseHeader@ClangParser@CppParser@CppSharp@@SAPAUParserResult@23@PAUParserOptions@23@@Z")]
public static extern global::System.IntPtr ParseHeader_0(global::System.IntPtr Opts); public static extern global::System.IntPtr ParseHeader0(global::System.IntPtr Opts);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, [DllImport("CppSharp.CppParser.dll", CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl,
EntryPoint="?ParseLibrary@ClangParser@CppParser@CppSharp@@SAPAUParserResult@23@PAUParserOptions@23@@Z")] EntryPoint="?ParseLibrary@ClangParser@CppParser@CppSharp@@SAPAUParserResult@23@PAUParserOptions@23@@Z")]
public static extern global::System.IntPtr ParseLibrary_0(global::System.IntPtr Opts); public static extern global::System.IntPtr ParseLibrary0(global::System.IntPtr Opts);
} }
public global::System.IntPtr __Instance { get; protected set; } public global::System.IntPtr __Instance { get; protected set; }
@ -695,16 +695,16 @@ namespace CppSharp
public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts) public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts)
{ {
var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; var arg0 = Opts.__Instance;
var __ret = Internal.ParseHeader_0(arg0); var __ret = Internal.ParseHeader0(arg0);
if (__ret == global::System.IntPtr.Zero) return null; if (__ret == global::System.IntPtr.Zero) return null;
return new CppSharp.Parser.ParserResult(__ret); return new CppSharp.Parser.ParserResult(__ret);
} }
public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts) public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts)
{ {
var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; var arg0 = Opts.__Instance;
var __ret = Internal.ParseLibrary_0(arg0); var __ret = Internal.ParseLibrary0(arg0);
if (__ret == global::System.IntPtr.Zero) return null; if (__ret == global::System.IntPtr.Zero) return null;
return new CppSharp.Parser.ParserResult(__ret); return new CppSharp.Parser.ParserResult(__ret);
} }

1
src/CppParser/CppParser.h
Unescape View File

@ -36,7 +36,6 @@ struct CS_API ParserOptions
std::vector<std::string> LibraryDirs; std::vector<std::string> LibraryDirs;
CppSharp::CppParser::AST::ASTContext* ASTContext; CppSharp::CppParser::AST::ASTContext* ASTContext;
//CppSharp::CppParser::AST::SymbolContext* SymbolsContext;
int ToolSetToUse; int ToolSetToUse;
std::string TargetTriple; std::string TargetTriple;

2
src/CppParser/Parser.cpp
Unescape View File

@ -1527,7 +1527,7 @@ void Parser::WalkFunction(clang::FunctionDecl* FD, Function* F,
F->IsInline = FD->isInlined(); F->IsInline = FD->isInlined();
F->IsDependent = FD->isDependentContext(); F->IsDependent = FD->isDependentContext();
F->IsPure = FD->isPure(); F->IsPure = FD->isPure();
F->IsDeleted = FD->isDeleted(); F->IsPure = FD->isDeleted();
auto CC = FT->getCallConv(); auto CC = FT->getCallConv();
F->CallingConvention = ConvertCallConv(CC); F->CallingConvention = ConvertCallConv(CC);

15
src/Generator/Driver.cs
Unescape View File

@ -1,5 +1,4 @@
using System; using System.CodeDom.Compiler;
using System.CodeDom.Compiler;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
@ -38,7 +37,6 @@ namespace CppSharp
Options = options; Options = options;
Diagnostics = diagnostics; Diagnostics = diagnostics;
Project = new Project(); Project = new Project();
ASTContext = new ASTContext();
Symbols = new SymbolContext(); Symbols = new SymbolContext();
TypeDatabase = new TypeMapDatabase(); TypeDatabase = new TypeMapDatabase();
TranslationUnitPasses = new PassBuilder<TranslationUnitPass>(this); TranslationUnitPasses = new PassBuilder<TranslationUnitPass>(this);
@ -152,13 +150,16 @@ namespace CppSharp
source.Options = BuildParseOptions(source); source.Options = BuildParseOptions(source);
} }
var parser = new ClangParser(ASTContext, Symbols); var parser = new ClangParser();
parser.SourceParsed += OnSourceFileParsed; parser.SourceParsed += OnSourceFileParsed;
parser.LibraryParsed += OnFileParsed;
parser.ParseProject(Project, Options); parser.ParseProject(Project, Options);
#if !OLD_PARSER #if !OLD_PARSER
ASTContext = ClangParser.ConvertASTContext(parser.ASTContext); ASTContext = ClangParser.ConvertASTContext(parser.ASTContext);
#else
ASTContext = parser.ASTContext;
#endif #endif
return true; return true;
@ -168,9 +169,7 @@ namespace CppSharp
{ {
foreach (var library in Options.Libraries) foreach (var library in Options.Libraries)
{ {
var parser = new ClangParser(ASTContext, Symbols); var parser = new ClangParser();
parser.LibraryParsed += OnFileParsed;
var res = parser.ParseLibrary(library, Options); var res = parser.ParseLibrary(library, Options);
if (res.Kind != ParserResultKind.Success) if (res.Kind != ParserResultKind.Success)
@ -309,8 +308,6 @@ namespace CppSharp
{ {
public static void Run(ILibrary library) public static void Run(ILibrary library)
{ {
try { Console.BufferHeight = 2000; } catch (Exception ex) { }
var options = new DriverOptions(); var options = new DriverOptions();
var driver = new Driver(options, new TextDiagnosticPrinter()); var driver = new Driver(options, new TextDiagnosticPrinter());
library.Setup(driver); library.Setup(driver);

3
src/Generator/Generators/CSharp/CSharpTextTemplate.cs
Unescape View File

@ -333,9 +333,6 @@ namespace CppSharp.Generators.CSharp
if (@class.Ignore || @class.IsIncomplete) if (@class.Ignore || @class.IsIncomplete)
return; return;
//if (@class.Name == "ISceneNodeAnimator")
// System.Diagnostics.Debugger.Break();
PushBlock(CSharpBlockKind.Class); PushBlock(CSharpBlockKind.Class);
GenerateDeclarationCommon(@class); GenerateDeclarationCommon(@class);

8
src/Generator/Passes/CheckAmbiguousFunctions.cs
Unescape View File

@ -23,14 +23,6 @@ namespace CppSharp.Passes
/// </summary> /// </summary>
public class CheckAmbiguousFunctions : TranslationUnitPass public class CheckAmbiguousFunctions : TranslationUnitPass
{ {
public override bool VisitMethodDecl(Method method)
{
//if (method.Kind != CXXMethodKind.Normal)
// return false;
return base.VisitMethodDecl(method);
}
public override bool VisitFunctionDecl(AST.Function function) public override bool VisitFunctionDecl(AST.Function function)
{ {
if (AlreadyVisited(function)) if (AlreadyVisited(function))

7
src/Generator/Passes/CheckIgnoredDecls.cs
Unescape View File

@ -7,16 +7,13 @@ namespace CppSharp.Passes
{ {
public override bool VisitDeclaration(Declaration decl) public override bool VisitDeclaration(Declaration decl)
{ {
//if (AlreadyVisited(decl))
// return false;
if (decl.ExplicityIgnored) if (decl.ExplicityIgnored)
return false; return false;
if (decl.Access != AccessSpecifier.Public) if (decl.Access == AccessSpecifier.Private)
{ {
Method method = decl as Method; Method method = decl as Method;
//if (method == null || !method.IsOverride) if (method == null || !method.IsOverride)
{ {
decl.ExplicityIgnored = true; decl.ExplicityIgnored = true;
return false; return false;

5
src/Generator/Utils/TestsUtils.cs
Unescape View File

@ -61,7 +61,6 @@ namespace CppSharp.Utils
options.GenerateLibraryNamespace = true; options.GenerateLibraryNamespace = true;
options.Quiet = true; options.Quiet = true;
options.IgnoreParseWarnings = true; options.IgnoreParseWarnings = true;
SetupOptions(options);
driver.Diagnostics.EmitMessage("Generating bindings for {0} in {1} mode", driver.Diagnostics.EmitMessage("Generating bindings for {0} in {1} mode",
options.LibraryName, options.GeneratorKind.ToString()); options.LibraryName, options.GeneratorKind.ToString());
@ -81,10 +80,6 @@ namespace CppSharp.Utils
options.Headers.Add(Path.GetFileName(file)); options.Headers.Add(Path.GetFileName(file));
} }
public virtual void SetupOptions(DriverOptions options)
{
}
public virtual void Preprocess(Driver driver, ASTContext lib) public virtual void Preprocess(Driver driver, ASTContext lib)
{ {
} }

21
src/Parser/Main.cpp
Unescape View File

@ -14,27 +14,6 @@ public ref class ClangParser
{ {
public: public:
static ParserResult^ ReadAST(ParserOptions^ Opts)
{
if (!Opts->FileName) return nullptr;
using namespace clix;
std::string File = marshalString<E_UTF8>(Opts->FileName);
::Parser parser(Opts);
return parser.ParseHeader(File);
}
static bool WriteAST(ParserOptions^ Opts)
{
if (!Opts->FileName) return false;
using namespace clix;
std::string File = marshalString<E_UTF8>(Opts->FileName);
return true;
}
static ParserResult^ ParseHeader(ParserOptions^ Opts) static ParserResult^ ParseHeader(ParserOptions^ Opts)
{ {
if (!Opts->FileName) return nullptr; if (!Opts->FileName) return nullptr;

18
src/Parser/Parser.cpp
Unescape View File

@ -2292,8 +2292,7 @@ ParserResult^ Parser::ParseHeader(const std::string& File)
} }
ParserResultKind Parser::ParseArchive(llvm::StringRef File, ParserResultKind Parser::ParseArchive(llvm::StringRef File,
llvm::MemoryBuffer *Buffer, llvm::MemoryBuffer *Buffer)
CppSharp::AST::NativeLibrary^ NativeLib)
{ {
llvm::error_code Code; llvm::error_code Code;
llvm::object::Archive Archive(Buffer, Code); llvm::object::Archive Archive(Buffer, Code);
@ -2302,7 +2301,7 @@ ParserResultKind Parser::ParseArchive(llvm::StringRef File,
return ParserResultKind::Error; return ParserResultKind::Error;
auto LibName = clix::marshalString<clix::E_UTF8>(File); auto LibName = clix::marshalString<clix::E_UTF8>(File);
NativeLib->FileName = LibName; auto NativeLib = Symbols->FindOrCreateLibrary(LibName);
for(auto it = Archive.begin_symbols(); it != Archive.end_symbols(); ++it) for(auto it = Archive.begin_symbols(); it != Archive.end_symbols(); ++it)
{ {
@ -2319,8 +2318,7 @@ ParserResultKind Parser::ParseArchive(llvm::StringRef File,
} }
ParserResultKind Parser::ParseSharedLib(llvm::StringRef File, ParserResultKind Parser::ParseSharedLib(llvm::StringRef File,
llvm::MemoryBuffer *Buffer, llvm::MemoryBuffer *Buffer)
CppSharp::AST::NativeLibrary^ NativeLib)
{ {
auto Object = llvm::object::ObjectFile::createObjectFile(Buffer); auto Object = llvm::object::ObjectFile::createObjectFile(Buffer);
@ -2328,7 +2326,7 @@ ParserResultKind Parser::ParseSharedLib(llvm::StringRef File,
return ParserResultKind::Error; return ParserResultKind::Error;
auto LibName = clix::marshalString<clix::E_UTF8>(File); auto LibName = clix::marshalString<clix::E_UTF8>(File);
NativeLib->FileName = LibName; auto NativeLib = Symbols->FindOrCreateLibrary(LibName);
llvm::error_code ec; llvm::error_code ec;
for(auto it = Object->begin_symbols(); it != Object->end_symbols(); it.increment(ec)) for(auto it = Object->begin_symbols(); it != Object->end_symbols(); it.increment(ec))
@ -2391,15 +2389,11 @@ ParserResult^ Parser::ParseLibrary(const std::string& File)
return res; return res;
} }
res->Kind = ParseArchive(File, FM.getBufferForFile(FileEntry), res->Kind = ParseArchive(File, FM.getBufferForFile(FileEntry));
res->Library);
if (res->Kind == ParserResultKind::Success) if (res->Kind == ParserResultKind::Success)
return res; return res;
res->Kind = ParseSharedLib(File, FM.getBufferForFile(FileEntry), res->Kind = ParseSharedLib(File, FM.getBufferForFile(FileEntry));
res->Library);
if (res->Kind == ParserResultKind::Success) if (res->Kind == ParserResultKind::Success)
return res; return res;

6
src/Parser/Parser.h
Unescape View File

@ -49,11 +49,9 @@ struct Parser
ParserResult^ ParseHeader(const std::string& File); ParserResult^ ParseHeader(const std::string& File);
ParserResult^ ParseLibrary(const std::string& File); ParserResult^ ParseLibrary(const std::string& File);
ParserResultKind ParseArchive(llvm::StringRef File, ParserResultKind ParseArchive(llvm::StringRef File,
llvm::MemoryBuffer *Buffer, llvm::MemoryBuffer *Buffer);
CppSharp::AST::NativeLibrary^ NativeLib);
ParserResultKind ParseSharedLib(llvm::StringRef File, ParserResultKind ParseSharedLib(llvm::StringRef File,
llvm::MemoryBuffer *Buffer, llvm::MemoryBuffer *Buffer);
CppSharp::AST::NativeLibrary^ NativeLib);
protected: protected:

6
tests/Basic/Basic.cs
Unescape View File

@ -13,12 +13,6 @@ namespace CppSharp.Tests
{ {
} }
public override void SetupOptions(DriverOptions options)
{
options.Libraries.Add("Basic.Native.lib");
options.CheckSymbols = true;
}
public override void Preprocess(Driver driver, ASTContext lib) public override void Preprocess(Driver driver, ASTContext lib)
{ {
lib.SetClassAsValueType("Bar"); lib.SetClassAsValueType("Bar");

9
tests/Basic/Basic.h
Unescape View File

@ -164,12 +164,3 @@ class Base
class Derived : public Base<Derived> class Derived : public Base<Derived>
{ {
}; };
// Const and non-const constructor overloads
// https://github.com/mono/CppSharp/issues/102
struct Overloaded
{
Overloaded(void* p) {}
Overloaded(const void* p) {}
};
Write Preview
Loading…
Cancel
Save