Revert "Add support for the new function-type syntax."

pkg/front_end/lib/src/fasta/scanner/keyword.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.scanner.keywords;
 
 import 'characters.dart' show
-    $a, $z, $A, $Z;
+    $a;
 
 import 'precedence.dart' show
     PrecedenceInfo;
 
 import 'precedence.dart' show
     AS_INFO,
     IS_INFO,
     KEYWORD_INFO;
 
 /**
@@ skipping 51 matching lines @@
     const Keyword("library", isBuiltIn: true),
     const Keyword("operator", isBuiltIn: true),
     const Keyword("part", isBuiltIn: true),
     const Keyword("set", isBuiltIn: true),
     const Keyword("static", isBuiltIn: true),
     const Keyword("typedef", isBuiltIn: true),
 
     const Keyword("async", isPseudo: true),
     const Keyword("await", isPseudo: true),
     const Keyword("deferred", isPseudo: true),
-    const Keyword("Function", isPseudo: true),
     const Keyword("hide", isPseudo: true),
     const Keyword("native", isPseudo: true),
     const Keyword("of", isPseudo: true),
     const Keyword("on", isPseudo: true),
     const Keyword("patch", isPseudo: true),
     const Keyword("show", isPseudo: true),
     const Keyword("source", isPseudo: true),
     const Keyword("sync", isPseudo: true),
     const Keyword("yield", isPseudo: true),
   ];
@@ skipping 24 matching lines @@
     return result;
   }
 
   String toString() => syntax;
 }
 
 /**
  * Abstract state in a state machine for scanning keywords.
  */
 abstract class KeywordState {
+  KeywordState(this.keyword);
+
   KeywordState next(int c);
-  KeywordState nextCapital(int c);
-
-  Keyword get keyword;
+  final Keyword keyword;
 
   static KeywordState _KEYWORD_STATE;
   static KeywordState get KEYWORD_STATE {
     if (_KEYWORD_STATE == null) {
       List<String> strings = new List<String>(Keyword.values.length);
       for (int i = 0; i < Keyword.values.length; i++) {
         strings[i] = Keyword.values[i].syntax;
       }
       strings.sort((a, b) => a.compareTo(b));
       _KEYWORD_STATE = computeKeywordStateTable(0, strings, 0, strings.length);
     }
     return _KEYWORD_STATE;
   }
 
   static KeywordState computeKeywordStateTable(
       int start, List<String> strings, int offset, int length) {
-    bool isLowercase = true;
-
-    List<KeywordState> table = new List<KeywordState>($z - $A + 1);
+    List<KeywordState> result = new List<KeywordState>(26);
     assert(length != 0);
     int chunk = 0;
     int chunkStart = -1;
     bool isLeaf = false;
     for (int i = offset; i < offset + length; i++) {
       if (strings[i].length == start) {
         isLeaf = true;
       }
       if (strings[i].length > start) {
         int c = strings[i].codeUnitAt(start);
-        if ($A <= c && c <= $Z) {
-          isLowercase = false;
-        }
         if (chunk != c) {
           if (chunkStart != -1) {
-            assert(table[chunk - $A] == null);
-            table[chunk - $A] = computeKeywordStateTable(
+            assert(result[chunk - $a] == null);
+            result[chunk - $a] = computeKeywordStateTable(
                 start + 1, strings, chunkStart, i - chunkStart);
           }
           chunkStart = i;
           chunk = c;
         }
       }
     }
     if (chunkStart != -1) {
-      assert(table[chunk - $A] == null);
-      table[chunk - $A] = computeKeywordStateTable(
+      assert(result[chunk - $a] == null);
+      result[chunk - $a] = computeKeywordStateTable(
           start + 1, strings, chunkStart, offset + length - chunkStart);
     } else {
       assert(length == 1);
       return new LeafKeywordState(strings[offset]);
     }
-    String syntax = isLeaf ? strings[offset] : null;
-    if (isLowercase) {
-      table = table.sublist($a - $A);
-      return new LowerCaseArrayKeywordState(table, syntax);
+    if (isLeaf) {
+      return new ArrayKeywordState(result, strings[offset]);
     } else {
-      return new UpperCaseArrayKeywordState(table, syntax);
+      return new ArrayKeywordState(result, null);
     }
   }
 }
 
 /**
  * A state with multiple outgoing transitions.
  */
-abstract class ArrayKeywordState implements KeywordState {
+class ArrayKeywordState extends KeywordState {
   final List<KeywordState> table;
-  final Keyword keyword;
 
   ArrayKeywordState(List<KeywordState> this.table, String syntax)
-      : keyword = ((syntax == null) ? null : Keyword.keywords[syntax]);
+      : super((syntax == null) ? null : Keyword.keywords[syntax]);
 
-  KeywordState next(int c);
-
-  KeywordState nextCapital(int c);
+  KeywordState next(int c) => table[c - $a];
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write("[");
     if (keyword != null) {
       sb.write("*");
       sb.write(keyword);
       sb.write(" ");
     }
     List<KeywordState> foo = table;
     for (int i = 0; i < foo.length; i++) {
       if (foo[i] != null) {
         sb.write("${new String.fromCharCodes([i + $a])}: "
             "${foo[i]}; ");
       }
     }
     sb.write("]");
     return sb.toString();
   }
 }
 
-class LowerCaseArrayKeywordState extends ArrayKeywordState {
-
-  LowerCaseArrayKeywordState(List<KeywordState> table, String syntax)
-      : super(table, syntax) {
-    assert(table.length == $z - $a + 1);
-  }
-
-  KeywordState next(int c) => table[c - $a];
-
-  KeywordState nextCapital(int c) => null;
-
-}
-
-class UpperCaseArrayKeywordState extends ArrayKeywordState {
-
-  UpperCaseArrayKeywordState(List<KeywordState> table, String syntax)
-      : super(table, syntax) {
-    assert(table.length == $z - $A + 1);
-  }
-
-  KeywordState next(int c) => table[c - $A];
-
-  KeywordState nextCapital(int c) => table[c - $A];
-
-}
-
 /**
  * A state that has no outgoing transitions.
  */
-class LeafKeywordState implements KeywordState {
-  final Keyword keyword;
-
-  LeafKeywordState(String syntax) : keyword = Keyword.keywords[syntax];
+class LeafKeywordState extends KeywordState {
+  LeafKeywordState(String syntax) : super(Keyword.keywords[syntax]);
 
   KeywordState next(int c) => null;
-  KeywordState nextCapital(int c) => null;
 
   String toString() => keyword.syntax;
 }