Fix Function.end_token_pos() and implement MethodMirror.source getter

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 2680 matching lines @@
       // instantiate types.
       CaptureInstantiator();
     }
   }
 
   OpenBlock();  // Open a nested scope for the outermost function block.
   if (CurrentToken() == Token::kLBRACE) {
     ConsumeToken();
     ParseStatementSequence();
     ExpectToken(Token::kRBRACE);
+    func.set_end_token_pos(TokenPos() - 1);

[hausner, 2013/08/20 17:49:44]

Read the closing brace after setting the end token pos, so you can avoid the - 1
(which is only accidentally correct as we discussed offline).

[Michael Lippautz (Google), 2013/08/21 16:50:03]

Done.

   } else if (CurrentToken() == Token::kARROW) {
     ConsumeToken();
     const intptr_t expr_pos = TokenPos();
     AstNode* expr = ParseExpr(kAllowConst, kConsumeCascades);
     ASSERT(expr != NULL);
     current_block_->statements->Add(new ReturnNode(expr_pos, expr));
+    func.set_end_token_pos(TokenPos());
   } else if (IsLiteral("native")) {
     ParseNativeFunctionBlock(&params, func);

[hausner, 2013/08/20 17:49:44]

Can you refactor the code so that ParseNativeFunctionBlock does not consume the
semicolon? Then, set the end token pos to TokenPos() and read the semicolon
afterwards.

[Michael Lippautz (Google), 2013/08/21 16:50:03]

Done.

+    func.set_end_token_pos(TokenPos() - 1);
   } else if (func.is_external()) {
     // Body of an external method contains a single throw.
     const String& function_name = String::ZoneHandle(func.name());
     // TODO(regis): For an instance function, pass the receiver to
     // NoSuchMethodError.
     current_block_->statements->Add(
         ThrowNoSuchMethodError(TokenPos(),
                                current_class(),
                                function_name,
                                func.is_static() ?
                                    InvocationMirror::kStatic :
                                    InvocationMirror::kDynamic,
                                InvocationMirror::kMethod));

[hausner, 2013/08/20 17:49:44]

For completeness, you should also set the end token position here.

[Michael Lippautz (Google), 2013/08/21 16:50:03]

Done.

   } else {
     UnexpectedToken();
   }

[hausner, 2013/08/20 17:49:44]

It would be nice to assert here that if the function already had an end token
position (set during top-level parsing), we are setting the same value.

[Michael Lippautz (Google), 2013/08/21 16:50:03]

Added the assertion, which forced me to think about (and fix) the end positions
that we got from diet parsing :)

   SequenceNode* body = CloseBlock();
   current_block_->statements->Add(body);
   innermost_function_ = saved_innermost_function.raw();
   return CloseBlock();
 }
 
 
 void Parser::SkipIf(Token::Kind token) {
   if (CurrentToken() == token) {
     ConsumeToken();
@@ skipping 2566 matching lines @@
                  "'%s' from outer scope has already been used, cannot redefine",
                  function_variable->name().ToCString());
       }
     }
   }
 
   // Parse the local function.
   Array& default_parameter_values = Array::Handle();
   SequenceNode* statements = Parser::ParseFunc(function,
                                                default_parameter_values);
-  ASSERT(is_new_closure || (function.end_token_pos() == (TokenPos() - 1)));
-  function.set_end_token_pos(TokenPos() - 1);
 
   // Now that the local function has formal parameters, lookup the signature
   // class in the current library (but not in its imports) and only create a new
   // canonical signature class if it does not exist yet.
   const String& signature = String::Handle(function.Signature());
   Class& signature_class = Class::ZoneHandle();
   if (!is_new_closure) {
     signature_class = function.signature_class();
   }
   if (signature_class.IsNull()) {
@@ skipping 5004 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart