languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 21:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bad merge in CommandLineOptions

Browse source 
Review URL: https://chromereviews.googleplex.com/3565017

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@276 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
zundel@google.com 2011-10-08 15:31:25 +00:00
parent 4ccb7c5810
commit 870da8ef9d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/java/com/google/dart/compiler/CommandLineOptions.java
View file

@ -38,14 +38,13 @@ public class CommandLineOptions {
usage = "Do not generate output, only analyze")
private boolean checkOnly = false;
<<<<<<< HEAD
@Option(name = "--warn_no_such_type",
usage = "Treat some type checks as warnints\n instead of fatal errors")
usage = "Treat some type checks as warnings\n instead of fatal errors")
private boolean shouldWarnOnNoSuchType = false;
=======
@Option(name = "--enable_type_checks", usage = "generate runtime type checks")
@Option(name = "--enable_type_checks",
usage = "Generate runtime type checks")
private boolean developerModeChecks = false;
>>>>>>> master
@Option(name = "--disable-type-optimizations",
usage = "Turn off type optimizations\n (for debugging)")

1
tests/language/language.status
View file

@ -131,7 +131,6 @@ OverrideFieldMethod5NegativeTest: Fail # Bug 5215249
OverrideFieldMethod6NegativeTest: Fail # Bug 5215249
CharEscapeTest: Fail
FunctionTypeParameter2NegativeTest: Fail # Bug 4568007
TypeDartcTest: Fail # Bug 5432720
# The following tests use missing error classes. Bug 4385894.
AssertTest: Fail # Uses AssertError class.