Allow self-referencing closures.

frog/leg/elements/elements.dart

 // Copyright (c) 2012, 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('elements');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
 #import('../leg.dart');  // TODO(karlklose): we only need type.
 #import('../util/util.dart');
@@ skipping 609 matching lines @@
     return (element !== null)
            && element.isInstanceMember()
            && (element.kind === ElementKind.FIELD
                || element.kind === ElementKind.GETTER
                || element.kind === ElementKind.SETTER);
   }
 
   static bool isStaticOrTopLevelField(Element element) {
     return (element != null)
            && !element.isInstanceMember()
+           && (element.enclosingElement.kind == ElementKind.CLASS ||
+               element.enclosingElement.kind == ElementKind.COMPILATION_UNIT ||
+               element.enclosingElement.kind == ElementKind.LIBRARY)

[ngeoffray, 2012/02/13 10:13:38]

I believe element.enclosing is null for library elements, so you should check
against that.
Also, only compilation units have library as enclosing element, so I don't think
you need to check that enclosing is a library element.

[floitsch, 2012/02/13 12:03:42]

done (null check).
refactored into a isStaticOrTopLevel

            && (element.kind === ElementKind.FIELD
                || element.kind === ElementKind.GETTER
                || element.kind === ElementKind.SETTER);

[ngeoffray, 2012/02/13 10:13:38]

Which of these kinds do not have an enclosing as compilation  unit or class?

[floitsch, 2012/02/13 12:03:42]

refactored.

   }
 
   static bool isStaticOrTopLevelFunction(Element element) {
     return (element != null)
             && !element.isInstanceMember()
+            && (element.enclosingElement.kind == ElementKind.CLASS ||
+                element.enclosingElement.kind == ElementKind.COMPILATION_UNIT ||
+                element.enclosingElement.kind == ElementKind.LIBRARY)

[ngeoffray, 2012/02/13 10:13:38]

Same comments as above.

[floitsch, 2012/02/13 12:03:42]

the enclosing element of JS is LIBRARY.

             && (element.kind === ElementKind.FUNCTION);    
   }
 
   static bool isInstanceMethod(Element element) {
     return (element != null)
            && element.isInstanceMember()
            && (element.kind === ElementKind.FUNCTION);
   }
 
   static bool isInstanceSend(Send send, TreeElements elements) {
     Element element = elements[send];
     if (element === null) return !isClosureSend(send, elements);
     return isInstanceMethod(element) || isInstanceField(element);
   }
 
   static bool isClosureSend(Send send, TreeElements elements) {
     if (send.isPropertyAccess) return false;
     if (send.receiver !== null) return false;
     Element element = elements[send];
     // (o)() or foo()().
     if (element === null && send.selector.asIdentifier() === null) return true;
     if (element === null) return false;
     // foo() with foo a local or a parameter.
-    return element.isVariable() || element.isParameter();
+    if (element.isVariable() || element.isParameter()) return true;

[ngeoffray, 2012/02/13 10:13:38]

Could that just be return element.isLocal()?

[floitsch, 2012/02/13 12:03:42]

Done.

+    if (element.kind == ElementKind.FUNCTION && isLocal(element)) return true;
+    return false;
   }
 
   static SourceString constructConstructorName(SourceString receiver,
                                                SourceString selector) {
     return new SourceString('$receiver\$$selector');
   }
 
   static SourceString constructOperatorName(SourceString receiver,
                                             SourceString selector,
                                             [bool isPrefix = false]) {
@@ skipping 15 matching lines @@
     else if (str === '>=') str = 'ge';
     else if (str === '>') str = 'gt';
     else if (str === '<=') str = 'le';
     else if (str === '<') str = 'lt';
     else if (str === '&' || str === '&=') str = 'and';
     else if (str === '^' || str === '^=') str = 'xor';
     else if (str === '|' || str === '|=') str = 'or';
     return new SourceString('$receiver\$$str');
   }
 }