diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-01 23:34:57 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-02 02:21:22 -0800 |
| commit | 7eab295351796e2b41c1805d027957e1a7d9ddc6 (patch) | |
| tree | e7c808ac19909fd9c14989d2ff3040ede2e5fe3d /src/WixToolset.Core/Preprocessor.cs | |
| parent | 3eb3c26c796984b64365fda077f173af8bf31559 (diff) | |
| download | wix-7eab295351796e2b41c1805d027957e1a7d9ddc6.tar.gz wix-7eab295351796e2b41c1805d027957e1a7d9ddc6.tar.bz2 wix-7eab295351796e2b41c1805d027957e1a7d9ddc6.zip | |
Correctly set the parent SourceLineNumber for include files
Diffstat (limited to 'src/WixToolset.Core/Preprocessor.cs')
| -rw-r--r-- | src/WixToolset.Core/Preprocessor.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs index b111b291..81b17578 100644 --- a/src/WixToolset.Core/Preprocessor.cs +++ b/src/WixToolset.Core/Preprocessor.cs | |||
| @@ -1351,7 +1351,7 @@ namespace WixToolset.Core | |||
| 1351 | 1351 | ||
| 1352 | if (state.Context.CurrentSourceLineNumber.LineNumber != newLine) | 1352 | if (state.Context.CurrentSourceLineNumber.LineNumber != newLine) |
| 1353 | { | 1353 | { |
| 1354 | state.Context.CurrentSourceLineNumber = new SourceLineNumber(state.Context.CurrentSourceLineNumber.FileName, newLine); | 1354 | state.Context.CurrentSourceLineNumber = new SourceLineNumber(state.Context.CurrentSourceLineNumber.FileName, state.Context.CurrentSourceLineNumber.Parent, newLine); |
| 1355 | } | 1355 | } |
| 1356 | } | 1356 | } |
| 1357 | } | 1357 | } |
| @@ -1372,7 +1372,7 @@ namespace WixToolset.Core | |||
| 1372 | 1372 | ||
| 1373 | state.CurrentFileStack.Push(path); | 1373 | state.CurrentFileStack.Push(path); |
| 1374 | state.SourceStack.Push(state.Context.CurrentSourceLineNumber); | 1374 | state.SourceStack.Push(state.Context.CurrentSourceLineNumber); |
| 1375 | state.Context.CurrentSourceLineNumber = new SourceLineNumber(path); | 1375 | state.Context.CurrentSourceLineNumber = new SourceLineNumber(path, state.Context.CurrentSourceLineNumber); |
| 1376 | state.IncludeNextStack.Push(true); | 1376 | state.IncludeNextStack.Push(true); |
| 1377 | } | 1377 | } |
| 1378 | 1378 | ||
