Skip to content

Fix showing pars.fs, lex.fs output in solution view, fix auto-generating FsLex/FsYacc output on change, add fsl and fsy to solution view #9918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cartermp merged 4 commits into from
Aug 12, 2020
Merged

Fix showing pars.fs, lex.fs output in solution view, fix auto-generating FsLex/FsYacc output on change, add fsl and fsy to solution view #9918

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f36b7f3
Fix showing pars.fs, lex.fs, pppars.fs and pplex.fs in sln
abelbraaksma Aug 11, 2020
dd6f42c
Also fix showing ilpars.fs and illex.fs
abelbraaksma Aug 11, 2020
cd0e9b3
Fix automatic run of fslex/fsyacc when file is dirty
abelbraaksma Aug 11, 2020
c7ad1dd
Same for AbsIL lex/yacc output, fix order in sln expl
abelbraaksma Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,16 @@
<OtherFlags>--unicode --lexlib Internal.Utilities.Text.Lexing</OtherFlags>
<Link>AbsIL\illex.fsl</Link>
</FsLex>
<None Include="..\..\absil\illex.fsl">
<Link>AbsIL\FsLex\illex.fsl</Link>
</None>
<FsYacc Include="..\..\absil\ilpars.fsy">
<OtherFlags>--module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<Link>AbsIL\ilpars.fsy</Link>
</FsYacc>
<None Include="..\..\absil\ilpars.fsy">
<Link>AbsIL\FsYacc\ilpars.fsy</Link>
</None>
<Compile Include="..\..\absil\il.fsi">
<Link>AbsIL\il.fsi</Link>
</Compile>
Expand All @@ -214,6 +220,12 @@
<Compile Include="..\..\absil\ilascii.fs">
<Link>AbsIL\ilascii.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)ilpars.fs">
<Link>AbsIL\FsYaccOut\ilpars.fs</Link>
</Compile>
<Compile Include="$(FsLexOutputFolder)illex.fs">
<Link>AbsIL\FsLexOut\illex.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilprint.fsi">
<Link>AbsIL\ilprint.fsi</Link>
</Compile>
Expand Down Expand Up @@ -241,12 +253,6 @@
<Compile Include="..\..\absil\ilsupp.fs">
<Link>AbsIL\ilsupp.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)ilpars.fs">
<Link>$(FsYaccOutputFolder)AbsIL\ilpars.fs</Link>
</Compile>
<Compile Include="$(FsLexOutputFolder)illex.fs">
<Link>$(FsLexOutputFolder)AbsIL\illex.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilbinary.fsi">
<Link>AbsIL\ilbinary.fsi</Link>
</Compile>
Expand Down Expand Up @@ -326,6 +332,18 @@
<OtherFlags>--module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<Link>ParserAndUntypedAST\pars.fsy</Link>
</FsYacc>
<None Include="..\pplex.fsl">
<Link>ParserAndUntypedAST\FsLex\pplex.fsl</Link>
</None>
<None Include="..\lex.fsl">
<Link>ParserAndUntypedAST\FsLex\lex.fsl</Link>
</None>
<None Include="..\pppars.fsy">
<Link>ParserAndUntypedAST\FsYacc\pppars.fsy</Link>
</None>
<None Include="..\pars.fsy">
<Link>ParserAndUntypedAST\FsYacc\pars.fsy</Link>
</None>
<Compile Include="..\UnicodeLexing.fsi">
<Link>ParserAndUntypedAST\UnicodeLexing.fsi</Link>
</Compile>
Expand All @@ -351,10 +369,10 @@
<Link>ParserAndUntypedAST\ParseHelpers.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pppars.fs">
<Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pppars.fs</Link>
<Link>ParserAndUntypedAST\FsYaccOutput\pppars.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pars.fs">
<Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pars.fs</Link>
<Link>ParserAndUntypedAST\FsYaccOutput\pars.fs</Link>
</Compile>
<Compile Include="..\lexhelp.fsi">
<Link>ParserAndUntypedAST\lexhelp.fsi</Link>
Expand All @@ -363,10 +381,10 @@
<Link>ParserAndUntypedAST\lexhelp.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pplex.fs">
<Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pplex.fs</Link>
<Link>ParserAndUntypedAST\FsLexOutput\pplex.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)lex.fs">
<Link>$(FsYaccOutputFolder)ParserAndUntypedAST\lex.fs</Link>
<Compile Include="$(FsYaccOutputFolder)\lex.fs">
<Link>ParserAndUntypedAST\FsLexOutput\lex.fs</Link>
</Compile>
<Compile Include="..\LexFilter.fs">
<Link>ParserAndUntypedAST\LexFilter.fs</Link>
Expand Down