Skip to content
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.

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

fix: terminate generated equations with ~~| #120

Merged
merged 4 commits into from
Sep 27, 2021
Merged

Conversation

ToddFincannon
Copy link
Collaborator

@ToddFincannon ToddFincannon commented Sep 25, 2021

Fixes #119

This change is required when using antlr4-vensim#7911c04 (see related issue climateinteractive/antlr4-vensim#7). I branched from develop so it can be merged immediately test test the antlr4-vensim change.

@ToddFincannon ToddFincannon added the dependencies Pull requests that update a dependency file label Sep 25, 2021
@ToddFincannon ToddFincannon added this to the 0.6.0 milestone Sep 25, 2021
@chrispcampbell chrispcampbell changed the title add ~~| to generated equations for compatibility with antlr4-vensim #7 fix: terminate generated equations with ~~| for compatibility with antlr4-vensim changes Sep 27, 2021
@chrispcampbell chrispcampbell changed the title fix: terminate generated equations with ~~| for compatibility with antlr4-vensim changes fix: terminate generated equations with ~~| Sep 27, 2021
Copy link
Contributor

@chrispcampbell chrispcampbell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ToddFincannon Looks good! I tested with the En-ROADS build and didn't encounter any problems.

JFYI, after I merged climateinteractive/antlr4-vensim#8, I updated the package.json on this branch to use the latest develop commit from the antlr4-vensim repo. Note that I backed out all unrelated changes in package-lock.json (except for the antlr4-vensim part) from your earlier commit 0928349; they were probably a side effect of when you updated the antlr4-vensim reference. When we're ready to upgrade other packages, we can do that under a separate issue/branch to keep the git history clean.

@chrispcampbell chrispcampbell merged commit 44d1c2a into develop Sep 27, 2021
@chrispcampbell chrispcampbell deleted the todd/119-parser branch September 27, 2021 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Terminate generated equations with ~~|
2 participants