Implement simpler import syntax #2207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
area/tooling
| @@ -1,4 +1,4 @@ | |||
| from .path.to. import user, persona | |||
| import "path/to/user.zed | |||
There was a problem hiding this comment.
Add an error case test where the string is not closed
| // the compiler is being invoked, rather than whether it's local to the source | ||
| // folder of the current context. The assumption is that that won't matter | ||
| // right now, and we can fix it if we need to. | ||
| if !filepath.IsLocal(path) { |
There was a problem hiding this comment.
we should also add a check for .. anywhere in the path; if so, we can also quick-error
There was a problem hiding this comment.
Like at the parser level?
| @@ -198,6 +198,37 @@ func (p *sourceParser) tryConsumeKeyword(keyword string) bool { | |||
| return true | |||
| } | |||
|
|
|||
| // consumeString consumes a string token and returns the unwrapped string or adds an error node. | |||
| func (p *sourceParser) consumeString() (string, bool) { | |||
There was a problem hiding this comment.
let's name this consumeStringLiteral
| @@ -1,4 +1,4 @@ | |||
| from .path.to. import user, persona | |||
| import 'path/to/user.zed' | |||
There was a problem hiding this comment.
Add one more test which uses ' and " within the other kind of quotes
| if !ok { | ||
| return "", false | ||
| } | ||
| wrappedString := wrappedStringToken.Value |
There was a problem hiding this comment.
nit: newline before large comments here and above
tstirrat15
force-pushed
the
implement-simpler-import-syntax
branch
from
c517486 to
c1756e6
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
After discussion, we decided to go with an
import "some/path/to/file.zed"as the syntax and drop the explicit list of imports. This is based on an assumption that users mostly want to decompose a singles schema file into several, and code reuse is not high on the list of priorities.This changes the parser, compiler, and importer behavior to match.
Changes
Testing
Review. See that things are green.