Created Composition DSL. #85
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
|
This doesn't have any overlap with the stratification DSL. Shouldn't be any issue with accepting both of them. |
neonWhiteout
force-pushed
the
Composition_DSL_good
branch
2 times, most recently
from
689ca38 to
6550b3e
Compare
(s1, s2) s1, s2 ^ A => N end) Where sf1 and sf2 are stockflows, the first line is an ordered tuple of symbols which will act as its corresponding stockflow, and stockflows are separated from feet with ^. This commit includes Composition.jl, a testing file, and slight changes to Syntax.jl in src and tests; in src, I include Composition.jl, and in tests, I run the Composition tests from Syntax.
neonWhiteout
force-pushed
the
Composition_DSL_good
branch
from
7632f69 to
94c01f8
Compare
|
Force pushing was me removing some code which only works with stratification. |
|
Rewriting DSL will likely need to wait until Stratification is merged; it relies on a few functions which are on the Stratification branch. Also I still need to write tests for it. |
removed testing code from top
…end instead of quote end.
|
Some minor updates. Used to need quote blocks, now you can use begin end |
|
I'm hoping you won't get a merge conflict after every merge. They should be easy to deal with, though. |
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.
sfcompose(sf1, sf2, quote
(s1, s2)
s1, s2 ^ A => N
end)
Where sf1 and sf2 are stockflows, the first line is an ordered tuple of symbols which will act as its corresponding stockflow, and stockflows are separated from feet with ^. This commit includes Composition.jl, a testing file, and slight changes to Syntax.jl in src and tests; in src, I include Composition.jl, and in tests, I run the Composition tests from Syntax.