diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-24 08:51:18 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-24 08:51:18 -0700 |
commit | 2c554249fd8e99286134b217027b6e3cb2c92d77 (patch) | |
tree | 7b7fb4b9b45a2ec7afbec7ecb527feb790617c5c /src | |
parent | c0fac9ecabb7c5ea01cbb924e79aa4f14eb1e7d1 (diff) | |
parent | d7f498ac9cccd7473be8f416a1620548ca8fca9b (diff) | |
download | scala-2c554249fd8e99286134b217027b6e3cb2c92d77.tar.gz scala-2c554249fd8e99286134b217027b6e3cb2c92d77.tar.bz2 scala-2c554249fd8e99286134b217027b6e3cb2c92d77.zip |
Merge pull request #1519 from paulp/no-product-n
Disabled generation of _1, _2, etc. methods.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala index 67afb0c118..cc3d980cf1 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala @@ -206,7 +206,8 @@ trait SyntheticMethods extends ast.TreeDSL { Select(mkThisSelect(clazz.derivedValueClassUnbox), nme.hashCode_) } - /** The _1, _2, etc. methods to implement ProductN. + /** The _1, _2, etc. methods to implement ProductN, disabled + * until we figure out how to introduce ProductN without cycles. */ def productNMethods = { val accs = accessors.toIndexedSeq @@ -266,13 +267,13 @@ trait SyntheticMethods extends ast.TreeDSL { Any_equals -> (() => equalsDerivedValueClassMethod) ) - def caseClassMethods = productMethods ++ productNMethods ++ Seq( + def caseClassMethods = productMethods ++ /*productNMethods ++*/ Seq( Object_hashCode -> (() => chooseHashcode), Object_toString -> (() => forwardToRuntime(Object_toString)), Object_equals -> (() => equalsCaseClassMethod) ) - def valueCaseClassMethods = productMethods ++ productNMethods ++ valueClassMethods ++ Seq( + def valueCaseClassMethods = productMethods ++ /*productNMethods ++*/ valueClassMethods ++ Seq( Any_toString -> (() => forwardToRuntime(Object_toString)) ) |