Author Commit Message Labels Comments Date
vvcephei avatarvvcephei
cleaned up json format
vvcephei avatarvvcephei
done, I think, with the grammarian
vvcephei avatarvvcephei
almost done with grammars
vvcephei avatarvvcephei
in the middle of refactoring grammars into a seperate class
vvcephei avatarvvcephei
a reasonable first stab at the grammarian
vvcephei avatarvvcephei
refactored TreeNodeTest
vvcephei avatarvvcephei
refactored TreeNode, writing Grammarian, about to refactor TreeNodeTest
vvcephei avatarvvcephei
error messages have changed
vvcephei avatarvvcephei
added tokenchecker and make Merge also check tokens. I kind of hate this change. When I have some time, I need to come back and refactor this.
vvcephei avatarvvcephei
minor tweak to previous push
vvcephei avatarvvcephei
implemented -f option for ignoring errors and creating output anyway.
vvcephei avatarvvcephei
removed readlink from treemerge.sh, since it did not work on Macs, and it does not appear to be neccessary. changed error reporting for treemerge to be a little nicer.
vvcephei avatarvvcephei
added check for head marking.
vvcephei avatarvvcephei
continuing to clean up
vvcephei avatarvvcephei
moved tok2tree into the tree package and renamed it
vvcephei avatarvvcephei
Excising the abomination that was Comparer.scala
vvcephei avatarvvcephei
cleaned up tok -> tree transformation.
vvcephei avatarvvcephei
cleaning up and extracting fiasana
vvcephei avatarvvcephei
cleaning up and extracting fiasana
vvcephei avatarvvcephei
cleaning up and extracting fiasana
vvcephei avatarvvcephei
cleaning up and extracting fiasana
vvcephei avatarvvcephei
cleaning up and extracting fiasana
vvcephei avatarvvcephei
merge
vvcephei avatarvvcephei
added unit tests for x2txt. Getting ready to migrate some code to fiasana
vvcephei avatarvvcephei
cleaning up after experiment
vvcephei avatarvvcephei
testing subrepo
vvcephei avatarvvcephei
merge
vvcephei avatarvvcephei
finishing up new process. Added treesplit, moved documentation to the scalabha wiki.
Jason Baldridge avatarJason Baldridge
Minor.
Jason Baldridge avatarJason Baldridge
Changed to SBT 0.11.1
  1. Prev
  2. Next
Help
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.