Revert "Use ProcedureKind.Operator for operators."

pkg/front_end/lib/src/fasta/source/outline_builder.dart

 // Copyright (c) 2016, 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.outline_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 26 matching lines @@
     Unhandled,
     UnhandledListener;
 
 import '../parser/error_kind.dart' show
     ErrorKind;
 
 import '../parser/dart_vm_native.dart' show
     removeNativeClause,
     skipNativeClause;
 
-import '../operator.dart' show
-    Operator,
-    operatorFromString,
-    operatorToString;
-
 enum MethodBody {
   Abstract,
   Regular,
   RedirectingFactoryBody,
 }
 
 AsyncMarker asyncMarkerFromTokens(Token asyncToken, Token starToken) {
   if (asyncToken == null || identical(asyncToken.stringValue, "sync")) {
     if (starToken == null) {
       return AsyncMarker.Sync;
@@ skipping 92 matching lines @@
     debugEvent("Part");
     String uri = pop();
     List<MetadataBuilder> metadata = pop();
     library.addPart(metadata, uri);
     checkEmpty();
   }
 
   @override
   void handleOperatorName(Token operatorKeyword, Token token) {
     debugEvent("OperatorName");
-    push(operatorFromString(token.stringValue));
+    push(token.stringValue);
   }
 
   @override
   void endIdentifierList(int count) {
     debugEvent("endIdentifierList");
     push(popList(count) ?? NullValue.IdentifierList);
   }
 
   @override
   void handleQualified(Token period) {
@@ skipping 65 matching lines @@
 
   @override
   void handleFunctionBodySkipped(Token token) {
     debugEvent("handleFunctionBodySkipped");
     push(MethodBody.Regular);
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     debugEvent("Method");
-    MethodBody bodyKind = pop();
-    if (bodyKind == MethodBody.RedirectingFactoryBody) {
+    MethodBody kind = pop();
+    if (kind == MethodBody.RedirectingFactoryBody) {
       // This will cause an error later.
       pop();
     }
     AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
-    dynamic nameOrOperator = pop();
-    if (Operator.Subtract == nameOrOperator && formals == null) {
-      nameOrOperator = Operator.UnaryMinus;
-    }
-    String name;
-    ProcedureKind kind;
-    if (nameOrOperator is Operator) {
-      name = operatorToString(nameOrOperator);
-      kind = ProcedureKind.Operator;
-    } else {
-      name = nameOrOperator;
-      kind = computeProcedureKind(getOrSet);
+    String name = pop();
+    if (identical("-", name) && formals == null) {
+      name = "unary-";
     }
     TypeBuilder returnType = pop();
     int modifiers = Modifier.validate(pop(),
-        isAbstract: bodyKind == MethodBody.Abstract);
+        isAbstract: kind == MethodBody.Abstract);
     List<MetadataBuilder> metadata = pop();
     library.addProcedure(metadata, modifiers, returnType, name, typeVariables,
-        formals, asyncModifier, kind);
+        formals, asyncModifier, computeProcedureKind(getOrSet));
   }
 
   @override
   void endMixinApplication() {
     debugEvent("MixinApplication");
     List<TypeBuilder> mixins = pop();
     TypeBuilder supertype = pop();
     push(library.addMixinApplication(supertype, mixins));
   }
 
@@ skipping 278 matching lines @@
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!isDartLibrary || identifiers.isEmpty) return identifiers;
     return removeNativeClause(identifiers);
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }