diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-04-12 18:55:13 -0700 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-04-12 18:55:13 -0700 |
| commit | 6061a22fcd3480e18e60254ad06c8a46b2f1ce53 (patch) | |
| tree | 12e7d3a1798a186d641e3de21430fc6de0470727 /test/files/run/toolbox_typecheck_macrosdisabled.check | |
| parent | f7a0558059559305a88ffa2c28506b29b2bc57f2 (diff) | |
| parent | 39a88f5680c3a16bf7ca856683989a2f5481bf69 (diff) | |
| download | scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.gz scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.bz2 scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.zip | |
Merge branch 'master' into topic/sip18
Conflicts:
src/compiler/scala/reflect/internal/Definitions.scala
Various improvements to SIP 18 reporting. Made scala library and compiler feature-clean.
Diffstat (limited to 'test/files/run/toolbox_typecheck_macrosdisabled.check')
| -rw-r--r-- | test/files/run/toolbox_typecheck_macrosdisabled.check | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.check b/test/files/run/toolbox_typecheck_macrosdisabled.check new file mode 100644 index 0000000000..cf2420bc17 --- /dev/null +++ b/test/files/run/toolbox_typecheck_macrosdisabled.check @@ -0,0 +1,5 @@ +{
+ val $mr: mr.type = mr;
+ $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))
+}
+mr.reify[Int](2)
|