merging master with new-ponyrt #106
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
Streams and futures also have trace functions (and therefore need to store the type of their elements).
Added a mostly working preferential attachment implementation in Encore
There's one struct for oneway msgs and one struct for future-msgs
each.
This encore method in class `Foo`
def bar(x:int, y:string) {...}
will generate:
struct ___encore_Foo_bar_fut_msg
{
encore_fut_msg_t msg;
int64_t x;
char* y;
};
struct ___encore_Foo_bar_oneway_msg
{
encore_msg_t msg;
int64_t x;
char* y;
};
The new Pony RT allows us to unify a lot of code for generating passive/active classes
Generate structs for messages conforming to the new PonyRT
…into new-ponyrt
…into new-ponyrt
fixed minor syntax error
Added short documentation of the module system
clean up ootr example for the Brussels demo: - do not return (), if something is void it doesn't matter what is the last expression, it knows it has to return void - remove re-definition of i to i + 1, we can do this inside the while loop - remove N = i + 503
boyscout: clean up ootr example
As of 870c8d6 we use `encore_arg_t` as the C-level type for type variables. We had forgotten to add the proper wrapping and unwrapping for one way message sends and when tracing values on method calls.
added makefile to compile from some languages. move every file into its corresponding language folder
|
Testing 100k iterations on Linux, with the following tests failed: |
|
I think this PR doesn't have any regressions. If there's no other suggestions, I would merge this after lunch. |
|
@albertnetymk, please merge this since I get the same errors in this pull requests as we have in new-ponyrt: These are the broken tests in Mac for this pull request: Broken tests in |
albertnetymk
added a commit
that referenced
this pull request
Mar 3, 2015
merging master with new-ponyrt
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.
I have fix the conflicts between
masterandnew-ponyrt. As you can see, there were 194 commits and 181 files changed. It would be really good if another person could re-check that I have not broken anything. This re-checking should be done by comparing a couple of times the broken tests before and after this merge. I believe that everything should work fine, but another pair of eyes does not hurt.After this gets merged, we should abandon the new-ponyrt branch and start working in master again (using pull requests :) )