token manager all tests passed
removed debug lines from TokenManager
mathparser passes all integration tests with tokenmanager
Merge branch 'nvp' of git://github.com/reolyze/Mogu into collaboration
framing StateParser
Merge branch 'nvp' of git://github.com/reolyze/Mogu into collaboration
Template 'currentToken' to specialize in either <int> or <MoguSyntax> for more readable usage.
attributeParsing in place; beginning testing
Merge remote-tracking branch 'upstream/Borel' into nvp
tokengroups absorbed into tokenmanager
Merge remote-tracking branch 'upstream/collaboration' into nvp
Begin implementation data resolutions in StateParser
Merge remote-tracking branch 'upstream/collaboration' into nvp
merging upstream/collaboration changes
Remove premature specialization declarations for currentToken()
Merge remote-tracking branch 'upstream/collaboration' into nvp
Adjust header to match source
Fix StateParser for compilation -- does not compile due to errors in dependencies
Merge remote-tracking branch 'upstream/collaboration' into nvp
Handle data fields with StateParser