diff options
author | Paul Phillips <paulp@improving.org> | 2011-12-12 13:58:29 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-12-12 13:58:29 -0800 |
commit | 278a225d989d30d9913dd923e13e55bfe437049e (patch) | |
tree | 979d3c870560df7f4e21c2748344b67c61c9e025 /src | |
parent | e8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1 (diff) | |
parent | 1dec43c5ab4ab15ad8f13d4d93b404376f1aa47b (diff) | |
download | scala-278a225d989d30d9913dd923e13e55bfe437049e.tar.gz scala-278a225d989d30d9913dd923e13e55bfe437049e.tar.bz2 scala-278a225d989d30d9913dd923e13e55bfe437049e.zip |
Merge remote-tracking branch 'repo/develop'
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/reflect/internal/Symbols.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 1 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/Map.scala | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala index 75fd733e7e..bc0c81a54b 100644 --- a/src/compiler/scala/reflect/internal/Symbols.scala +++ b/src/compiler/scala/reflect/internal/Symbols.scala @@ -1097,6 +1097,10 @@ trait Symbols extends api.Symbols { self: SymbolTable => def typeParams: List[Symbol] = if (isMonomorphicType) Nil else { + // analogously to the "info" getter, here we allow for two completions: + // one: sourceCompleter to LazyType, two: LazyType to completed type + if (validTo == NoPeriod) + atPhase(phaseOf(infos.validFrom))(rawInfo load this) if (validTo == NoPeriod) atPhase(phaseOf(infos.validFrom))(rawInfo load this) diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index c59d46683e..9f1fbc4524 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -86,3 +86,4 @@ goto :eof :end
@@endlocal
+exit /b %errorlevel%
diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index 45cf088dd9..bbefd983fd 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -47,6 +47,7 @@ trait Map[A, +B] extends Iterable[(A, B)] def withDefault[B1 >: B](d: A => B1): immutable.Map[A, B1] = new Map.WithDefault[A, B1](this, d) /** The same map with a given default value. + * Note: `get`, `contains`, `iterator`, `keys`, etc are not affected by `withDefaultValue`. * * Invoking transformer methods (e.g. `map`) will not preserve the default value. * |