Skip to content

[Includes] Some improvements#131

Open
mrvux wants to merge 3 commits into
tgjones:masterfrom
mrvux:master
Open

[Includes] Some improvements#131
mrvux wants to merge 3 commits into
tgjones:masterfrom
mrvux:master

Conversation

@mrvux
Copy link
Copy Markdown
Contributor

@mrvux mrvux commented Nov 20, 2018

Hello, as mentioned in #130 , here are some improvements for include system :

The main rationale about it is to also allow some finer control when using core libraries in custom tooling.

  • Added Include type enumeration

  • IncludeDirectiveTriviaSyntax gets a boolean "IsLocal"

  • Pass Include type to both Include Resolver and File System (depending on local flag)

  • Current file systems and resolver are ignoring flag (so this will not be a breaking change)

  • Allow to pass our own IIncludeFileResolver to ParseSyntaxTree .

  • To be allowed to use our own IIncludeFileResolver, we need to provide a source file, so constructor is now public.

  • I added small tests to verify that syntax flags are correct, and that custom resolver gets called properly.

One discussion part I would have, is that passing IIncludeFileResolver is required, since our include system might not be not file based (zip/resource/memory...) so default resolver will never find the file, and never call the filesystem.

So maybe we should even remove IIncludeFileSystem from the argument list (since resolver should provide it's own file system anyway, or never provide one) ?

Thanks

Make include file system (and provider) interfaces to have an include type paramter as well as file Name
Make all current file systems to accept include type (but do no modify their behaviour)
Add IsLocal in DirectiveTriviaSyntax (to indicate if we want a local or system include)

Lexer on open file check for is local to set include type properly prior to call OpenInclude
Allow syntax compiler to pass it's own file resolver. (Since file system can be in memory, in that case resolver would never find the file, so file system would never get called)
Make source file constructor public (otherwise it's no possible to ever provide a custom file resolver outside of the assembly itself)

Add test for include directive (checks that tokens are found and that they have correct settings)
Add test to use a custom file resolver (verifies that it will be called)
@tgjones
Copy link
Copy Markdown
Owner

tgjones commented Dec 30, 2018

So maybe we should even remove IIncludeFileSystem from the argument list (since resolver should provide it's own file system anyway, or never provide one) ?

I agree - let's remove IIncludeFileSystem from the argument list.

@Krakean
Copy link
Copy Markdown

Krakean commented May 12, 2019

@tgjones @mrvux this hasn't been merged into master yet?

@mrvux
Copy link
Copy Markdown
Contributor Author

mrvux commented May 15, 2019

This did not, issue is there been a large change in between and this will conflict merge.
Theres an issue with new version that it cant build with visual studio as well, wanted to fix that but had a bit little time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants