Compiler fixes #4215
Merged
Compiler fixes #4215
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
|
Added:
|
jhawthorn
approved these changes
Aug 9, 2018
tools/grammars/compiler/converter.go
Outdated
| @@ -248,13 +257,25 @@ func (conv *Converter) Report() error { | |||
| return nil | |||
| } | |||
|
|
|||
| var VERSION_RE *regexp.Regexp = regexp.MustCompile("VERSION = \"(.+)\"") | |||
There was a problem hiding this comment.
Might be a little cleaner to change version.rb to do VERSION = File.read("#{__dir__}/VERSION") to simplify this, but this is clever and works 👍
There was a problem hiding this comment.
I prefer your suggestion 100%. Thank you!
It's actually 6.4.0, but I'm making a follow-up commit to bump "back" up to 6.3.9 so we have a single commit bumping the new version file usable as example in CONTRIBUTING.md. It makes sense, I swear.
lildude
reviewed
Aug 9, 2018
| @@ -1,3 +1,3 @@ | |||
| module Linguist | |||
| VERSION = "6.4.0" | |||
| VERSION = File.read(File.expand_path("../VERSION", __FILE__)).strip | |||
There was a problem hiding this comment.
Nice. One less hack for the release script I've been slowly working on.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some fixes for the grammar compiler:
-linguist-pathwasn't being usedballerina.monarch.json) — these were being written to.jsonin the output directory, which will in turn crash prettylights when it tries to read.jsonfrom the grammar directory and can't find ascopeNamein it./cc @vmg