Browse Source

Use a different name for driver options in CleanUnitPass so it does not hide an inherited name.

pull/1/head
triton 12 years ago
parent
commit
e7664911fe
  1. 9
      src/Generator/Passes/CleanUnitPass.cs

9
src/Generator/Passes/CleanUnitPass.cs

@ -2,12 +2,12 @@ namespace Cxxi.Passes @@ -2,12 +2,12 @@ namespace Cxxi.Passes
{
public class CleanUnitPass : TranslationUnitPass
{
public DriverOptions Options;
public DriverOptions DriverOptions;
public PassBuilder Passes;
public CleanUnitPass(DriverOptions options)
{
Options = options;
DriverOptions = options;
}
public override bool VisitTranslationUnit(TranslationUnit unit)
@ -24,7 +24,7 @@ namespace Cxxi.Passes @@ -24,7 +24,7 @@ namespace Cxxi.Passes
var includePath = filePath;
var shortestIncludePath = filePath;
foreach (var path in Options.IncludeDirs)
foreach (var path in DriverOptions.IncludeDirs)
{
int idx = filePath.IndexOf(path, System.StringComparison.Ordinal);
if (idx == -1) continue;
@ -35,7 +35,8 @@ namespace Cxxi.Passes @@ -35,7 +35,8 @@ namespace Cxxi.Passes
shortestIncludePath = inc;
}
return Options.IncludePrefix + shortestIncludePath.TrimStart(new char[] { '\\', '/' });
return DriverOptions.IncludePrefix
+ shortestIncludePath.TrimStart(new char[] { '\\', '/' });
}
}

Loading…
Cancel
Save