summaryrefslogtreecommitdiff
path: root/test/files/neg/annot-nonconst.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-03-31 03:59:42 +0000
committerPaul Phillips <paulp@improving.org>2011-03-31 03:59:42 +0000
commitb2ca0efb2d5e20dd7c77fedc16590164c78ba603 (patch)
tree1f69d2c02498eddcc74044c1595b649aec9111d2 /test/files/neg/annot-nonconst.check
parente74515bbd35f53d772d6b4a0fe9d59e10bc82c89 (diff)
downloadscala-b2ca0efb2d5e20dd7c77fedc16590164c78ba603.tar.gz
scala-b2ca0efb2d5e20dd7c77fedc16590164c78ba603.tar.bz2
scala-b2ca0efb2d5e20dd7c77fedc16590164c78ba603.zip
Modified some typer logic to allow annotation a...
Modified some typer logic to allow annotation arguments for constants which don't have the form Literal(_). The current logic seems to be avoided most of the time, but scaladoc breaks when it runs into it. This closes #4301. I can't figure out from the ticket what the deal is with #2764 and what is presently happening, but it seems like this patch could only improve the situation. Review by rytz.
Diffstat (limited to 'test/files/neg/annot-nonconst.check')
-rw-r--r--test/files/neg/annot-nonconst.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/annot-nonconst.check b/test/files/neg/annot-nonconst.check
index 385f066baa..e4166e08b6 100644
--- a/test/files/neg/annot-nonconst.check
+++ b/test/files/neg/annot-nonconst.check
@@ -11,7 +11,7 @@ class Ann2(value: String) extends ClassfileAnnotation
annot-nonconst.scala:6: error: annotation argument needs to be a constant; found: n
@Length(n) def foo = "foo"
^
-annot-nonconst.scala:7: error: annotation argument needs to be a constant; found: null
+annot-nonconst.scala:7: error: annotation argument cannot be null
@Ann2(null) def bar = "bar"
^
two warnings found