Browse Source

Revert "Extract current module as read-only property to CodeGenerator.Module."

This reverts commit d340de3afa.
pull/761/head
Joao Matos 9 years ago
parent
commit
40bfd65135
  1. 15
      src/Generator/Generators/CSharp/CSharpSources.cs
  2. 3
      src/Generator/Generators/CodeGenerator.cs

15
src/Generator/Generators/CSharp/CSharpSources.cs

@ -149,14 +149,17 @@ namespace CppSharp.Generators.CSharp
{ {
GenerateFilePreamble(); GenerateFilePreamble();
var module = TranslationUnits.Count == 0 ?
Context.Options.SystemModule : TranslationUnit.Module;
PushBlock(CSharpBlockKind.Usings); PushBlock(CSharpBlockKind.Usings);
WriteLine("using System;"); WriteLine("using System;");
WriteLine("using System.Runtime.InteropServices;"); WriteLine("using System.Runtime.InteropServices;");
WriteLine("using System.Security;"); WriteLine("using System.Security;");
var internalsVisibleTo = from m in Options.Modules var internalsVisibleTo = (from m in Options.Modules
where m.Dependencies.Contains(Module) where m.Dependencies.Contains(module)
select m.LibraryName; select m.LibraryName).ToList();
if (internalsVisibleTo.Any()) if (internalsVisibleTo.Any())
WriteLine("using System.Runtime.CompilerServices;"); WriteLine("using System.Runtime.CompilerServices;");
@ -170,17 +173,17 @@ namespace CppSharp.Generators.CSharp
if (internalsVisibleTo.Any()) if (internalsVisibleTo.Any())
NewLine(); NewLine();
if (!string.IsNullOrEmpty(Module.OutputNamespace)) if (!string.IsNullOrEmpty(module.OutputNamespace))
{ {
PushBlock(CSharpBlockKind.Namespace); PushBlock(CSharpBlockKind.Namespace);
WriteLine("namespace {0}", Module.OutputNamespace); WriteLine("namespace {0}", module.OutputNamespace);
WriteStartBraceIndent(); WriteStartBraceIndent();
} }
foreach (var unit in TranslationUnits) foreach (var unit in TranslationUnits)
unit.Visit(this); unit.Visit(this);
if (!string.IsNullOrEmpty(Module.OutputNamespace)) if (!string.IsNullOrEmpty(module.OutputNamespace))
{ {
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);

3
src/Generator/Generators/CodeGenerator.cs

@ -14,9 +14,6 @@ namespace CppSharp.Generators
public TranslationUnit TranslationUnit => TranslationUnits[0]; public TranslationUnit TranslationUnit => TranslationUnits[0];
public Module Module => TranslationUnits.Count == 0 ?
Context.Options.SystemModule : TranslationUnit.Module;
public abstract string FileExtension { get; } public abstract string FileExtension { get; }
protected CodeGenerator(BindingContext context, TranslationUnit unit) protected CodeGenerator(BindingContext context, TranslationUnit unit)

Loading…
Cancel
Save