AST Branch Merge #16

Closed
tvarney opened this Issue Nov 14, 2012 · 4 comments

Comments

Projects
None yet
2 participants
Collaborator

tvarney commented Nov 14, 2012

Did we decide to merge the tvarney-ast branch into the master branch? If so how should we go about it? I know that Mark didn't like that there were a few rather monolithic commits in the branch, but I can't figure out how to split them apart. Also, I've added things to that branch that we should probably go over before merging (packages and the quote node).

Owner

mwatts15 commented Nov 15, 2012

I'm merging some changes right now. You've pushed "packages" and "quote node" to gh?

Collaborator

tvarney commented Nov 15, 2012

Packages are done in ./crono/src/crono/CronoPackage.java, Quote nodes are done in ./crono/src/crono/type/Quote.java. Updated initial message to include information about packages. Quote nodes are just a way to replace the old method of a boolean per node. They also handle the toString issue I had with the older method where each class had to check it's isQuoted method and modify the returned string.

Owner

mwatts15 commented Nov 15, 2012

Got it. Moved the packages description to our wiki:https://github.com/mwatts15/Crono/wiki/Packages

Owner

mwatts15 commented Nov 15, 2012

And the tvanrey-ast is merged -- hope it was clean!

mwatts15 closed this Nov 15, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment