Implement new optional parameters syntax in the vm (issue 4290).

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1452 matching lines @@
   }
   bool IsInFactoryScope() const;
 
   intptr_t token_pos() const { return raw_ptr()->token_pos_; }
 
   intptr_t end_token_pos() const { return raw_ptr()->end_token_pos_; }
   void set_end_token_pos(intptr_t value) const {
     raw_ptr()->end_token_pos_ = value;
   }
 
-  static intptr_t num_fixed_parameters_offset() {
-    return OFFSET_OF(RawFunction, num_fixed_parameters_);
-  }
   intptr_t num_fixed_parameters() const {
     return raw_ptr()->num_fixed_parameters_;
   }
   void set_num_fixed_parameters(intptr_t value) const;
 
-  static intptr_t num_optional_parameters_offset() {
-    return OFFSET_OF(RawFunction, num_optional_parameters_);
+  bool HasOptionalParameters() const {
+    return (num_optional_positional_parameters() +
+            num_optional_named_parameters()) > 0;
   }
-  intptr_t num_optional_parameters() const {
-    return raw_ptr()->num_optional_parameters_;
+
+  intptr_t num_optional_positional_parameters() const {
+    return raw_ptr()->num_optional_positional_parameters_;
   }
-  void set_num_optional_parameters(intptr_t value) const;
+  void set_num_optional_positional_parameters(intptr_t value) const;
+
+  intptr_t num_optional_named_parameters() const {
+    return raw_ptr()->num_optional_named_parameters_;
+  }
+  void set_num_optional_named_parameters(intptr_t value) const;
 
   static intptr_t usage_counter_offset() {
     return OFFSET_OF(RawFunction, usage_counter_);
   }
   intptr_t usage_counter() const {
     return raw_ptr()->usage_counter_;
   }
   void set_usage_counter(intptr_t value) const {
     raw_ptr()->usage_counter_ = value;
   }
@@ skipping 16 matching lines @@
   bool is_native() const { return NativeBit::decode(raw_ptr()->kind_tag_); }
   void set_is_native(bool value) const;
 
   bool is_abstract() const { return AbstractBit::decode(raw_ptr()->kind_tag_); }
   void set_is_abstract(bool value) const;
 
   bool HasOptimizedCode() const;
 
   intptr_t NumberOfParameters() const;
   intptr_t NumberOfImplicitParameters() const;
+  void SetNumberOfParameters(intptr_t num_fixed_parameters,
+                             intptr_t num_optional_parameters,
+                             bool are_optional_positional) const;
 
   // Returns true if the argument counts are valid for calling this function.
   // Otherwise, it returns false and the reason (if error_message is not NULL).
   bool AreValidArgumentCounts(int num_arguments,
                               int num_named_arguments,
                               String* error_message) const;
 
   // Returns true if the total argument count and the names of optional
   // arguments are valid for calling this function.
   // Otherwise, it returns false and the reason (if error_message is not NULL).
@@ skipping 125 matching lines @@
   class OptimizableBit : public BitField<bool, kOptimizableBit, 1> {};
   class HasFinallyBit : public BitField<bool, kHasFinallyBit, 1> {};
   class NativeBit : public BitField<bool, kNativeBit, 1> {};
   class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
   class ExternalBit : public BitField<bool, kExternalBit, 1> {};
   class KindBits :
     public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {};  // NOLINT
 
   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
-  void set_is_static(bool is_static) const;
-  void set_is_const(bool is_const) const;
+  void set_is_static(bool value) const;
+  void set_is_const(bool value) const;
   void set_is_external(bool value) const;
   void set_parent_function(const Function& value) const;
   void set_owner(const Object& value) const;
   void set_token_pos(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
   void set_kind_tag(intptr_t value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
                             NameVisibility name_visibility,
                             const AbstractTypeArguments& instantiator) const;
 
   // Check the subtype or 'more specific' relationship.
   bool TypeTest(TypeTestKind test_kind,
                 const AbstractTypeArguments& type_arguments,
                 const Function& other,
                 const AbstractTypeArguments& other_type_arguments,
                 Error* malformed_error) const;
 
   // Checks the type of the formal parameter at the given position for
   // subtyping or 'more specific' relationship between the type of this function
   // and the type of the other function.
   bool TestParameterType(TypeTestKind test_kind,
                          intptr_t parameter_position,
+                         intptr_t other_parameter_position,
                          const AbstractTypeArguments& type_arguments,
                          const Function& other,
                          const AbstractTypeArguments& other_type_arguments,
                          Error* malformed_error) const;
 
   HEAP_OBJECT_IMPLEMENTATION(Function, Object);
   friend class Class;
 };
 
 
@@ skipping 3855 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_