frog: better binding of methods.

frog/member.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.
 
 /** A formal parameter to a [Method]. */
 class Parameter {
   FormalNode definition;
   Member method;
 
   String name;
@@ skipping 15 matching lines @@
 
     if (definition.value != null) {
       // To match VM, detect cases where value was not actually specified in
       // code and don't signal errors.
       // TODO(jimhug): Clean up after issue #352 is resolved.
       if (!hasDefaultValue) return;
 
       if (method.name == ':call') {
         // TODO(jimhug): Need simpler way to detect "true" function types vs.
         //   regular methods being used as function types for closures.
-        if (method.definition.body == null) {
+        // TODO(sigmund): Disallow non-null default values for native calls?
+        if (method.definition.body == null && !method.isNative) {
           world.error('default value not allowed on function type',
             definition.span);
         }
       } else if (method.isAbstract) {
         world.error('default value not allowed on abstract methods',
           definition.span);
       }
     } else if (isInitializer && !method.isConstructor) {
       world.error('initializer parameters only allowed on constructors',
           definition.span);
@@ skipping 61 matching lines @@
   bool get isFinal() => false;
 
   // TODO(jmesserly): these only makes sense on methods, but because of
   // ConcreteMember we need to support them on Member.
   bool get isConst() => false;
   bool get isFactory() => false;
 
   bool get isOperator() => name.startsWith(':');
   bool get isCallMethod() => name == ':call';
 
-  bool get prefersPropertySyntax() => true;
+  bool get requiresPropertySyntax() => false;
   bool get requiresFieldSyntax() => false;
 
   bool get isNative() => false;
   String get constructorName() {
     world.internalError('can not be a constructor', span);
   }
 
   // Don't display an error here; we'll get a better error later.
   void provideFieldSyntax() {}
   void providePropertySyntax() {}
@@ skipping 160 matching lines @@
       // other.returnType.ensureAssignableFrom(returnType, null, true);
       return true;
       // TODO(jimhug): Merge in overridesProperty logic here.
     } else {
       world.error('field can not override anything but property',
         span, other.span);
       return false;
     }
   }
 
-  bool get prefersPropertySyntax() => false;
-  bool get requiresFieldSyntax() => isNative;
-
   void provideFieldSyntax() {} // Nothing to do.
   void providePropertySyntax() { _providePropertySyntax = true; }
 
   FieldMember(String name, Type declaringType, this.definition, this.value)
       : super(name, declaringType), isNative = false;
 
   SourceSpan get span() => definition == null ? null : definition.span;
 
   Type get returnType() => type;
 
@@ skipping 143 matching lines @@
   Member _overriddenField;
 
   bool _provideFieldSyntax = false;
 
   // TODO(jimhug): What is the right span for this beast?
   SourceSpan get span() => getter != null ? getter.span : null;
 
   bool get canGet() => getter != null;
   bool get canSet() => setter != null;
 
-  bool get prefersPropertySyntax() => true;
-  bool get requiresFieldSyntax() => false;
+  // If the property is just a declaration in an interface, continue to allow
+  // field syntax in the generated code.
+  bool get requiresPropertySyntax() => declaringType.isClass;
 
   void provideFieldSyntax() { _provideFieldSyntax = true; }
-  void providePropertySyntax() {}// Nothing to do.
+  void providePropertySyntax() {
+    // when overriding native fields, we still provide a field syntax to ensure
+    // that native functions will find the appropriate property implementation.
+    // TODO(sigmund): should check for this transitively...
+    if (_overriddenField != null && _overriddenField.isNative) {
+      provideFieldSyntax();
+    }
+  }
 
   // TODO(jimhug): Union of getter and setters sucks!
   bool get isStatic() => getter == null ? setter.isStatic : getter.isStatic;
 
   bool get isProperty() => true;
 
   Type get returnType() {
     return getter == null ? setter.returnType : getter.returnType;
   }
 
@@ skipping 121 matching lines @@
 
   bool get canGet() => baseMember.canGet;
   bool get canSet() => baseMember.canSet;
   bool canInvoke(MethodGenerator context, Arguments args) =>
     baseMember.canInvoke(context, args);
 
   bool get isField() => baseMember.isField;
   bool get isMethod() => baseMember.isMethod;
   bool get isProperty() => baseMember.isProperty;
 
-  bool get prefersPropertySyntax() => baseMember.prefersPropertySyntax;
+  bool get requiresPropertySyntax() => baseMember.requiresPropertySyntax;
   bool get requiresFieldSyntax() => baseMember.requiresFieldSyntax;
 
   void provideFieldSyntax() => baseMember.provideFieldSyntax();
   void providePropertySyntax() => baseMember.providePropertySyntax();
 
   bool get isConstructor() => name == declaringType.name;
 
   String get constructorName() => baseMember.constructorName;
 
   Definition get definition() => baseMember.definition;
@@ skipping 81 matching lines @@
   Member initDelegate;
 
   MethodMember(String name, Type declaringType, this.definition)
     : super(name, declaringType);
 
   bool get isConstructor() => name == declaringType.name;
   bool get isMethod() => !isConstructor;
 
   bool get isNative() => definition.nativeBody != null;
 
-  bool get canGet() => false; // TODO(jimhug): get bound method support.
+  bool get canGet() => true;
   bool get canSet() => false;
 
+  bool get requiresPropertySyntax() => true;
+
   SourceSpan get span() => definition == null ? null : definition.span;
 
   String get constructorName() {
     var returnType = definition.returnType;
     if (returnType == null) return '';
     if (returnType is GenericTypeReference) {
       return '';
     }
 
     // TODO(jmesserly): make this easier?
@@ skipping 56 matching lines @@
   int indexOfParameter(String name) {
     for (int i = 0; i < parameters.length; i++) {
       final p = parameters[i];
       if (p.isOptional && p.name == name) {
         return i;
       }
     }
     return -1;
   }
 
-  bool get prefersPropertySyntax() => true;
-  bool get requiresFieldSyntax() => false;
-
   void provideFieldSyntax() { _provideFieldSyntax = true; }
   void providePropertySyntax() { _providePropertySyntax = true; }
 
   Value _set(MethodGenerator context, Node node, Value target, Value value,
       [bool isDynamic=false]) {
     world.error('cannot set method', node.span);
   }
 
   Value _get(MethodGenerator context, Node node, Value target,
       [bool isDynamic=false]) {
@@ skipping 673 matching lines @@
     }
     return new Value(world.varType,
       '${target.code}.$jsname() /*no applicable $action*/', node.span);
   }
 
   bool _treatAsField;
   bool get treatAsField() {
     if (_treatAsField == null) {
       // If this is the global MemberSet from world, always bind dynamically.
       // Note: we need this for proper noSuchMethod and REPL behavior.
-      _treatAsField = !isVar;
-      for (var member in members) {
-        if (member.requiresFieldSyntax) {
-          _treatAsField = true;
-          break;
-        }
-        if (member.prefersPropertySyntax) {
-          _treatAsField = false;
-        }
-      }
+      _treatAsField = !isVar && (members.some((m) => m.requiresFieldSyntax)
+          || members.every((m) => !m.requiresPropertySyntax));
+
       for (var member in members) {
         if (_treatAsField) {
           member.provideFieldSyntax();
         } else {
           member.providePropertySyntax();
         }
       }
     }
     return _treatAsField;
   }
@@ skipping 270 matching lines @@
   }
 
   void forEach(void f(Member member)) {
     factories.forEach((_, Map constructors) {
       constructors.forEach((_, Member member) {
         f(member);
       });
     });
   }
 }