Browse Source

Renamed Template to CodeTemplate due to conflict with AST templates.

pull/742/head
Joao Matos 9 years ago
parent
commit
34ed304228
  1. 6
      src/Generator/Generator.cs
  2. 6
      src/Generator/Generators/CLI/CLIGenerator.cs
  3. 4
      src/Generator/Generators/CLI/CLITemplate.cs
  4. 6
      src/Generator/Generators/CSharp/CSharpGenerator.cs
  5. 4
      src/Generator/Generators/CSharp/CSharpSources.cs
  6. 6
      src/Generator/Generators/CodeTemplate.cs

6
src/Generator/Generator.cs

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using CppSharp.AST; using CppSharp.AST;
@ -31,7 +31,7 @@ namespace CppSharp.Generators
/// <summary> /// <summary>
/// Text templates with generated output. /// Text templates with generated output.
/// </summary> /// </summary>
public List<Template> Templates; public List<CodeTemplate> Templates;
} }
/// <summary> /// <summary>
@ -134,7 +134,7 @@ namespace CppSharp.Generators
/// <summary> /// <summary>
/// Generates the outputs for a given translation unit. /// Generates the outputs for a given translation unit.
/// </summary> /// </summary>
public abstract List<Template> Generate(IEnumerable<TranslationUnit> units); public abstract List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units);
protected abstract string TypePrinterDelegate(CppSharp.AST.Type type); protected abstract string TypePrinterDelegate(CppSharp.AST.Type type);

6
src/Generator/Generators/CLI/CLIGenerator.cs

@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using CppSharp.AST; using CppSharp.AST;
namespace CppSharp.Generators.CLI namespace CppSharp.Generators.CLI
@ -16,9 +16,9 @@ namespace CppSharp.Generators.CLI
typePrinter = new CLITypePrinter(context); typePrinter = new CLITypePrinter(context);
} }
public override List<Template> Generate(IEnumerable<TranslationUnit> units) public override List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units)
{ {
var outputs = new List<Template>(); var outputs = new List<CodeTemplate>();
var header = new CLIHeaders(Context, units); var header = new CLIHeaders(Context, units);
outputs.Add(header); outputs.Add(header);

4
src/Generator/Generators/CLI/CLITemplate.cs

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using CppSharp.AST; using CppSharp.AST;
@ -55,7 +55,7 @@ namespace CppSharp.Generators.CLI
/// for source (CLISources) and header (CLIHeaders) /// for source (CLISources) and header (CLIHeaders)
/// files. /// files.
/// </summary> /// </summary>
public abstract class CLITemplate : Template public abstract class CLITemplate : CodeTemplate
{ {
public CLITypePrinter TypePrinter { get; set; } public CLITypePrinter TypePrinter { get; set; }

6
src/Generator/Generators/CSharp/CSharpGenerator.cs

@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using CppSharp.AST; using CppSharp.AST;
using CppSharp.Passes; using CppSharp.Passes;
@ -15,9 +15,9 @@ namespace CppSharp.Generators.CSharp
expressionPrinter = new CSharpExpressionPrinter(typePrinter); expressionPrinter = new CSharpExpressionPrinter(typePrinter);
} }
public override List<Template> Generate(IEnumerable<TranslationUnit> units) public override List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units)
{ {
var outputs = new List<Template>(); var outputs = new List<CodeTemplate>();
var template = new CSharpSources(Context, units, typePrinter, expressionPrinter); var template = new CSharpSources(Context, units, typePrinter, expressionPrinter);
outputs.Add(template); outputs.Add(template);

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

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@ -122,7 +122,7 @@ namespace CppSharp.Generators.CSharp
public const int Finalizer = FIRST + 19; public const int Finalizer = FIRST + 19;
} }
public class CSharpSources : Template public class CSharpSources : CodeTemplate
{ {
public CSharpTypePrinter TypePrinter { get; private set; } public CSharpTypePrinter TypePrinter { get; private set; }
public CSharpExpressionPrinter ExpressionPrinter { get; private set; } public CSharpExpressionPrinter ExpressionPrinter { get; private set; }

6
src/Generator/Generators/Template.cs → src/Generator/Generators/CodeTemplate.cs

@ -4,7 +4,7 @@ using CppSharp.AST;
namespace CppSharp.Generators namespace CppSharp.Generators
{ {
public abstract class Template : BlockGenerator, IDeclVisitor<bool> public abstract class CodeTemplate : BlockGenerator, IDeclVisitor<bool>
{ {
public BindingContext Context { get; private set; } public BindingContext Context { get; private set; }
@ -16,12 +16,12 @@ namespace CppSharp.Generators
public abstract string FileExtension { get; } public abstract string FileExtension { get; }
protected Template(BindingContext context, TranslationUnit unit) protected CodeTemplate(BindingContext context, TranslationUnit unit)
: this(context, new List<TranslationUnit> { unit }) : this(context, new List<TranslationUnit> { unit })
{ {
} }
protected Template(BindingContext context, IEnumerable<TranslationUnit> units) protected CodeTemplate(BindingContext context, IEnumerable<TranslationUnit> units)
{ {
Context = context; Context = context;
TranslationUnits = new List<TranslationUnit>(units); TranslationUnits = new List<TranslationUnit>(units);
Loading…
Cancel
Save