Merge pull request swiftlang#156 from rintaro/revert-syntaxparse

[SyntaxParse] Revert syntax parsing changes from the master branch

Author: shahmishal

lit_tests/coloring.swift

@@ -150,8 +150,7 @@ func foo(n: Float) -> Int {
 
 // CHECK: <kw>protocol</kw> <id>Prot</id>
 protocol Prot {
-  // CHECK: typealias <id>Blarg</id>
-  // FIXME: Classify 'typealias' as a keyword.
+  // CHECK: <kw>typealias</kw> <id>Blarg</id>
   typealias Blarg
   // CHECK: <kw>func</kw> <id>protMeth</id>(<id>x</id>: <type>Int</type>)
   func protMeth(x: Int)