1 commit

Author	SHA1	Message	Date
Max Brunsfeld	2c043803f1	Be more conservative about avoiding lexing conflicts when merging states ... This fixes a bug in the C++ grammar where the `>>` token was merged into a state where it was previously not valid, but the `>` token *was* valid. This caused nested templates like - std::vector<std::pair<int, int>> to not parse correctly.	2017-06-22 15:32:13 -07:00