- report tear offs using the x#y syntax as a compilation error

runtime/vm/isolate_reload_test.cc

 // Copyright (c) 2016, 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 "include/dart_tools_api.h"
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/thread_barrier.h"
 #include "vm/thread_pool.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 #ifndef PRODUCT
 
+DECLARE_FLAG(bool, support_deprecated_tearoff_syntax);
+
 // TODO(johnmccutchan):
 // - Tests involving generics.
 
 int64_t SimpleInvoke(Dart_Handle lib, const char* method) {
   Dart_Handle result = Dart_Invoke(lib, NewString(method), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t integer_result = 0;
   result = Dart_IntegerToInt64(result, &integer_result);
   EXPECT_VALID(result);
@@ skipping 1398 matching lines @@
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  foo() => 'old';\n"
       "}\n"
       "List list = new List(2);\n"
       "Set set = new Set();\n"
       "main() {\n"
       "  var c = new C();\n"
       "  list[0] = c.foo;\n"
-      "  list[1] = c#foo;\n"
+      "  list[1] = c.foo;\n"
       "  set.add(c.foo);\n"
-      "  set.add(c#foo);\n"
+      "  set.add(c.foo);\n"
       "  int countBefore = set.length;\n"
       "  reloadTest();\n"
       "  list[1] = c.foo;\n"
       "  set.add(c.foo);\n"
-      "  set.add(c#foo);\n"
+      "  set.add(c.foo);\n"
       "  int countAfter = set.length;\n"
       "  return '${list[0]()} ${list[1]()} ${list[0] == list[1]} '\n"
       "         '${countBefore == 1} ${countAfter == 1} ${(set.first)()} '\n"
-      "         '${set.first == c.foo} ${set.first == c#foo} '\n"
-      "         '${set.remove(c#foo)}';\n"
+      "         '${set.first == c.foo} ${set.first == c.foo} '\n"
+      "         '${set.remove(c.foo)}';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  foo() => 'new';\n"
       "}\n"
       "List list = new List(2);\n"
       "Set set = new Set();\n"
       "main() {\n"
       "  var c = new C();\n"
       "  list[0] = c.foo;\n"
-      "  list[1] = c#foo;\n"
+      "  list[1] = c.foo;\n"
       "  set.add(c.foo);\n"
-      "  set.add(c#foo);\n"
+      "  set.add(c.foo);\n"
       "  int countBefore = set.length;\n"
       "  reloadTest();\n"
       "  list[1] = c.foo;\n"
       "  set.add(c.foo);\n"
-      "  set.add(c#foo);\n"
+      "  set.add(c.foo);\n"
       "  int countAfter = set.length;\n"
       "  return '${list[0]()} ${list[1]()} ${list[0] == list[1]} '\n"
       "         '${countBefore == 1} ${countAfter == 1} ${(set.first)()} '\n"
-      "         '${set.first == c.foo} ${set.first == c#foo} '\n"
-      "         '${set.remove(c#foo)}';\n"
+      "         '${set.first == c.foo} ${set.first == c.foo} '\n"
+      "         '${set.remove(c.foo)}';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ("new new true true true new true true true",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_DanglingGetter_Instance) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  var x = 3;\n"
       "  var y = 4;\n"
       "}\n"
       "invoke(f) {\n"
       "  try {\n"
       "    return f();\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var c = new C();\n"
-      "  var f = c#y;\n"
+      "  var f = c.y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  var x = 3;\n"
       "}\n"
       "invoke(f) {\n"
       "  try {\n"
       "    return f();\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var c = new C();\n"
-      "  var f = c#y;\n"
+      "  var f = c.y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("4 NoSuchMethodError: Class 'C' has no instance getter 'y'.",
-               SimpleInvokeStr(lib, "main"));
+  EXPECT_STREQ(
+      "NoSuchMethodError: Class 'int' has no instance method 'call'. "
+      "NoSuchMethodError: Class 'int' has no instance method 'call'.",
+      SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_DanglingGetter_Class) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  static var x;\n"
       "  static var y;\n"
       "}\n"
       "invoke(f) {\n"
       "  try {\n"
       "    return f();\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  C.x = 3;\n"
       "  C.y = 4;\n"
-      "  var f = C#y;\n"
+      "  var f = C.y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  static var x;\n"
       "}\n"
       "invoke(f) {\n"
       "  try {\n"
       "    return f();\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  C.x = 3;\n"
       "  C.y = 4;\n"
-      "  var f = C#y;\n"
+      "  var f = C.y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ(
-      "4 NoSuchMethodError: No static getter 'y' declared "
-      "in class 'C'.",
+      "NoSuchMethodError: Class 'int' has no instance method 'call'. "
+      "NoSuchMethodError: Class 'int' has no instance method 'call'.",
       SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 static void IsolateReload_DanlingGetter_LibraryReload(
     Dart_NativeArguments native_args) {
   const char* kImportScript2 = "var x;\n";
@@ skipping 30 matching lines @@
       "main() {\n"
       "  prefix.x = 3;\n"
       "  prefix.y = 4;\n"
       "  var f = prefix#y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
+  FLAG_support_deprecated_tearoff_syntax = true;
   Dart_Handle lib = TestCase::LoadTestScript(
       kScript, IsolateReload_DanlingGetter_LibraryNativeResolver);
   EXPECT_VALID(lib);
 
   TestCase::SetReloadTestScript(kScript);  // Root library does not change.
 
   EXPECT_STREQ("4 NoSuchMethodError: No top-level getter 'y' declared.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
+  FLAG_support_deprecated_tearoff_syntax = false;
 }
 
 
 TEST_CASE(IsolateReload_DanglingSetter_Instance) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  var x = 3;\n"
       "  var y = 4;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var c = new C();\n"
       "  var f = c#y=;\n"
       "  var r1 = invoke(f, 5);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
+  FLAG_support_deprecated_tearoff_syntax = true;
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  var x = 3;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
@@ skipping 11 matching lines @@
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ("null NoSuchMethodError: Class 'C' has no instance setter 'y='.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
+  FLAG_support_deprecated_tearoff_syntax = false;
 }
 
 
 TEST_CASE(IsolateReload_DanglingSetter_Class) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  static var x;\n"
       "  static var y;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  C.x = 3;\n"
       "  C.y = 4;\n"
       "  var f = C#y=;\n"
       "  var r1 = invoke(f, 5);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
+  FLAG_support_deprecated_tearoff_syntax = true;
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  static var x;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
@@ skipping 14 matching lines @@
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ(
       "5 NoSuchMethodError: No static setter 'y=' declared in "
       "class 'C'.",
       SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
+  FLAG_support_deprecated_tearoff_syntax = false;
 }
 
 
 static void IsolateReload_DanlingSetter_LibraryReload(
     Dart_NativeArguments native_args) {
   const char* kImportScript2 = "var x;\n";
   TestCase::AddTestLib("test:other", kImportScript2);
 
   DART_CHECK_VALID(TestCase::TriggerReload());
 }
@@ skipping 26 matching lines @@
       "main() {\n"
       "  prefix.x = 3;\n"
       "  prefix.y = 4;\n"
       "  var f = prefix#y=;\n"
       "  var r1 = invoke(f, 5);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
+  FLAG_support_deprecated_tearoff_syntax = true;
   Dart_Handle lib = TestCase::LoadTestScript(
       kScript, IsolateReload_DanlingSetter_LibraryNativeResolver);
   EXPECT_VALID(lib);
 
   TestCase::SetReloadTestScript(kScript);  // Root library does not change.
 
   EXPECT_STREQ("5 NoSuchMethodError: No top-level setter 'y=' declared.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
+  FLAG_support_deprecated_tearoff_syntax = false;
 }
 
 
 TEST_CASE(IsolateReload_TearOff_AddArguments) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  foo(x) => x;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var c = new C();\n"
-      "  var f = c#foo;\n"
+      "  var f = c.foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  foo(x, y, z) => x + y + z;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var c = new C();\n"
-      "  var f = c#foo;\n"
+      "  var f = c.foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ(
       "1 NoSuchMethodError: Class 'C' has no instance method "
@@ skipping 12 matching lines @@
       "  static foo(x) => x;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
-      "  var f = C#foo;\n"
+      "  var f = C.foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   const char* kReloadScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
       "  static foo(x, y, z) => x + y + z;\n"
       "}\n"
       "invoke(f, a) {\n"
       "  try {\n"
       "    return f(a);\n"
       "  } catch (e) {\n"
       "    return e.toString().split('\\n').first;\n"
       "  }\n"
       "}\n"
       "main() {\n"
-      "  var f = C#foo;\n"
+      "  var f = C.foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
   EXPECT_STREQ(
       "1 NoSuchMethodError: Closure call with mismatched arguments: "
@@ skipping 1465 matching lines @@
   lib = TestCase::ReloadTestScript(kReloadScript);
   EXPECT_VALID(lib);
   // Verify that we ran field initializers on existing instances in the
   // correct scope.
   EXPECT_STREQ("right", SimpleInvokeStr(lib, "main"));
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart