- Change "static final" to "static const" in the runtime/ directory.

runtime/vm/dart_api_impl_test.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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 2526 matching lines @@
       "    static_getset_fld = 'static getset';\n"
       "    _static_getset_fld = 'hidden static getset';\n"
       "  }\n"
       "\n"
       "  var instance_fld;\n"
       "  var _instance_fld;\n"
       "  final final_instance_fld;\n"
       "  final _final_instance_fld;\n"
       "  static var static_fld;\n"
       "  static var _static_fld;\n"
-      "  static final final_static_fld = 'final static';\n"
-      "  static final _final_static_fld = 'hidden final static';\n"
+      "  static const const_static_fld = 'const static';\n"
+      "  static const _const_static_fld = 'hidden const static';\n"
       "\n"
       "  get instance_getset_fld() { return _gs_fld1; }\n"
       "  void set instance_getset_fld(var value) { _gs_fld1 = value; }\n"
       "  get _instance_getset_fld() { return _gs_fld2; }\n"
       "  void set _instance_getset_fld(var value) { _gs_fld2 = value; }\n"
       "  var _gs_fld1;\n"
       "  var _gs_fld2;\n"
       "\n"
       "  static get static_getset_fld() { return _gs_fld3; }\n"
       "  static void set static_getset_fld(var value) { _gs_fld3 = value; }\n"
       "  static get _static_getset_fld() { return _gs_fld4; }\n"
       "  static void set _static_getset_fld(var value) { _gs_fld4 = value; }\n"
       "  static var _gs_fld3;\n"
       "  static var _gs_fld4;\n"
       "}\n"
       "var top_fld;\n"
       "var _top_fld;\n"
-      "final final_top_fld = 'final top';\n"
-      "final _final_top_fld = 'hidden final top';\n"
+      "const const_top_fld = 'const top';\n"
+      "const _const_top_fld = 'hidden const top';\n"
       "\n"
       "get top_getset_fld() { return _gs_fld5; }\n"
       "void set top_getset_fld(var value) { _gs_fld5 = value; }\n"
       "get _top_getset_fld() { return _gs_fld6; }\n"
       "void set _top_getset_fld(var value) { _gs_fld6 = value; }\n"
       "var _gs_fld5;\n"
       "var _gs_fld6;\n"
       "\n"
       "Fields test() {\n"
       "  Fields.Init();\n"
@@ skipping 84 matching lines @@
   TestFieldNotFound(instance, name);
   TestFieldOk(cls, name, false, "static");
 
   // Hidden static field.
   name = Dart_NewString("_static_fld");
   TestFieldNotFound(lib, name);
   TestFieldNotFound(instance, name);
   TestFieldOk(cls, name, false, "hidden static");
 
   // Static final field.
-  name = Dart_NewString("final_static_fld");
+  name = Dart_NewString("const_static_fld");
   TestFieldNotFound(lib, name);
   TestFieldNotFound(instance, name);
-  TestFieldOk(cls, name, true, "final static");
+  TestFieldOk(cls, name, true, "const static");
 
-  // Hidden static final field.
-  name = Dart_NewString("_final_static_fld");
+  // Hidden static const field.
+  name = Dart_NewString("_const_static_fld");
   TestFieldNotFound(lib, name);
   TestFieldNotFound(instance, name);
-  TestFieldOk(cls, name, true, "hidden final static");
+  TestFieldOk(cls, name, true, "hidden const static");
 
   // Static non-inherited field.  Not found at any level.
   name = Dart_NewString("non_inherited_fld");
   TestFieldNotFound(lib, name);
   TestFieldNotFound(instance, name);
   TestFieldNotFound(cls, name);
 
   // Static get/set field.
   name = Dart_NewString("static_getset_fld");
   TestFieldNotFound(lib, name);
@@ skipping 12 matching lines @@
   TestFieldNotFound(instance, name);
   TestFieldOk(lib, name, false, "top");
 
   // Hidden top-level field.
   name = Dart_NewString("_top_fld");
   TestFieldNotFound(cls, name);
   TestFieldNotFound(instance, name);
   TestFieldOk(lib, name, false, "hidden top");
 
   // Top-Level final field.
-  name = Dart_NewString("final_top_fld");
+  name = Dart_NewString("const_top_fld");
   TestFieldNotFound(cls, name);
   TestFieldNotFound(instance, name);
-  TestFieldOk(lib, name, true, "final top");
+  TestFieldOk(lib, name, true, "const top");
 
   // Hidden top-level final field.
-  name = Dart_NewString("_final_top_fld");
+  name = Dart_NewString("_const_top_fld");
   TestFieldNotFound(cls, name);
   TestFieldNotFound(instance, name);
-  TestFieldOk(lib, name, true, "hidden final top");
+  TestFieldOk(lib, name, true, "hidden const top");
 
   // Top-Level get/set field.
   name = Dart_NewString("top_getset_fld");
   TestFieldNotFound(cls, name);
   TestFieldNotFound(instance, name);
   TestFieldOk(lib, name, false, "top getset");
 
   // Hidden top-level get/set field.
   name = Dart_NewString("_top_getset_fld");
   TestFieldNotFound(cls, name);
@@ skipping 72 matching lines @@
 }
 
 
 TEST_CASE(InjectNativeFields1) {
   const char* kScriptChars =
       "class NativeFields extends NativeFieldsWrapper {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
 
   const int kNumNativeFields = 4;
 
   // Create a test library.
@@ skipping 28 matching lines @@
 }
 
 
 TEST_CASE(InjectNativeFields2) {
   const char* kScriptChars =
       "class NativeFields extends NativeFieldsWrapper {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Invoke a function which returns an object of type NativeFields.
   result = Dart_Invoke(lib, Dart_NewString("testMain"), 0, NULL);
 
   // We expect this to fail as class "NativeFields" extends
   // "NativeFieldsWrapper" and there is no definition of it either
   // in the dart code or through the native field injection mechanism.
   EXPECT(Dart_IsError(result));
 }
 
 
 TEST_CASE(InjectNativeFields3) {
   const char* kScriptChars =
       "#import('dart:nativewrappers');"
       "class NativeFields extends NativeFieldWrapperClass2 {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
   const int kNumNativeFields = 2;
 
   // Load up a test script in the test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
@@ skipping 20 matching lines @@
 
 
 TEST_CASE(InjectNativeFields4) {
   const char* kScriptChars =
       "#import('dart:nativewrappers');"
       "class NativeFields extends NativeFieldWrapperClass2 {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
   // Load up a test script in the test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Invoke a function which returns an object of type NativeFields.
@@ skipping 91 matching lines @@
 
 
 TEST_CASE(NativeFieldAccess) {
   const char* kScriptChars =
       "class NativeFields extends NativeFieldsWrapper {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld0;\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   const int kNumNativeFields = 4;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                              native_field_lookup);
@@ skipping 30 matching lines @@
 
 TEST_CASE(ImplicitNativeFieldAccess) {
   const char* kScriptChars =
       "#import('dart:nativewrappers');"
       "class NativeFields extends NativeFieldWrapperClass4 {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld0;\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   // Load up a test script in the test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                              native_field_lookup);
 
   // Invoke a function which returns an object of type NativeFields.
   Dart_Handle retobj = Dart_Invoke(lib, Dart_NewString("testMain"), 0, NULL);
   EXPECT_VALID(retobj);
 
   // Now access and set various instance fields of the returned object.
   TestNativeFields(retobj);
 }
 
 
 TEST_CASE(NegativeNativeFieldAccess) {
   const char* kScriptChars =
       "class NativeFields {\n"
       "  NativeFields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain1() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n"
       "Function testMain2() {\n"
       "  return function() {};\n"
       "}\n";
   Dart_Handle result;
   DARTSCOPE_NOCHECKS(Isolate::Current());
@@ skipping 46 matching lines @@
   result = Dart_SetNativeInstanceField(retobj, kNativeFld3, 40);
   EXPECT(Dart_IsError(result));
   result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 400);
   EXPECT(Dart_IsError(result));
 }
 
 
 TEST_CASE(GetStaticField_RunsInitializer) {
   const char* kScriptChars =
       "class TestClass  {\n"
-      "  static final int fld1 = 7;\n"
+      "  static const int fld1 = 7;\n"
       "  static int fld2 = 11;\n"
       "  static void testMain() {\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("TestClass"));
   EXPECT_VALID(cls);
 
@@ skipping 696 matching lines @@
       "  Function method1(int i) {\n"
       "    f(int j) => j + i + fld1 + fld2 + fld4; \n"
       "    return f;\n"
       "  }\n"
       "  static Function method2(int i) {\n"
       "    n(int j) => true + i + fld4; \n"
       "    return n;\n"
       "  }\n"
       "  int fld1;\n"
       "  final int fld2;\n"
-      "  static final int fld4 = 10;\n"
+      "  static const int fld4 = 10;\n"
       "}\n"
       "Function testMain1() {\n"
       "  InvokeClosure obj = new InvokeClosure(10, 20);\n"
       "  return obj.method1(10);\n"
       "}\n"
       "Function testMain2() {\n"
       "  return InvokeClosure.method2(10);\n"
       "}\n";
   Dart_Handle result;
   DARTSCOPE_NOCHECKS(Isolate::Current());
@@ skipping 616 matching lines @@
       "var _b = '_b';\n"
       "final c = 'c';\n"
       "final _d = '_d';\n"
       "class MyClass {\n"
       "  var a = 'a';\n"
       "  var _b = '_b';\n"
       "  final c = 'c';\n"
       "  final _d = '_d';\n"
       "  static var e = 'e';\n"
       "  static var _f = '_f';\n"
-      "  static final g = 'g';\n"
-      "  static final _h = '_h';\n"
+      "  static const g = 'g';\n"
+      "  static const _h = '_h';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("MyClass"));
   EXPECT_VALID(cls);
   TextBuffer buffer(128);
 
   // Lookup a top-level variable.
   Dart_Handle var = Dart_LookupVariable(lib, Dart_NewString("a"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("a static", buffer.buf());
 
   // Lookup a private top-level variable.
   var = Dart_LookupVariable(lib, Dart_NewString("_b"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("_b static", buffer.buf());
 
-  // Lookup a final top-level variable.
+  // Lookup a const top-level variable.
   var = Dart_LookupVariable(lib, Dart_NewString("c"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("c static final", buffer.buf());
 
-  // Lookup a private final top-level variable.
+  // Lookup a private const top-level variable.
   var = Dart_LookupVariable(lib, Dart_NewString("_d"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("_d static final", buffer.buf());
 
   // Lookup a instance variable.
   var = Dart_LookupVariable(cls, Dart_NewString("a"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
@@ skipping 28 matching lines @@
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("e static", buffer.buf());
 
   // Lookup a private static variable.
   var = Dart_LookupVariable(cls, Dart_NewString("_f"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("_f static", buffer.buf());
 
-  // Lookup a final static variable.
+  // Lookup a const static variable.
   var = Dart_LookupVariable(cls, Dart_NewString("g"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("g static final", buffer.buf());
 
-  // Lookup a private final static variable.
+  // Lookup a private const static variable.
   var = Dart_LookupVariable(cls, Dart_NewString("_h"));
   EXPECT_VALID(var);
   EXPECT(Dart_IsVariable(var));
   BuildVariableDescription(&buffer, var);
   EXPECT_STREQ("_h static final", buffer.buf());
 
   // Lookup a variable that does not exist from a library.
   var = Dart_LookupVariable(lib, Dart_NewString("DoesNotExist"));
   EXPECT(Dart_IsNull(var));
 
@@ skipping 1880 matching lines @@
   EXPECT(Dart_IsString(str));
   len = -1;
   EXPECT_VALID(Dart_StringLength(str, &len));
   EXPECT_EQ(0, len);
 }
 
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart