summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-28 00:44:36 -0800
committerPaul Phillips <paulp@improving.org>2012-01-28 00:44:36 -0800
commit3e49826ca0c0c57ef14bc107a45084def5520d80 (patch)
tree8907f7ecdbdc99aff50f3860b94b0928b12824dd /test/files/pos
parent09544b756a1274c7cc2bdd302fd9bd1d33a16b70 (diff)
parente61eff23df977eeed19bfe253b01b69cce47dfa3 (diff)
downloadscala-3e49826ca0c0c57ef14bc107a45084def5520d80.tar.gz
scala-3e49826ca0c0c57ef14bc107a45084def5520d80.tar.bz2
scala-3e49826ca0c0c57ef14bc107a45084def5520d80.zip
Merge branch 'unsealed-anyval' into inline
Conflicts: src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/anyval-children.scala1
-rw-r--r--test/files/pos/trait-force-info.flags1
-rw-r--r--test/files/pos/trait-force-info.scala18
3 files changed, 20 insertions, 0 deletions
diff --git a/test/files/pos/anyval-children.scala b/test/files/pos/anyval-children.scala
new file mode 100644
index 0000000000..7a2eda8b3f
--- /dev/null
+++ b/test/files/pos/anyval-children.scala
@@ -0,0 +1 @@
+class Bippy extends AnyVal \ No newline at end of file
diff --git a/test/files/pos/trait-force-info.flags b/test/files/pos/trait-force-info.flags
new file mode 100644
index 0000000000..eb4d19bcb9
--- /dev/null
+++ b/test/files/pos/trait-force-info.flags
@@ -0,0 +1 @@
+-optimise \ No newline at end of file
diff --git a/test/files/pos/trait-force-info.scala b/test/files/pos/trait-force-info.scala
new file mode 100644
index 0000000000..e01d225c84
--- /dev/null
+++ b/test/files/pos/trait-force-info.scala
@@ -0,0 +1,18 @@
+/** This does NOT crash unless it's in the interactive package.
+ */
+
+package scala.tools.nsc
+package interactive
+
+trait MyContextTrees {
+ val self: Global
+ val NoContext = self.analyzer.NoContext
+}
+//
+// error: java.lang.AssertionError: assertion failed: trait Contexts.NoContext$ linkedModule: <none>List()
+// at scala.Predef$.assert(Predef.scala:160)
+// at scala.tools.nsc.symtab.classfile.ClassfileParser$innerClasses$.innerSymbol$1(ClassfileParser.scala:1211)
+// at scala.tools.nsc.symtab.classfile.ClassfileParser$innerClasses$.classSymbol(ClassfileParser.scala:1223)
+// at scala.tools.nsc.symtab.classfile.ClassfileParser.classNameToSymbol(ClassfileParser.scala:489)
+// at scala.tools.nsc.symtab.classfile.ClassfileParser.sig2type$1(ClassfileParser.scala:757)
+// at scala.tools.nsc.symtab.classfile.ClassfileParser.sig2type$1(ClassfileParser.scala:789)