diff options
Diffstat (limited to 'src/WixToolset.Core/Preprocessor.cs')
| -rw-r--r-- | src/WixToolset.Core/Preprocessor.cs | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs index a9fbcbb7..85b3dab8 100644 --- a/src/WixToolset.Core/Preprocessor.cs +++ b/src/WixToolset.Core/Preprocessor.cs | |||
| @@ -38,7 +38,6 @@ namespace WixToolset | |||
| 38 | 38 | ||
| 39 | private List<IPreprocessorExtension> extensions; | 39 | private List<IPreprocessorExtension> extensions; |
| 40 | private Dictionary<string, IPreprocessorExtension> extensionsByPrefix; | 40 | private Dictionary<string, IPreprocessorExtension> extensionsByPrefix; |
| 41 | private List<InspectorExtension> inspectorExtensions; | ||
| 42 | 41 | ||
| 43 | private SourceLineNumber currentLineNumber; | 42 | private SourceLineNumber currentLineNumber; |
| 44 | private Stack<SourceLineNumber> sourceStack; | 43 | private Stack<SourceLineNumber> sourceStack; |
| @@ -60,7 +59,6 @@ namespace WixToolset | |||
| 60 | 59 | ||
| 61 | this.extensions = new List<IPreprocessorExtension>(); | 60 | this.extensions = new List<IPreprocessorExtension>(); |
| 62 | this.extensionsByPrefix = new Dictionary<string, IPreprocessorExtension>(); | 61 | this.extensionsByPrefix = new Dictionary<string, IPreprocessorExtension>(); |
| 63 | this.inspectorExtensions = new List<InspectorExtension>(); | ||
| 64 | 62 | ||
| 65 | this.sourceStack = new Stack<SourceLineNumber>(); | 63 | this.sourceStack = new Stack<SourceLineNumber>(); |
| 66 | 64 | ||
| @@ -201,27 +199,9 @@ namespace WixToolset | |||
| 201 | public XDocument Process(string sourceFile, IDictionary<string, string> variables) | 199 | public XDocument Process(string sourceFile, IDictionary<string, string> variables) |
| 202 | { | 200 | { |
| 203 | using (Stream sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read)) | 201 | using (Stream sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read)) |
| 202 | using (XmlReader reader = XmlReader.Create(sourceFile, DocumentXmlReaderSettings)) | ||
| 204 | { | 203 | { |
| 205 | InspectorCore inspectorCore = new InspectorCore(); | 204 | return Process(reader, variables, sourceFile); |
| 206 | foreach (InspectorExtension inspectorExtension in this.inspectorExtensions) | ||
| 207 | { | ||
| 208 | inspectorExtension.Core = inspectorCore; | ||
| 209 | inspectorExtension.InspectSource(sourceStream); | ||
| 210 | |||
| 211 | // reset | ||
| 212 | inspectorExtension.Core = null; | ||
| 213 | sourceStream.Position = 0; | ||
| 214 | } | ||
| 215 | |||
| 216 | if (inspectorCore.EncounteredError) | ||
| 217 | { | ||
| 218 | return null; | ||
| 219 | } | ||
| 220 | |||
| 221 | using (XmlReader reader = XmlReader.Create(sourceFile, DocumentXmlReaderSettings)) | ||
| 222 | { | ||
| 223 | return Process(reader, variables, sourceFile); | ||
| 224 | } | ||
| 225 | } | 205 | } |
| 226 | } | 206 | } |
| 227 | 207 | ||
