dotty-staging · odersky · Mar 16, 2016 · Mar 18, 2016 · Mar 18, 2016 · Mar 18, 2016
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.class
 *.log
 *~
+*.swp
 
 # sbt specific
 dist/*
@@ -30,3 +31,10 @@ classes/
 tests/partest-generated/
 tests/locks/
 /test-classes/
+
+# Used in tests
+scala-scala
+
+# Ignore output files but keep the directory
+out/
+!out/.keep
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,23 +1,85 @@
 dotty
 =====
 
-[![Build Status](https://travis-ci.org/lampepfl/dotty.png?branch=master)](https://travis-ci.org/lampepfl/dotty)
+[![Join the chat at https://gitter.im/lampepfl/dotty](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lampepfl/dotty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Dotty is a platform to try out new language concepts and compiler technologies for Scala. The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), and try to boil down Scala's types into a smaller set of more fundamental constructors. The theory behind these constructors is researched in [DOT](http://www.cs.uwm.edu/~boyland/fool2012/papers/fool2012_submission_3.pdf), a calculus for dependent object types. 
+Dotty is a platform to try out new language concepts and compiler
+technologies for Scala. The focus is mainly on simplification. We
+remove extraneous syntax (e.g. no XML literals), and try to boil down
+Scala's types into a smaller set of more fundamental constructors. The
+theory behind these constructors is researched in
+[DOT](http://www.cs.uwm.edu/~boyland/fool2012/papers/fool2012_submission_3.pdf),
+a calculus for dependent object types.
 
-The dotty compiler is largely a new design. It takes a more functional approach than current scalac, paired with aggressive caching to achieve good performance. At present, only the frontend (parser and type-checker) exists; the transformation and code generation phases remain to be written. Some parts, in particular those that have to do with configuration and input/output are derived from the Scala compiler.
+####Current status:
+ _Technology preview_: currently unsupported, may be functionally incomplete or unsuitable for production use.
 
-We expect that, over time, some of the new technologies explored in this project will find their way into future versions of Scala. At present it is too early to say which ones and when.
+####Is it going to be the future Scala?
+Yes, eventually.
 
-If you want to try it out, to get started have a look at https://github.com/lampepfl/dotty/wiki/Getting-Started.
+####Who's working on it?
+See [github contributors page](https://github.com/lampepfl/dotty/graphs/contributors).
+
+####What are the features that could make me consider trying it?  
+| Feature                                                                                                 | Status              |
+|---------------------------------------------------------------------------------------------------------|---------------------|
+| Union, Intersection and [Literal singleton types](http://docs.scala-lang.org/sips/pending/42.type.html) | Implemented         |
+| Fast compilation(phase fusion)                                                                         | Implemented         |
+| [Trait parameters](http://docs.scala-lang.org/sips/pending/trait-parameters.html)                       | Implemented         |
+| [@Static methods and fields](https://github.com/scala/scala.github.com/pull/491)                        | Implemented         |
+| Colored Repl                                                                                            | Implemented         |
+| Sbt incremental build                                                                                   | Implemented         |
+| Non-blocking lazy vals                                                                                  | Implemented         |
+| Option-less pattern matching(based on [name-based patmat](https://github.com/scala/scala/pull/2848))    | Implemented |
+| Function arity adaptation                                                                               | Implemented |
+|                                                                                                         |                     |
+| Non-boxed arrays of value classes                                                                       | In progress         |
+| Working contravariant implicits                                                                         | In progress         |
+| [Auto-Specialization](https://github.com/dotty-linker/dotty)                                            | In progress         |
+| [Whole program optimizer](https://github.com/dotty-linker/dotty)                                        | In progress         |
+| [Library defined optimizations](https://github.com/dotty-linker/dotty)                                  | In progress         |
+|                                                                                                         |                     |
+| HList & HMaps\Record types                                                                              | Under consideration |
+| Implicit functions                                                                                      | Under consideration |
+| Effects                                                                                                 | Under consideration |
+| Auto-completion in repl                                                                                 | Under consideration |
+| Spec Option-less pattern matching                                                                       | Under consideration |
+| Multiverse equality                                                                                     | Under consideration |
+| Exhaustivity checks in pattern matching                                                                 | Under consideration |
+There are also plethora of small details such as [per-callsite @tailrec annotations](https://github.com/lampepfl/dotty/issues/1221)
 
-Developers mailing list is https://groups.google.com/forum/#!forum/dotty-internals.
+####What are the complications that I can have If I start using Dotty?
+Dotty can use libraries compiled by scalac 2.11, but Scala scalac can't use libraries compiled by Dotty.<br>
+No existential types.<br>
+No macro support yet. We have big plans here.<br>
+No early initializers. No scala.DelayedInit. Use trait parameters instead.<br>
+Whole program optimizer will only work if all dependencies are compiled by Dotty.<br>
+
+
+####Can I write my code in a way that is going to be compatible with Scalac & Dotty?
+Yes, Dotty itself is a project that can be compiled by both Dotty and Scalac.<br>
+It's not very hard, and the biggest thing that you will likely miss is using macros.
 
+####How can I try it out?
+https://github.com/lampepfl/dotty/wiki/Getting-Started.
+Here’s an example sbt project and instructions on how to set it up: https://github.com/smarter/dotty-example-project/ <br>
+We have colored REPL :-). You can invoke it by running `dotc -repl`.
 
-&nbsp;
+####We also have:
+Basic support for Scala.js,<br>
+[Prototype](https://github.com/scala-native/scala-native/tree/topic/dotty-support) of compilation to x86 native code(Shabalin)<br>
 
-&nbsp;
+####What about scalac:
+Scalac is the basis for stability in scala. We expect scalac & dotty to coexist for long time.
+
+####Contributions are welcome!
+We invite you to help us build the future of Scala.<br>
+This is the best moment to participate, as everyone can make an impact.<br>
 
-![YourKit](https://www.yourkit.com/images/yklogo.png) supports open source projects with its full-featured Java Profiler.
+####SI-2712?
+If scalac will put it into 2.12, we’ll mimic their behaviour. But we have bigger plans for
+HK-types.
 
-YourKit, LLC is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/index.jsp).
+
+
+Developers mailing list is https://groups.google.com/forum/#!forum/dotty-internals.
diff --git a/bench/src/test/scala/TestsAsBenchmarks.scala b/bench/src/test/scala/TestsAsBenchmarks.scala
@@ -5,21 +5,54 @@ import java.lang.reflect.Method
 
 import org.junit.runner.Request
 import org.junit.runner.notification.RunNotifier
+import org.scalameter.Key.reports._
 import org.scalameter.PerformanceTest.OnlineRegressionReport
 import org.scalameter.api._
+import org.scalameter.{Context, History, persistence, currentContext}
 import org.scalameter.reporting.RegressionReporter.Tester
 
 import scala.collection.mutable.ListBuffer
 
+// decorator of persitor to expose info for debugging
+class DecoratorPersistor(p: Persistor) extends SerializationPersistor {
+
+  override def load(context: Context): History = {
+    val resultdir = currentContext(resultDir)
+    val scope = context.scope
+    val curve = context.curve
+    val fileName = s"$resultdir$sep$scope.$curve.dat"
+
+    println(s"load file $fileName")
+
+    p.load(context)
+  }
+
+  override def save(context: Context, h: History) = {
+    val resultdir = currentContext(resultDir)
+    val scope = context.scope
+    val curve = context.curve
+    val fileName = s"$resultdir$sep$scope.$curve.dat"
+
+    println(s"save file $fileName")
+
+    p.save(context, h)
+  }
+}
 
 abstract class TestsToBenchmarkConverter
 (targetClass: Class[_],
  filterAnnot: Class[_ <: java.lang.annotation.Annotation] = classOf[org.junit.Test].asInstanceOf[Class[_ <: java.lang.annotation.Annotation]])
   extends OnlineRegressionReport {
 
+  // NOTE: use `val persistor = ...` would cause persistor ignore command line options for `resultDir`
+  override def persistor = new DecoratorPersistor(super.persistor)
+
   // accept all the results, do not fail
   override def tester: Tester = new Tester.Accepter
 
+  // store all results
+  override def historian: RegressionReporter.Historian = RegressionReporter.Historian.Complete()
+
   override def executor: Executor = LocalExecutor(warmer, aggregator, measurer)
   val testNames = getMethodsAnnotatedWith(targetClass, filterAnnot).map(_.getName).sorted
 
@@ -29,15 +62,31 @@ abstract class TestsToBenchmarkConverter
     (name, Gen.single("test")(name).map(Request.method(targetClass, _).getRunner))}.toMap
   //Gen.enumeration("test")(testNames:_*)
 
-  performance of targetClass.getSimpleName config (Context(reports.resultDir -> "./tmp")) in {
-    for (test <- testNames)
-      measure.method(test) in {
-        using(tests(test)) curve test in {
-          r =>
-            val dummy = new RunNotifier()
-            r.run(dummy)
+  def setup =
+    performance of targetClass.getSimpleName in {
+      for (test <- testNames)
+        measure.method(test) in {
+          using(tests(test)) curve test in {
+            r =>
+              val dummy = new RunNotifier()
+              r.run(dummy)
+          }
         }
-      }
+    }
+
+  /** workaround to fix problem in ScalaMeter
+    *
+    * NOTE: Otherwise, command line options would be ignored by HTMLReporter, as
+    *       the HTMLReporter uses the context of tree node, which is created via
+    *       ScalaMeter DSL before command line option `-CresultDir` takes effect
+    *       in `PerformanceTest.main`.
+    *
+    *       Following code ensures that the test tree is set up after the `-CresultDir`
+    *       option takes effect.
+    **/
+  override def executeTests(): Boolean = {
+    setup
+    super.executeTests()
   }
 
   def getMethodsAnnotatedWith(clazz: Class[_], annotation: Class[_ <: java.lang.annotation.Annotation]): List[Method] = {

diff --git a/bin/dotc b/bin/dotc
@@ -24,6 +24,7 @@ SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler")
 DOTTY_VERSION=$(getLastStringOnLineWith "version in")
 JLINE_VERSION=$(getLastStringOnLineWith "jline")
 bootcp=true
+bootstrapped=false
 default_java_opts="-Xmx768m -Xms768m"
 programName=$(basename "$0")
 # uncomment next line to enable debug output
@@ -36,19 +37,23 @@ unset verbose quiet cygwin toolcp colors saved_stty CDPATH
 
 
 CompilerMain=dotty.tools.dotc.Main
-ReplMain=test.DottyRepl
+FromTasty=dotty.tools.dotc.FromTasty
+ReplMain=dotty.tools.dotc.repl.Main
 
 
 
-# autodetecting the compiler jar. this is location where sbt 'packages' it
+# autodetecting the compiler jars. this is the location where sbt 'packages' them
+INTERFACES_JAR=$DOTTY_ROOT/interfaces/target/dotty-interfaces-$DOTTY_VERSION.jar
 MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION.jar
 TEST_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION-tests.jar
+DOTTY_JAR=$DOTTY_ROOT/dotty.jar
+
 function checkjar {
   if [ ! -f "$1" ]
   then
     echo "The script is going to build the required jar file $1 by running \"sbt $2\""
     cd $DOTTY_ROOT
-    sbt $2
+    sbt "$2"
     cd -
     if [ ! -f "$1" ]
     then
@@ -57,11 +62,22 @@ function checkjar {
     else
       echo "The required jar file was built successfully."
     fi
+  else
+    NEW_FILES="$(find "$DOTTY_ROOT/$3" \( -iname "*.scala" -o -iname "*.java" \) -newer "$1")"
+    if [ ! -z "$NEW_FILES" ]; 
+    then
+      echo "new files detected. rebuilding"
+      cd $DOTTY_ROOT
+      sbt "$2"
+      touch "$1"
+      cd -
+    fi
   fi
 }
 
-checkjar $MAIN_JAR package
-checkjar $TEST_JAR test:package
+checkjar $INTERFACES_JAR dotty-interfaces/package interfaces
+checkjar $MAIN_JAR package src
+checkjar $TEST_JAR test:package test
 
 # Autodetecting the scala-library location, in case it wasn't provided by an environment variable
 if [ "$SCALA_LIBRARY_JAR" == "" ]
@@ -81,7 +97,7 @@ fi
 
 if [ "$JLINE_JAR" == "" ]
 then
-  JLINE_JAR=$HOME/.ivy2//cache/jline/jline/jars/jline-$JLINE_VERSION.jar
+  JLINE_JAR=$HOME/.ivy2/cache/jline/jline/jars/jline-$JLINE_VERSION.jar
 fi
 
 if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR"  -o ! -f "$SCALA_COMPILER_JAR"  -o ! -f "$JLINE_JAR" ]
@@ -137,7 +153,7 @@ onExit () {
 
 # Get debug set early
 for arg in "$@"; do
-  [[ $arg == "-d" ]] && debug=true
+  [[ $arg == "-debug" ]] && debug=true
 done
 
 # to reenable echo if we are interrupted before completing.
@@ -178,11 +194,38 @@ trap onExit INT
 # If using the boot classpath, also pass an empty classpath
 # to java to suppress "." from materializing.
 classpathArgs () {
-  if [[ -n $bootcp ]]; then
-echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR"
+  if [[ "true" == $bootstrapped ]]; then 
+    checkjar $DOTTY_JAR "test:runMain dotc.build" src
+    toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR"
   else
-echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR:$TEST_JAR"
+    toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR"
   fi
+  bcpJars="$INTERFACES_JAR:$MAIN_JAR"
+  cpJars="$INTERFACES_JAR:$MAIN_JAR:$TEST_JAR"
+
+  if [[ -n "$cygwin" ]]; then
+    if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then
+      format=mixed
+    else
+      format=windows
+    fi
+
+    if [[ -n $bootcp ]]; then
+      boot_classpath="$(cygpath --path --$format "$toolchain:$bcpJars")"
+      classpath="$(cygpath --path --$format "$cpJars")"
+      cpArgs="-Xbootclasspath/a:$boot_classpath -classpath $classpath"
+    else
+      classpath="$(cygpath --path --$format "$toolchain:$cpJars")"
+      cpArgs="-classpath $classpath"
+    fi
+  else
+    if [[ -n $bootcp ]]; then
+      cpArgs="-Xbootclasspath/a:$toolchain:$bcpJars -classpath $cpJars"
+    else
+      cpArgs="-classpath $toolchain:$cpJars"
+    fi
+  fi
+  echo ${cpArgs}
 }
 
 # e.g. path -java-home /path/to/java_home
@@ -202,20 +245,21 @@ main_class=$CompilerMain
 while [[ $# -gt 0 ]]; do
 case "$1" in
            --) shift; for arg; do addResidual "$arg"; done; set -- ;;
-     -h|-help) usage; exit 1 ;;
+     -h|-help) help=true && shift ;;
+     -bootstrapped) bootstrapped=true && shift ;;
   -v|-verbose) verbose=true && shift ;;
-    -d|-debug) debug=true && shift ;;
+    -debug) debug=true && shift ;;
     -q|-quiet) quiet=true && shift ;;
 
     # Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
     -Oshort) addJava "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" && shift ;;
-
         -repl) main_class=$ReplMain && shift ;;
+        -tasty) main_class=$FromTasty && shift ;;
      -compile) main_class=$CompilerMain && shift ;;
          -run) main_class=$ReplMain && shift ;;
          -fsc) main_class=$FscMain && shift ;;
       -bootcp) bootcp=true && shift ;;
-   -no-bootcp) unset bootcp && shift ;;
+   -nobootcp) unset bootcp && shift ;;
       -colors) colors=true && shift ;;
    -no-colors) unset colors && shift ;;
       -jrebel) jrebel=true && shift ;;