Introduce classes for string and name indexes

runtime/vm/kernel_binary.h

 // Copyright (c) 2017, 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 RUNTIME_VM_KERNEL_BINARY_H_
 #define RUNTIME_VM_KERNEL_BINARY_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include <map>
@@ skipping 475 matching lines @@
 
   template <typename T>
   T* ReadOptional() {
     return ReadOptional<T, T>();
   }
 
   ReaderHelper* helper() { return &builder_; }
 
   // A canonical name reference of -1 indicates none (for optional names), not
   // the root name as in the canonical name table.
-  intptr_t ReadCanonicalNameReference() { return ReadUInt() - 1; }
+  NameIndex ReadCanonicalNameReference() { return NameIndex(ReadUInt() - 1); }
 
   intptr_t offset() { return offset_; }
   void set_offset(intptr_t offset) { offset_ = offset; }
   intptr_t size() { return size_; }
 
   const uint8_t* buffer() { return buffer_; }
 
   intptr_t string_data_offset() { return string_data_offset_; }
   void MarkStringDataOffset() {
     ASSERT(string_data_offset_ == -1);
     string_data_offset_ = offset_;
   }
 
-  intptr_t StringLength(intptr_t string_index) {
-    return string_offsets_[string_index + 1] - string_offsets_[string_index];
+  intptr_t StringLength(StringIndex index) {
+    return string_offsets_[index + 1] - string_offsets_[index];
   }
 
-  uint8_t CharacterAt(intptr_t string_index, intptr_t index) {
+  uint8_t CharacterAt(StringIndex string_index, intptr_t index) {
     ASSERT(index < StringLength(string_index));
     return buffer_[string_data_offset_ + string_offsets_[string_index] + index];
   }
 
   // The canonical name index of a canonical name's parent (-1 indicates that
   // the parent is the root name).
-  intptr_t CanonicalNameParent(intptr_t name_index) {
-    return canonical_name_parents_[name_index];
+  NameIndex CanonicalNameParent(NameIndex index) {
+    return canonical_name_parents_[index];
   }
 
   // The string index of a canonical name's name string.
-  intptr_t CanonicalNameString(intptr_t name_index) {
-    return canonical_name_strings_[name_index];
+  StringIndex CanonicalNameString(NameIndex index) {
+    return canonical_name_strings_[index];
   }
 
  private:
   const uint8_t* buffer_;
   intptr_t size_;
   intptr_t offset_;
   ReaderHelper builder_;
   TokenPosition max_position_;
   TokenPosition min_position_;
   intptr_t current_script_id_;
 
   // The offset of the start of the string data is recorded to allow access to
   // the strings during deserialization.
   intptr_t string_data_offset_;
 
   // The string offsets are decoded to support efficient access to string UTF-8
   // encodings.
   intptr_t* string_offsets_;
 
   // The canonical names are decoded.
-  intptr_t* canonical_name_parents_;
-  intptr_t* canonical_name_strings_;
+  NameIndex* canonical_name_parents_;
+  StringIndex* canonical_name_strings_;
 
   friend class PositionScope;
   friend class Program;
 };
 
 
 // A helper class that resets the readers min and max positions both upon
 // initialization and upon destruction, i.e. when created the min an max
 // positions will be reset to "noSource", when destructing the min and max will
 // be reset to have they value they would have had, if they hadn't been reset in
@@ skipping 20 matching lines @@
   Reader* reader_;
   TokenPosition min_;
   TokenPosition max_;
 };
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_BINARY_H_