Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Eliminate breaking relative names in source.

These things are killing me.  Constructions like

  package scala.foo.bar.baz
  import foo.Other

DO NOT WORK in general.  Such files are not really in the
"scala" package, because it is not declared

  package scala
  package foo.bar.baz

And there is a second problem: using a relative path name means
compilation will fail in the presence of a directory of the same
name, e.g.

  % mkdir reflect
  % scalac src/reflect/scala/reflect/internal/util/Position.scala
  src/reflect/scala/reflect/internal/util/Position.scala:9: error:
    object ClassTag is not a member of package reflect
  import reflect.ClassTag
         ^
  src/reflect/scala/reflect/internal/util/Position.scala:10: error:
    object base is not a member of package reflect
  import reflect.base.Attachments
                 ^

As a rule, do not use relative package paths unless you have
explicitly imported the path to which you think you are relative.
Better yet, don't use them at all. Unfortunately they mostly work
because scala variously thinks everything scala.* is in the scala
package and/or because you usually aren't bootstrapping and it
falls through to an existing version of the class already on the
classpath.

Making the paths explicit is not a complete solution -
in particular, we remain enormously vulnerable to any directory
or package called "scala" which isn't ours - but it greatly
limts the severity of the problem.
  • Loading branch information...
commit 55b609458fd14de248c21132a3e4a4672de4ce4b 1 parent f68201c
@paulp paulp authored
Showing with 640 additions and 655 deletions.
  1. +2 −2 src/actors-migration/scala/actors/Pattern.scala
  2. +1 −1  src/actors-migration/scala/actors/StashingActor.scala
  3. +1 −1  src/actors-migration/scala/actors/Timeout.scala
  4. +1 −1  src/actors/scala/actors/AbstractActor.scala
  5. +1 −1  src/actors/scala/actors/Actor.scala
  6. +1 −1  src/actors/scala/actors/CanReply.scala
  7. +1 −1  src/actors/scala/actors/Combinators.scala
  8. +1 −1  src/actors/scala/actors/Future.scala
  9. +1 −1  src/actors/scala/actors/Reactor.scala
  10. +1 −1  src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
  11. +1 −1  src/build/InnerObjectTestGen.scala
  12. +1 −1  src/build/genprod.scala
  13. +3 −3 src/compiler/scala/reflect/macros/runtime/Infrastructure.scala
  14. +2 −2 src/compiler/scala/reflect/macros/runtime/Parsers.scala
  15. +1 −1  src/compiler/scala/reflect/reify/package.scala
  16. +1 −1  src/compiler/scala/tools/ant/ClassloadVerify.scala
  17. +1 −1  src/compiler/scala/tools/ant/sabbus/Compilers.scala
  18. +1 −1  src/compiler/scala/tools/cmd/Property.scala
  19. +1 −1  src/compiler/scala/tools/cmd/Reference.scala
  20. +4 −4 src/compiler/scala/tools/cmd/gen/AnyVals.scala
  21. +1 −1  src/compiler/scala/tools/cmd/gen/Codegen.scala
  22. +1 −1  src/compiler/scala/tools/nsc/EvalLoop.scala
  23. +4 −4 src/compiler/scala/tools/nsc/Global.scala
  24. +1 −1  src/compiler/scala/tools/nsc/PhaseAssembly.scala
  25. +2 −2 src/compiler/scala/tools/nsc/Phases.scala
  26. +2 −2 src/compiler/scala/tools/nsc/ast/NodePrinters.scala
  27. +1 −1  src/compiler/scala/tools/nsc/ast/Printers.scala
  28. +1 −1  src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
  29. +1 −1  src/compiler/scala/tools/nsc/ast/TreeDSL.scala
  30. +2 −2 src/compiler/scala/tools/nsc/ast/TreeGen.scala
  31. +3 −3 src/compiler/scala/tools/nsc/ast/TreeInfo.scala
  32. +1 −1  src/compiler/scala/tools/nsc/ast/Trees.scala
  33. +4 −4 src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala
  34. +1 −1  src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
  35. +1 −1  src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
  36. +1 −1  src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
  37. +1 −1  src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
  38. +2 −2 src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
  39. +1 −1  src/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters.scala
  40. +18 −18 src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
  41. +1 −1  src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
  42. +1 −1  src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala
  43. +1 −1  src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
  44. +1 −1  src/compiler/scala/tools/nsc/dependencies/Changes.scala
  45. +1 −1  src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala
  46. +1 −1  src/compiler/scala/tools/nsc/doc/Settings.scala
  47. +2 −2 src/compiler/scala/tools/nsc/doc/Uncompilable.scala
  48. +10 −10 src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
  49. +2 −2 src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala
  50. +1 −1  src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala
  51. +1 −1  src/compiler/scala/tools/nsc/doc/html/page/Source.scala
  52. +34 −34 src/compiler/scala/tools/nsc/doc/html/page/Template.scala
  53. +2 −2 src/compiler/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
  54. +1 −1  src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
  55. +1 −1  src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
  56. +1 −1  src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
  57. +1 −1  src/compiler/scala/tools/nsc/interactive/BuildManager.scala
  58. +1 −1  src/compiler/scala/tools/nsc/interactive/ContextTrees.scala
  59. +1 −1  src/compiler/scala/tools/nsc/interactive/Global.scala
  60. +1 −1  src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala
  61. +1 −1  src/compiler/scala/tools/nsc/interactive/Picklers.scala
  62. +1 −1  src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
  63. +1 −1  src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala
  64. +2 −2 src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
  65. +2 −2 src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
  66. +2 −2 src/compiler/scala/tools/nsc/interactive/tests/Tester.scala
  67. +2 −2 src/compiler/scala/tools/nsc/interactive/tests/core/TestMarker.scala
  68. +1 −1  src/compiler/scala/tools/nsc/interpreter/CompletionAware.scala
  69. +2 −2 src/compiler/scala/tools/nsc/interpreter/ILoop.scala
  70. +1 −1  src/compiler/scala/tools/nsc/interpreter/IMain.scala
  71. +1 −1  src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
  72. +3 −3 src/compiler/scala/tools/nsc/interpreter/LoopCommands.scala
  73. +1 −1  src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
  74. +1 −1  src/compiler/scala/tools/nsc/interpreter/NamedParam.scala
  75. +1 −1  src/compiler/scala/tools/nsc/interpreter/Phased.scala
  76. +1 −1  src/compiler/scala/tools/nsc/interpreter/Power.scala
  77. +1 −1  src/compiler/scala/tools/nsc/interpreter/ReplVals.scala
  78. +2 −2 src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
  79. +2 −2 src/compiler/scala/tools/nsc/interpreter/package.scala
  80. +1 −1  src/compiler/scala/tools/nsc/interpreter/session/package.scala
  81. +2 −2 src/compiler/scala/tools/nsc/io/Jar.scala
  82. +3 −3 src/compiler/scala/tools/nsc/io/Pickler.scala
  83. +1 −1  src/compiler/scala/tools/nsc/io/package.scala
  84. +1 −1  src/compiler/scala/tools/nsc/javac/JavaParsers.scala
  85. +1 −1  src/compiler/scala/tools/nsc/javac/JavaScanners.scala
  86. +2 −2 src/compiler/scala/tools/nsc/matching/MatchSupport.scala
  87. +1 −1  src/compiler/scala/tools/nsc/matching/Matrix.scala
  88. +2 −2 src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
  89. +1 −1  src/compiler/scala/tools/nsc/matching/PatternBindings.scala
  90. +1 −1  src/compiler/scala/tools/nsc/scratchpad/Mixer.scala
  91. +1 −2  src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala
  92. +1 −1  src/compiler/scala/tools/nsc/settings/AbsSettings.scala
  93. +2 −2 src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
  94. +4 −4 src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
  95. +1 −1  src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
  96. +2 −2 src/compiler/scala/tools/nsc/symtab/SymbolTrackers.scala
  97. +1 −1  src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
  98. +1 −1  src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
  99. +1 −1  src/compiler/scala/tools/nsc/symtab/classfile/package.scala
  100. +1 −1  src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
  101. +1 −1  src/compiler/scala/tools/nsc/symtab/package.scala
  102. +1 −1  src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
  103. +3 −3 src/compiler/scala/tools/nsc/transform/CleanUp.scala
  104. +1 −1  src/compiler/scala/tools/nsc/transform/Erasure.scala
  105. +1 −1  src/compiler/scala/tools/nsc/transform/Mixin.scala
  106. +1 −1  src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
  107. +2 −2 src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
  108. +8 −8 src/compiler/scala/tools/nsc/transform/UnCurry.scala
  109. +2 −2 src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
  110. +1 −1  src/compiler/scala/tools/nsc/typechecker/Contexts.scala
  111. +1 −1  src/compiler/scala/tools/nsc/typechecker/DestructureTypes.scala
  112. +1 −1  src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
  113. +6 −6 src/compiler/scala/tools/nsc/typechecker/Implicits.scala
  114. +3 −3 src/compiler/scala/tools/nsc/typechecker/Macros.scala
  115. +1 −1  src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
  116. +3 −3 src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
  117. +4 −4 src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
  118. +4 −5 src/compiler/scala/tools/nsc/typechecker/Typers.scala
  119. +1 −1  src/compiler/scala/tools/nsc/util/Exceptional.scala
  120. +1 −1  src/compiler/scala/tools/nsc/util/ScalaClassLoader.scala
  121. +3 −3 src/compiler/scala/tools/nsc/util/StatisticsInfo.scala
  122. +2 −2 src/compiler/scala/tools/reflect/FastTrack.scala
  123. +1 −1  src/compiler/scala/tools/reflect/package.scala
  124. +1 −1  src/compiler/scala/tools/util/Javap.scala
  125. +1 −1  src/compiler/scala/tools/util/PathResolver.scala
  126. +1 −1  src/compiler/scala/tools/util/VerifyClass.scala
  127. +1 −1  src/continuations/library/scala/util/continuations/ControlContext.scala
  128. +4 −4 src/detach/library/scala/remoting/Channel.scala
  129. +1 −1  src/library/scala/Array.scala
  130. +1 −1  src/library/scala/Boolean.scala
  131. +1 −1  src/library/scala/Byte.scala
  132. +1 −1  src/library/scala/Char.scala
  133. +1 −1  src/library/scala/Double.scala
  134. +1 −1  src/library/scala/Float.scala
  135. +1 −1  src/library/scala/Int.scala
  136. +1 −1  src/library/scala/Long.scala
  137. +1 −1  src/library/scala/LowPriorityImplicits.scala
  138. +1 −1  src/library/scala/Option.scala
  139. +3 −3 src/library/scala/PartialFunction.scala
  140. +4 −4 src/library/scala/Predef.scala
  141. +1 −1  src/library/scala/SerialVersionUID.scala
  142. +1 −1  src/library/scala/Short.scala
  143. +1 −1  src/library/scala/Unit.scala
  144. +1 −1  src/library/scala/annotation/bridge.scala
  145. +1 −1  src/library/scala/annotation/cloneable.scala
  146. +4 −4 src/library/scala/annotation/elidable.scala
  147. +1 −1  src/library/scala/annotation/implicitNotFound.scala
  148. +1 −1  src/library/scala/annotation/meta/beanGetter.scala
  149. +1 −1  src/library/scala/annotation/meta/beanSetter.scala
  150. +2 −2 src/library/scala/annotation/meta/companionClass.scala
  151. +2 −2 src/library/scala/annotation/meta/companionMethod.scala
  152. +1 −1  src/library/scala/annotation/meta/companionObject.scala
  153. +1 −1  src/library/scala/annotation/meta/field.scala
  154. +1 −1  src/library/scala/annotation/meta/getter.scala
  155. +1 −1  src/library/scala/annotation/meta/languageFeature.scala
  156. +1 −1  src/library/scala/annotation/meta/param.scala
  157. +1 −1  src/library/scala/annotation/meta/setter.scala
  158. +2 −2 src/library/scala/annotation/migration.scala
  159. +1 −1  src/library/scala/annotation/serializable.scala
  160. +1 −1  src/library/scala/annotation/strictfp.scala
  161. +1 −1  src/library/scala/annotation/switch.scala
  162. +1 −1  src/library/scala/annotation/tailrec.scala
  163. +1 −1  src/library/scala/annotation/unchecked/uncheckedStable.scala
  164. +1 −1  src/library/scala/annotation/unchecked/uncheckedVariance.scala
  165. +1 −1  src/library/scala/annotation/unspecialized.scala
  166. +1 −1  src/library/scala/annotation/varargs.scala
  167. +1 −1  src/library/scala/beans/BeanDescription.scala
  168. +1 −1  src/library/scala/beans/BeanDisplayName.scala
  169. +1 −1  src/library/scala/beans/BeanInfo.scala
  170. +1 −1  src/library/scala/beans/BeanInfoSkip.scala
  171. +1 −1  src/library/scala/beans/BeanProperty.scala
  172. +1 −1  src/library/scala/beans/BooleanBeanProperty.scala
  173. +1 −1  src/library/scala/collection/GenTraversableLike.scala
  174. +3 −3 src/library/scala/collection/GenTraversableOnce.scala
  175. +1 −1  src/library/scala/collection/IterableLike.scala
  176. +1 −1  src/library/scala/collection/IterableViewLike.scala
  177. +3 −3 src/library/scala/collection/Iterator.scala
  178. +1 −1  src/library/scala/collection/LinearSeqLike.scala
  179. +5 −5 src/library/scala/collection/MapLike.scala
  180. +1 −1  src/library/scala/collection/SetLike.scala
  181. +3 −3 src/library/scala/collection/TraversableLike.scala
  182. +8 −8 src/library/scala/collection/TraversableOnce.scala
  183. +1 −1  src/library/scala/collection/TraversableProxyLike.scala
  184. +2 −2 src/library/scala/collection/TraversableViewLike.scala
  185. +18 −31 src/library/scala/collection/concurrent/TrieMap.scala
  186. +1 −1  src/library/scala/collection/convert/DecorateAsJava.scala
  187. +1 −1  src/library/scala/collection/convert/DecorateAsScala.scala
  188. +2 −2 src/library/scala/collection/convert/WrapAsJava.scala
  189. +1 −1  src/library/scala/collection/convert/WrapAsScala.scala
  190. +2 −2 src/library/scala/collection/convert/Wrappers.scala
  191. +2 −2 src/library/scala/collection/generic/ClassTagTraversableFactory.scala
  192. +1 −1  src/library/scala/collection/generic/GenMapFactory.scala
  193. +1 −1  src/library/scala/collection/generic/GenSeqFactory.scala
  194. +1 −1  src/library/scala/collection/generic/GenSetFactory.scala
  195. +1 −1  src/library/scala/collection/generic/GenTraversableFactory.scala
  196. +2 −2 src/library/scala/collection/generic/GenericClassTagCompanion.scala
  197. +3 −3 src/library/scala/collection/generic/GenericClassTagTraversableTemplate.scala
  198. +1 −1  src/library/scala/collection/generic/GenericCompanion.scala
  199. +1 −1  src/library/scala/collection/generic/GenericOrderedCompanion.scala
  200. +2 −2 src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala
  201. +1 −1  src/library/scala/collection/generic/GenericParCompanion.scala
  202. +3 −3 src/library/scala/collection/generic/GenericParTemplate.scala
  203. +2 −2 src/library/scala/collection/generic/GenericSeqCompanion.scala
  204. +1 −1  src/library/scala/collection/generic/GenericSetTemplate.scala
  205. +5 −5 src/library/scala/collection/generic/GenericTraversableTemplate.scala
  206. +1 −1  src/library/scala/collection/generic/ImmutableMapFactory.scala
  207. +1 −1  src/library/scala/collection/generic/ImmutableSetFactory.scala
  208. +1 −1  src/library/scala/collection/generic/ImmutableSortedMapFactory.scala
  209. +1 −1  src/library/scala/collection/generic/ImmutableSortedSetFactory.scala
  210. +2 −2 src/library/scala/collection/generic/IsTraversableLike.scala
  211. +2 −2 src/library/scala/collection/generic/IsTraversableOnce.scala
  212. +1 −1  src/library/scala/collection/generic/IterableForwarder.scala
  213. +1 −1  src/library/scala/collection/generic/MapFactory.scala
  214. +1 −1  src/library/scala/collection/generic/MutableMapFactory.scala
  215. +1 −1  src/library/scala/collection/generic/MutableSetFactory.scala
  216. +1 −1  src/library/scala/collection/generic/MutableSortedSetFactory.scala
  217. +1 −1  src/library/scala/collection/generic/OrderedTraversableFactory.scala
  218. +1 −1  src/library/scala/collection/generic/ParFactory.scala
  219. +1 −1  src/library/scala/collection/generic/ParMapFactory.scala
  220. +5 −5 src/library/scala/collection/generic/ParSetFactory.scala
  221. +1 −1  src/library/scala/collection/generic/SeqFactory.scala
  222. +2 −2 src/library/scala/collection/generic/SetFactory.scala
  223. +1 −1  src/library/scala/collection/generic/SortedMapFactory.scala
  224. +1 −1  src/library/scala/collection/generic/SortedSetFactory.scala
  225. +1 −1  src/library/scala/collection/generic/TraversableFactory.scala
  226. +1 −1  src/library/scala/collection/generic/TraversableForwarder.scala
  227. +1 −1  src/library/scala/collection/generic/package.scala
  228. +9 −9 src/library/scala/collection/immutable/HashMap.scala
  229. +2 −2 src/library/scala/collection/immutable/HashSet.scala
  230. +2 −2 src/library/scala/collection/immutable/List.scala
  231. +1 −1  src/library/scala/collection/immutable/ListMap.scala
  232. +1 −1  src/library/scala/collection/immutable/ListSet.scala
  233. +1 −1  src/library/scala/collection/immutable/Map.scala
  234. +1 −1  src/library/scala/collection/immutable/PagedSeq.scala
  235. +1 −1  src/library/scala/collection/immutable/Queue.scala
  236. +6 −6 src/library/scala/collection/immutable/Range.scala
  237. +2 −2 src/library/scala/collection/immutable/RedBlackTree.scala
  238. +7 −7 src/library/scala/collection/immutable/SortedMap.scala
  239. +2 −2 src/library/scala/collection/immutable/Stream.scala
  240. +4 −4 src/library/scala/collection/immutable/StreamViewLike.scala
  241. +2 −2 src/library/scala/collection/immutable/StringLike.scala
  242. +1 −1  src/library/scala/collection/immutable/TrieIterator.scala
  243. +3 −3 src/library/scala/collection/immutable/Vector.scala
  244. +2 −2 src/library/scala/collection/mutable/ArrayBuffer.scala
  245. +2 −2 src/library/scala/collection/mutable/ArrayOps.scala
  246. +1 −1  src/library/scala/collection/mutable/ArrayStack.scala
  247. +2 −2 src/library/scala/collection/mutable/BufferLike.scala
  248. +1 −1  src/library/scala/collection/mutable/DoubleLinkedListLike.scala
  249. +2 −2 src/library/scala/collection/mutable/HashMap.scala
  250. +1 −1  src/library/scala/collection/mutable/HashSet.scala
  251. +1 −1  src/library/scala/collection/mutable/HashTable.scala
  252. +4 −4 src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
  253. +1 −1  src/library/scala/collection/mutable/IndexedSeqView.scala
  254. +1 −1  src/library/scala/collection/mutable/LinkedListLike.scala
  255. +1 −1  src/library/scala/collection/mutable/Map.scala
  256. +1 −1  src/library/scala/collection/mutable/MapLike.scala
  257. +3 −3 src/library/scala/collection/mutable/ObservableBuffer.scala
  258. +2 −2 src/library/scala/collection/mutable/ResizableArray.scala
  259. +1 −1  src/library/scala/collection/mutable/SetBuilder.scala
  260. +1 −1  src/library/scala/collection/mutable/SetLike.scala
  261. +1 −1  src/library/scala/collection/mutable/SortedSet.scala
  262. +3 −3 src/library/scala/collection/mutable/Stack.scala
  263. +1 −1  src/library/scala/collection/mutable/StringBuilder.scala
  264. +4 −4 src/library/scala/collection/mutable/SynchronizedMap.scala
  265. +12 −12 src/library/scala/collection/mutable/UnrolledBuffer.scala
  266. +8 −8 src/library/scala/collection/parallel/ParIterableLike.scala
  267. +1 −1  src/library/scala/collection/parallel/ParIterableViewLike.scala
  268. +1 −1  src/library/scala/collection/parallel/ParMapLike.scala
  269. +8 −8 src/library/scala/collection/parallel/Tasks.scala
  270. +6 −6 src/library/scala/collection/parallel/immutable/ParHashMap.scala
  271. +2 −2 src/library/scala/collection/parallel/immutable/ParHashSet.scala
  272. +1 −1  src/library/scala/collection/parallel/immutable/ParIterable.scala
  273. +3 −3 src/library/scala/collection/parallel/immutable/ParMap.scala
  274. +1 −1  src/library/scala/collection/parallel/immutable/ParSeq.scala
  275. +1 −1  src/library/scala/collection/parallel/mutable/LazyCombiner.scala
  276. +3 −3 src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
  277. +8 −8 src/library/scala/collection/parallel/mutable/ParHashMap.scala
  278. +8 −8 src/library/scala/collection/parallel/mutable/ParHashSet.scala
  279. +3 −3 src/library/scala/collection/parallel/mutable/ParHashTable.scala
  280. +2 −2 src/library/scala/collection/parallel/mutable/ParIterable.scala
  281. +7 −7 src/library/scala/collection/parallel/mutable/ParMap.scala
  282. +8 −8 src/library/scala/collection/parallel/mutable/ParMapLike.scala
  283. +3 −3 src/library/scala/collection/parallel/mutable/ParSeq.scala
  284. +2 −2 src/library/scala/collection/parallel/mutable/ParSet.scala
  285. +2 −2 src/library/scala/collection/parallel/mutable/ParSetLike.scala
  286. +2 −2 src/library/scala/collection/parallel/mutable/ParTrieMap.scala
  287. +6 −6 src/library/scala/collection/parallel/package.scala
  288. +8 −8 src/library/scala/concurrent/Future.scala
  289. +1 −1  src/library/scala/concurrent/FutureTaskRunner.scala
  290. +1 −1  src/library/scala/concurrent/JavaConversions.scala
  291. +1 −1  src/library/scala/concurrent/TaskRunner.scala
  292. +1 −1  src/library/scala/concurrent/ThreadPoolRunner.scala
  293. +1 −1  src/library/scala/concurrent/ThreadRunner.scala
  294. +14 −14 src/library/scala/concurrent/util/Duration.scala
  295. +1 −1  src/library/scala/concurrent/util/duration/package.scala
  296. +2 −2 src/library/scala/deprecated.scala
  297. +1 −1  src/library/scala/deprecatedInheritance.scala
  298. +2 −2 src/library/scala/deprecatedName.scala
  299. +1 −1  src/library/scala/deprecatedOverriding.scala
  300. +1 −1  src/library/scala/inline.scala
Sorry, we could not display the entire diff because too many files (395) changed.
View
4 src/actors-migration/scala/actors/Pattern.scala
@@ -1,7 +1,7 @@
package scala.actors
import scala.concurrent.util.Duration
-import language.implicitConversions
+import scala.language.implicitConversions
object pattern {
@@ -23,4 +23,4 @@ class AskableActorRef(val ar: ActorRef) extends ActorRef {
def forward(message: Any) = ar.forward(message)
private[actors] def localActor: AbstractActor = ar.localActor
-}
+}
View
2  src/actors-migration/scala/actors/StashingActor.scala
@@ -3,7 +3,7 @@ package scala.actors
import scala.collection._
import scala.concurrent.util.Duration
import java.util.concurrent.TimeUnit
-import language.implicitConversions
+import scala.language.implicitConversions
object StashingActor extends Combinators {
implicit def mkBody[A](body: => A) = new InternalActor.Body[A] {
View
2  src/actors-migration/scala/actors/Timeout.scala
@@ -10,7 +10,7 @@ package scala.actors
import scala.concurrent.util.Duration
import java.util.concurrent.TimeUnit
-import language.implicitConversions
+import scala.language.implicitConversions
case class Timeout(duration: Duration) {
def this(timeout: Long) = this(Duration(timeout, TimeUnit.MILLISECONDS))
View
2  src/actors/scala/actors/AbstractActor.scala
@@ -8,7 +8,7 @@
package scala.actors
-import language.higherKinds
+import scala.language.higherKinds
/**
* @author Philipp Haller
View
2  src/actors/scala/actors/Actor.scala
@@ -10,7 +10,7 @@ package scala.actors
import scala.util.control.ControlThrowable
import java.util.{Timer, TimerTask}
-import language.implicitConversions
+import scala.language.implicitConversions
/**
* Provides functions for the definition of actors, as well as actor
View
2  src/actors/scala/actors/CanReply.scala
@@ -8,7 +8,7 @@
package scala.actors
-import language.higherKinds
+import scala.language.higherKinds
/**
* Defines result-bearing message send operations.
View
2  src/actors/scala/actors/Combinators.scala
@@ -10,7 +10,7 @@
package scala.actors
-import language.implicitConversions
+import scala.language.implicitConversions
private[actors] trait Combinators {
View
2  src/actors/scala/actors/Future.scala
@@ -174,7 +174,7 @@ object Futures {
* or timeout + `System.currentTimeMillis()` is negative.
*/
def awaitAll(timeout: Long, fts: Future[Any]*): List[Option[Any]] = {
- var resultsMap: collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]]
+ var resultsMap: scala.collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]]
var cnt = 0
val mappedFts = fts.map(ft =>
View
2  src/actors/scala/actors/Reactor.scala
@@ -12,7 +12,7 @@ package scala.actors
import scala.actors.scheduler.{DelegatingScheduler, ExecutorScheduler,
ForkJoinScheduler, ThreadPoolConfig}
import java.util.concurrent.{ThreadPoolExecutor, TimeUnit, LinkedBlockingQueue}
-import language.implicitConversions
+import scala.language.implicitConversions
private[actors] object Reactor {
View
2  src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
@@ -10,7 +10,7 @@
package scala.actors
package scheduler
-import util.Properties.{ javaVersion, javaVmVendor, isJavaAtLeast, propIsSetTo, propOrNone }
+import scala.util.Properties.{ javaVersion, javaVmVendor, isJavaAtLeast, propIsSetTo, propOrNone }
/**
* @author Erik Engbrecht
View
2  src/build/InnerObjectTestGen.scala
@@ -1,4 +1,4 @@
-import collection.mutable
+import scala.collection.mutable
/** All contexts where objects can be embedded. */
object Contexts extends Enumeration {
View
2  src/build/genprod.scala
@@ -6,7 +6,7 @@
** |/ **
\* */
-import language.postfixOps
+import scala.language.postfixOps
/** This program generates the ProductN, TupleN, FunctionN,
* and AbstractFunctionN, where 0 <= N <= MAX_ARITY.
View
6 src/compiler/scala/reflect/macros/runtime/Infrastructure.scala
@@ -34,7 +34,7 @@ trait Infrastructure {
val currentMacro: Symbol = expandee.symbol
- val globalCache: collection.mutable.Map[Any, Any] = universe.analyzer.globalMacroCache
+ val globalCache: scala.collection.mutable.Map[Any, Any] = universe.analyzer.globalMacroCache
- val cache: collection.mutable.Map[Any, Any] = universe.analyzer.perRunMacroCache.getOrElseUpdate(currentMacro, collection.mutable.Map[Any, Any]())
-}
+ val cache: scala.collection.mutable.Map[Any, Any] = universe.analyzer.perRunMacroCache.getOrElseUpdate(currentMacro, collection.mutable.Map[Any, Any]())
+}
View
4 src/compiler/scala/reflect/macros/runtime/Parsers.scala
@@ -1,7 +1,7 @@
package scala.reflect.macros
package runtime
-import language.existentials
+import scala.language.existentials
import scala.tools.reflect.ToolBox
import scala.tools.reflect.ToolBoxError
@@ -22,4 +22,4 @@ trait Parsers {
case class ParseError(val pos: Position, val msg: String) extends Throwable(msg)
object ParseError extends ParseErrorExtractor
-}
+}
View
2  src/compiler/scala/reflect/reify/package.scala
@@ -1,6 +1,6 @@
package scala.reflect
-import language.implicitConversions
+import scala.language.implicitConversions
import scala.reflect.base.{Universe => BaseUniverse}
import scala.reflect.macros.{Context, ReificationError, UnexpectedReificationError}
import scala.tools.nsc.Global
View
2  src/compiler/scala/tools/ant/ClassloadVerify.scala
@@ -10,7 +10,7 @@ package scala.tools.ant
import org.apache.tools.ant.Project
import org.apache.tools.ant.types.{Path, Reference}
-import collection.JavaConverters._
+import scala.collection.JavaConverters._
import scala.tools.util.VerifyClass
class ClassloadVerify extends ScalaMatchingTask {
View
2  src/compiler/scala/tools/ant/sabbus/Compilers.scala
@@ -11,7 +11,7 @@ package scala.tools.ant.sabbus
import java.net.URL
-object Compilers extends collection.DefaultMap[String, Compiler] {
+object Compilers extends scala.collection.DefaultMap[String, Compiler] {
val debug = false
View
2  src/compiler/scala/tools/cmd/Property.scala
@@ -64,7 +64,7 @@ trait Property extends Reference {
propertiesToOptions(loadProperties(file))
def propertiesToOptions(props: java.util.Properties): List[String] = {
- import collection.JavaConversions._
+ import scala.collection.JavaConversions._
propertiesToOptions(props.toList)
}
def propertiesToOptions(props: List[(String, String)]) = props flatMap propMapper
View
2  src/compiler/scala/tools/cmd/Reference.scala
@@ -6,7 +6,7 @@
package scala.tools
package cmd
-import collection.mutable.ListBuffer
+import scala.collection.mutable.ListBuffer
import nsc.Properties.envOrNone
/** Mixes in the specification trait and uses the vals therein to
View
8 src/compiler/scala/tools/cmd/gen/AnyVals.scala
@@ -14,7 +14,7 @@ trait AnyValReps {
sealed abstract class AnyValNum(name: String, repr: Option[String], javaEquiv: String) extends AnyValRep(name,repr,javaEquiv) {
case class Op(val op : String, val doc : String)
-
+
private def companionCoercions(tos: AnyValRep*) = {
tos.toList map (to =>
"""implicit def @javaequiv@2%s(x: @name@): %s = x.to%s""".format(to.javaEquiv, to.name, to.name)
@@ -24,7 +24,7 @@ trait AnyValReps {
def coercionComment = """
/** Language mandated coercions from @name@ to "wider" types.%s
*/""".format(coercionCommentExtra)
-
+
def implicitCoercions: List[String] = {
val coercions = this match {
case B => companionCoercions(S, I, L, F, D)
@@ -247,7 +247,7 @@ trait AnyValReps {
def classDoc = interpolate(classDocTemplate)
def objectDoc = ""
def mkImports = ""
-
+
def mkClass = assemble("final abstract class " + name + " private extends AnyVal", classLines)
def mkObject = assemble("object " + name + " extends AnyValCompanion", objectLines)
def make() = List[String](
@@ -281,7 +281,7 @@ trait AnyValTemplates {
%s
package scala
-import language.implicitConversions
+import scala.language.implicitConversions
""".trim.format(timestampString) + "\n\n")
View
2  src/compiler/scala/tools/cmd/gen/Codegen.scala
@@ -6,7 +6,7 @@
package scala.tools.cmd
package gen
-import language.postfixOps
+import scala.language.postfixOps
class Codegen(args: List[String]) extends {
val parsed = CodegenSpec(args: _*)
View
2  src/compiler/scala/tools/nsc/EvalLoop.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc
-import annotation.tailrec
+import scala.annotation.tailrec
import java.io.EOFException
trait EvalLoop {
View
8 src/compiler/scala/tools/nsc/Global.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
import java.io.{ File, FileOutputStream, PrintWriter, IOException, FileNotFoundException }
import java.nio.charset.{ Charset, CharsetDecoder, IllegalCharsetNameException, UnsupportedCharsetException }
-import compat.Platform.currentTime
+import scala.compat.Platform.currentTime
import scala.tools.util.PathResolver
import scala.collection.{ mutable, immutable }
import io.{ SourceReader, AbstractFile, Path }
@@ -29,8 +29,8 @@ import backend.{ ScalaPrimitives, Platform, MSILPlatform, JavaPlatform }
import backend.jvm.{GenJVM, GenASM}
import backend.opt.{ Inliners, InlineExceptionHandlers, ClosureElimination, DeadCodeElimination }
import backend.icode.analysis._
-import language.postfixOps
-import reflect.internal.StdAttachments
+import scala.language.postfixOps
+import scala.reflect.internal.StdAttachments
import scala.reflect.ClassTag
class Global(var currentSettings: Settings, var reporter: Reporter)
@@ -940,7 +940,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
reSync(RootClass, Some(classPath), Some(oldEntries), Some(newEntries), invalidated, failed)
}
}
- def show(msg: String, syms: collection.Traversable[Symbol]) =
+ def show(msg: String, syms: scala.collection.Traversable[Symbol]) =
if (syms.nonEmpty)
informProgress(s"$msg: ${syms map (_.fullName) mkString ","}")
show("invalidated packages", invalidated)
View
2  src/compiler/scala/tools/nsc/PhaseAssembly.scala
@@ -8,7 +8,7 @@ package scala.tools.nsc
import java.io.{ BufferedWriter, FileWriter }
import scala.collection.mutable
-import language.postfixOps
+import scala.language.postfixOps
/**
* PhaseAssembly
View
4 src/compiler/scala/tools/nsc/Phases.scala
@@ -6,8 +6,8 @@
package scala.tools.nsc
import symtab.Flags
-import reflect.internal.util.TableDef
-import language.postfixOps
+import scala.reflect.internal.util.TableDef
+import scala.language.postfixOps
object Phases {
val MaxPhases = 64
View
4 src/compiler/scala/tools/nsc/ast/NodePrinters.scala
@@ -6,9 +6,9 @@
package scala.tools.nsc
package ast
-import compat.Platform.EOL
+import scala.compat.Platform.EOL
import symtab.Flags._
-import language.postfixOps
+import scala.language.postfixOps
/** The object `nodePrinter` converts the internal tree
* representation to a string.
View
2  src/compiler/scala/tools/nsc/ast/Printers.scala
@@ -10,7 +10,7 @@ import java.io.{ OutputStream, PrintWriter, StringWriter, Writer }
import symtab.Flags._
import symtab.SymbolTable
-trait Printers extends reflect.internal.Printers { this: Global =>
+trait Printers extends scala.reflect.internal.Printers { this: Global =>
import treeInfo.{ IsTrue, IsFalse }
View
2  src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
@@ -18,7 +18,7 @@ import scala.concurrent.Lock
import scala.text._
import symtab.Flags._
import symtab.SymbolTable
-import language.implicitConversions
+import scala.language.implicitConversions
/**
* Tree browsers can show the AST in a graphical and interactive
View
2  src/compiler/scala/tools/nsc/ast/TreeDSL.scala
@@ -9,7 +9,7 @@ package ast
import PartialFunction._
import symtab.Flags
-import language.implicitConversions
+import scala.language.implicitConversions
/** A DSL for generating scala code. The goal is that the
* code generating code should look a lot like the code it
View
4 src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -9,12 +9,12 @@ package ast
import scala.collection.mutable.ListBuffer
import symtab.Flags._
import symtab.SymbolTable
-import language.postfixOps
+import scala.language.postfixOps
/** XXX to resolve: TreeGen only assumes global is a SymbolTable, but
* TreeDSL at the moment expects a Global. Can we get by with SymbolTable?
*/
-abstract class TreeGen extends reflect.internal.TreeGen with TreeDSL {
+abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
val global: Global
import global._
View
6 src/compiler/scala/tools/nsc/ast/TreeInfo.scala
@@ -6,8 +6,8 @@
package scala.tools.nsc
package ast
-import reflect.internal.HasFlags
-import reflect.internal.Flags._
+import scala.reflect.internal.HasFlags
+import scala.reflect.internal.Flags._
import symtab._
/** This class ...
@@ -15,7 +15,7 @@ import symtab._
* @author Martin Odersky
* @version 1.0
*/
-abstract class TreeInfo extends reflect.internal.TreeInfo {
+abstract class TreeInfo extends scala.reflect.internal.TreeInfo {
val global: Global
import global._
View
2  src/compiler/scala/tools/nsc/ast/Trees.scala
@@ -15,7 +15,7 @@ import scala.reflect.internal.Flags.PRESUPER
import scala.reflect.internal.Flags.TRAIT
import scala.compat.Platform.EOL
-trait Trees extends reflect.internal.Trees { self: Global =>
+trait Trees extends scala.reflect.internal.Trees { self: Global =>
def treeLine(t: Tree): String =
if (t.pos.isDefined && t.pos.isRange) t.pos.lineContent.drop(t.pos.column - 1).take(t.pos.end - t.pos.start + 1)
View
8 src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala
@@ -7,11 +7,11 @@ package scala.tools.nsc
package ast.parser
import scala.collection.{ mutable, immutable }
-import xml.{ EntityRef, Text }
-import xml.XML.{ xmlns }
+import scala.xml.{ EntityRef, Text }
+import scala.xml.XML.{ xmlns }
import symtab.Flags.MUTABLE
import scala.reflect.internal.util.StringOps.splitWhere
-import language.implicitConversions
+import scala.language.implicitConversions
/** This class builds instance of `Tree` that represent XML.
*
@@ -144,7 +144,7 @@ abstract class SymbolicXMLBuilder(p: Parsers#Parser, preserveWS: Boolean) {
(buf map convertToTextPat).toList
def parseAttribute(pos: Position, s: String): Tree = {
- val ts = xml.Utility.parseAttributeValue(s) map {
+ val ts = scala.xml.Utility.parseAttributeValue(s) map {
case Text(s) => text(pos, s)
case EntityRef(s) => entityRef(pos, s)
}
View
2  src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
@@ -6,7 +6,7 @@
package scala.tools.nsc
package ast.parser
-import annotation.switch
+import scala.annotation.switch
/** Common code between JavaTokens and Tokens. Not as much (and not as concrete)
* as one might like because JavaTokens for no clear reason chose new numbers for
View
2  src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
@@ -11,7 +11,7 @@ import scala.collection.{ mutable, immutable }
import mutable.{ ListBuffer, ArrayBuffer }
import scala.reflect.internal.util.{ Position, NoPosition }
import backend.icode.analysis.ProgramPoint
-import language.postfixOps
+import scala.language.postfixOps
trait BasicBlocks {
self: ICodes =>
View
2  src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -13,7 +13,7 @@ import scala.collection.mutable.{ ListBuffer, Buffer }
import scala.tools.nsc.symtab._
import scala.annotation.switch
import PartialFunction._
-import language.postfixOps
+import scala.language.postfixOps
/** This class ...
*
View
2  src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
@@ -231,7 +231,7 @@ trait Linearizers {
val handlersByCovered = m.exh.groupBy(_.covered)
// number of basic blocks covered by the entire try-catch expression
- def size(covered: collection.immutable.Set[BasicBlock]) = {
+ def size(covered: scala.collection.immutable.Set[BasicBlock]) = {
val hs = handlersByCovered(covered)
covered.size + (hs :\ 0)((h, s) => h.blocks.length + s)
}
View
4 src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -640,7 +640,7 @@ abstract class TypeFlowAnalysis {
For each of them, its `lastInstruction` (after which no more typeflows are needed) is found.
*/
- def reinit(m: icodes.IMethod, staleOut: List[BasicBlock], inlined: collection.Set[BasicBlock], staleIn: collection.Set[BasicBlock]) {
+ def reinit(m: icodes.IMethod, staleOut: List[BasicBlock], inlined: scala.collection.Set[BasicBlock], staleIn: scala.collection.Set[BasicBlock]) {
if (this.method == null || this.method.symbol != m.symbol) {
init(m)
return
@@ -691,7 +691,7 @@ abstract class TypeFlowAnalysis {
bs foreach enqueue
}
- private def blankOut(blocks: collection.Set[BasicBlock]) {
+ private def blankOut(blocks: scala.collection.Set[BasicBlock]) {
blocks foreach { b =>
in(b) = typeFlowLattice.bottom
out(b) = typeFlowLattice.bottom
View
2  src/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters.scala
@@ -12,7 +12,7 @@ import scala.tools.nsc.util.ScalaClassLoader
import scala.tools.util.JavapClass
import java.util.jar.{ JarEntry, JarOutputStream, Attributes }
import Attributes.Name
-import language.postfixOps
+import scala.language.postfixOps
/** For the last mile: turning generated bytecode in memory into
* something you can use. Has implementations for writing to class
View
36 src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -2044,12 +2044,12 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
var isModuleInitialized = false
- val labels: collection.Map[BasicBlock, asm.Label] = mutable.HashMap(linearization map (_ -> new asm.Label()) : _*)
+ val labels: scala.collection.Map[BasicBlock, asm.Label] = mutable.HashMap(linearization map (_ -> new asm.Label()) : _*)
val onePastLast = new asm.Label // token for the mythical instruction past the last instruction in the method being emitted
// maps a BasicBlock b to the Label that corresponds to b's successor in the linearization. The last BasicBlock is mapped to the onePastLast label.
- val linNext: collection.Map[BasicBlock, asm.Label] = {
+ val linNext: scala.collection.Map[BasicBlock, asm.Label] = {
val result = mutable.HashMap.empty[BasicBlock, asm.Label]
var rest = linearization
var prev = rest.head
@@ -2227,7 +2227,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
}
- def getMerged(): collection.Map[Local, List[Interval]] = {
+ def getMerged(): scala.collection.Map[Local, List[Interval]] = {
// TODO should but isn't: unbalanced start(s) of scope(s)
val shouldBeEmpty = pending filter { p => val Pair(k, st) = p; st.nonEmpty };
val merged = mutable.Map[Local, List[Interval]]()
@@ -2412,7 +2412,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
import asm.Opcodes
(instr.category: @scala.annotation.switch) match {
- case icodes.localsCat =>
+ case icodes.localsCat =>
def genLocalInstr = (instr: @unchecked) match {
case THIS(_) => jmethod.visitVarInsn(Opcodes.ALOAD, 0)
case LOAD_LOCAL(local) => jcode.load(indexOf(local), local.kind)
@@ -2445,7 +2445,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genLocalInstr
- case icodes.stackCat =>
+ case icodes.stackCat =>
def genStackInstr = (instr: @unchecked) match {
case LOAD_MODULE(module) =>
@@ -2473,7 +2473,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
case icodes.arilogCat => genPrimitive(instr.asInstanceOf[CALL_PRIMITIVE].primitive, instr.pos)
- case icodes.castsCat =>
+ case icodes.castsCat =>
def genCastInstr = (instr: @unchecked) match {
case IS_INSTANCE(tpe) =>
@@ -2503,7 +2503,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genCastInstr
- case icodes.objsCat =>
+ case icodes.objsCat =>
def genObjsInstr = (instr: @unchecked) match {
case BOX(kind) =>
@@ -2523,7 +2523,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genObjsInstr
- case icodes.fldsCat =>
+ case icodes.fldsCat =>
def genFldsInstr = (instr: @unchecked) match {
case lf @ LOAD_FIELD(field, isStatic) =>
@@ -2544,7 +2544,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genFldsInstr
- case icodes.mthdsCat =>
+ case icodes.mthdsCat =>
def genMethodsInstr = (instr: @unchecked) match {
/** Special handling to access native Array.clone() */
@@ -2557,7 +2557,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genMethodsInstr
- case icodes.arraysCat =>
+ case icodes.arraysCat =>
def genArraysInstr = (instr: @unchecked) match {
case LOAD_ARRAY_ITEM(kind) => jcode.aload(kind)
case STORE_ARRAY_ITEM(kind) => jcode.astore(kind)
@@ -2566,7 +2566,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genArraysInstr
- case icodes.jumpsCat =>
+ case icodes.jumpsCat =>
def genJumpInstr = (instr: @unchecked) match {
case sw @ SWITCH(tagss, branches) =>
@@ -2696,7 +2696,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genJumpInstr
- case icodes.retCat =>
+ case icodes.retCat =>
def genRetInstr = (instr: @unchecked) match {
case RETURN(kind) => jcode emitRETURN kind
case THROW(_) => emit(Opcodes.ATHROW)
@@ -2816,9 +2816,9 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
// TODO Logical's 2nd elem should be declared ValueTypeKind, to better approximate its allowed values (isIntSized, its comments appears to convey)
// TODO GenICode uses `toTypeKind` to define that elem, `toValueTypeKind` would be needed instead.
// TODO How about adding some asserts to Logical and similar ones to capture the remaining constraint (UNIT not allowed).
- case Logical(op, kind) =>
+ case Logical(op, kind) =>
def genLogical = op match {
- case AND =>
+ case AND =>
kind match {
case LONG => emit(Opcodes.LAND)
case INT => emit(Opcodes.IAND)
@@ -2844,8 +2844,8 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
}
genLogical
-
- case Shift(op, kind) =>
+
+ case Shift(op, kind) =>
def genShift = op match {
case LSL =>
kind match {
@@ -2874,7 +2874,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
}
genShift
- case Comparison(op, kind) =>
+ case Comparison(op, kind) =>
def genCompare = op match {
case CMP =>
(kind: @unchecked) match {
@@ -2889,7 +2889,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
(kind: @unchecked) match {
case FLOAT => emit(Opcodes.FCMPG)
case DOUBLE => emit(Opcodes.DCMPL) // TODO bug? why not DCMPG? http://docs.oracle.com/javase/specs/jvms/se5.0/html/Instructions2.doc3.html
-
+
}
}
genCompare
View
2  src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -18,7 +18,7 @@ import JAccessFlags._
import JObjectType.{ JAVA_LANG_STRING, JAVA_LANG_OBJECT }
import java.util.jar.{ JarEntry, JarOutputStream }
import scala.tools.nsc.io.AbstractFile
-import language.postfixOps
+import scala.language.postfixOps
/** This class ...
*
View
2  src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala
@@ -15,7 +15,7 @@ import scala.tools.nsc.symtab._
import ch.epfl.lamp.compiler.msil.{Type => MsilType, _}
import ch.epfl.lamp.compiler.msil.emit._
import ch.epfl.lamp.compiler.msil.util.PECustomMod
-import language.postfixOps
+import scala.language.postfixOps
abstract class GenMSIL extends SubComponent {
import global._
View
2  src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -746,7 +746,7 @@ abstract class Inliners extends SubComponent {
toBecomePublic: List[Symbol]
)
- final class CallerCalleeInfo(val caller: IMethodInfo, val inc: IMethodInfo, fresh: mutable.Map[String, Int], inlinedMethodCount: collection.Map[Symbol, Int]) {
+ final class CallerCalleeInfo(val caller: IMethodInfo, val inc: IMethodInfo, fresh: mutable.Map[String, Int], inlinedMethodCount: scala.collection.Map[Symbol, Int]) {
assert(!caller.isBridge && inc.m.hasCode,
"A guard in Inliner.analyzeClass() should have prevented from getting here.")
View
2  src/compiler/scala/tools/nsc/dependencies/Changes.scala
@@ -3,7 +3,7 @@ package dependencies
import symtab.Flags
-import collection._
+import scala.collection._
/** A component that describes the possible changes between successive
* compilations of a class.
View
2  src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala
@@ -2,7 +2,7 @@ package scala.tools.nsc
package dependencies
import io.Path
-import collection._
+import scala.collection._
import symtab.Flags
import scala.tools.nsc.io.AbstractFile
import scala.reflect.internal.util.SourceFile
View
2  src/compiler/scala/tools/nsc/doc/Settings.scala
@@ -8,7 +8,7 @@ package doc
import java.io.File
import java.lang.System
-import language.postfixOps
+import scala.language.postfixOps
/** An extended version of compiler settings, with additional Scaladoc-specific options.
* @param error A function that prints a string to the appropriate error stream
View
4 src/compiler/scala/tools/nsc/doc/Uncompilable.scala
@@ -5,8 +5,8 @@
package scala.tools.nsc
package doc
-import language.implicitConversions
-import language.postfixOps
+import scala.language.implicitConversions
+import scala.language.postfixOps
/** Some glue between DocParser (which reads source files which can't be compiled)
* and the scaladoc model.
View
20 src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala
@@ -10,8 +10,8 @@ package html
import model._
import comment._
-import xml.{XML, NodeSeq}
-import xml.dtd.{DocType, PublicID}
+import scala.xml.{XML, NodeSeq}
+import scala.xml.dtd.{DocType, PublicID}
import scala.collection._
import java.io.Writer
@@ -87,7 +87,7 @@ abstract class HtmlPage extends Page { thisPage =>
case Title(in, _) => <h6>{ inlineToHtml(in) }</h6>
case Paragraph(in) => <p>{ inlineToHtml(in) }</p>
case Code(data) =>
- <pre>{ SyntaxHigh(data) }</pre> //<pre>{ xml.Text(data) }</pre>
+ <pre>{ SyntaxHigh(data) }</pre> //<pre>{ scala.xml.Text(data) }</pre>
case UnorderedList(items) =>
<ul>{ listItemsToHtml(items) }</ul>
case OrderedList(items, listStyle) =>
@@ -119,9 +119,9 @@ abstract class HtmlPage extends Page { thisPage =>
case Subscript(in) => <sub>{ inlineToHtml(in) }</sub>
case Link(raw, title) => <a href={ raw }>{ inlineToHtml(title) }</a>
case Monospace(in) => <code>{ inlineToHtml(in) }</code>
- case Text(text) => xml.Text(text)
+ case Text(text) => scala.xml.Text(text)
case Summary(in) => inlineToHtml(in)
- case HtmlTag(tag) => xml.Unparsed(tag)
+ case HtmlTag(tag) => scala.xml.Unparsed(tag)
case EntityLink(target, link) => linkToHtml(target, link, true)
}
@@ -158,11 +158,11 @@ abstract class HtmlPage extends Page { thisPage =>
if (starts.isEmpty && (inPos == string.length))
NodeSeq.Empty
else if (starts.isEmpty)
- xml.Text(string.slice(inPos, string.length))
+ scala.xml.Text(string.slice(inPos, string.length))
else if (inPos == starts.head)
toLinksIn(inPos, starts)
else {
- xml.Text(string.slice(inPos, starts.head)) ++ toLinksIn(starts.head, starts)
+ scala.xml.Text(string.slice(inPos, starts.head)) ++ toLinksIn(starts.head, starts)
}
}
def toLinksIn(inPos: Int, starts: List[Int]): NodeSeq = {
@@ -173,7 +173,7 @@ abstract class HtmlPage extends Page { thisPage =>
if (hasLinks)
toLinksOut(0, tpe.refEntity.keySet.toList)
else
- xml.Text(string)
+ scala.xml.Text(string)
}
def typesToHtml(tpess: List[model.TypeEntity], hasLinks: Boolean, sep: NodeSeq): NodeSeq = tpess match {
@@ -192,10 +192,10 @@ abstract class HtmlPage extends Page { thisPage =>
if (hasPage(dTpl)) {
<a href={ relativeLinkTo(dTpl) } class="extype" name={ dTpl.qualifiedName }>{ if (name eq null) dTpl.name else name }</a>
} else {
- xml.Text(if (name eq null) dTpl.name else name)
+ scala.xml.Text(if (name eq null) dTpl.name else name)
}
case ndTpl: NoDocTemplate =>
- xml.Text(if (name eq null) ndTpl.name else name)
+ scala.xml.Text(if (name eq null) ndTpl.name else name)
}
/** Returns the HTML code that represents the templates in `tpls` as a list of hyperlinked names. */
View
4 src/compiler/scala/tools/nsc/doc/html/SyntaxHigh.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc.doc.html
-import xml.NodeSeq
+import scala.xml.NodeSeq
/** Highlight the syntax of Scala code appearing in a `{{{` wiki block
* (see method `HtmlPage.blockToHtml`).
@@ -281,6 +281,6 @@ private[html] object SyntaxHigh {
}
parse("", 0)
- xml.Unparsed(out.toString)
+ scala.xml.Unparsed(out.toString)
}
}
View
2  src/compiler/scala/tools/nsc/doc/html/page/ReferenceIndex.scala
@@ -44,7 +44,7 @@ class ReferenceIndex(letter: Char, index: doc.Index, universe: Universe) extends
<strike>{ name }</strike>
}</div>
<div class="occurrences">{
- for (owner <- occurrences) yield owner ++ xml.Text(" ")
+ for (owner <- occurrences) yield owner ++ scala.xml.Text(" ")
}</div>
</div>
}
View
2  src/compiler/scala/tools/nsc/doc/html/page/Source.scala
@@ -10,7 +10,7 @@ package page
import model._
import comment._
-import xml.{NodeSeq, Unparsed}
+import scala.xml.{NodeSeq, Unparsed}
import java.io.File
class Source(sourceFile: File) extends HtmlPage {
View
68 src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -13,7 +13,7 @@ import model.diagram._
import diagram._
import scala.xml.{ NodeSeq, Text, UnprefixedAttribute }
-import language.postfixOps
+import scala.language.postfixOps
import model._
import model.diagram._
@@ -51,7 +51,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
var hash = '{ val p = templateToPath(tpl); (p.tail.reverse ::: List(p.head.replace(".html", ""))).mkString(".") }';
var anchor = window.location.hash;
var anchor_opt = '';
- if (anchor.length { scala.xml.Unparsed(">=") /* unless we use Unparsed, it gets escaped and crashes the script */ } 1)
+ if (anchor.length { scala.xml.Unparsed(">=") /* unless we use Unparsed, it gets escaped and crashes the script */ } 1)
anchor_opt = '@' + anchor.substring(1);
window.location.href = url + '#' + hash + anchor_opt;
}}
@@ -93,7 +93,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
if (tpl.isRootPackage || tpl.inTemplate.isRootPackage)
NodeSeq.Empty
else
- <p id="owner">{ templatesToHtml(tpl.inTemplate.toRoot.reverse.tail, xml.Text(".")) }</p>
+ <p id="owner">{ templatesToHtml(tpl.inTemplate.toRoot.reverse.tail, scala.xml.Text(".")) }</p>
}
<body class={ if (tpl.isType) "type" else "value" }>
@@ -152,7 +152,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
<div id="ancestors">
<span class="filtertype">Implicitly<br/>
</span>
- <ol id="implicits"> {
+ <ol id="implicits"> {
tpl.conversions.map { conv =>
val name = conv.conversionQualifiedName
val hide = universe.settings.hiddenImplicits(name)
@@ -415,14 +415,14 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
case Nil =>
NodeSeq.Empty
case List(constraint) =>
- xml.Text("This conversion will take place only if ") ++ constraintToHtml(constraint) ++ xml.Text(".")
+ scala.xml.Text("This conversion will take place only if ") ++ constraintToHtml(constraint) ++ scala.xml.Text(".")
case List(constraint1, constraint2) =>
- xml.Text("This conversion will take place only if ") ++ constraintToHtml(constraint1) ++
- xml.Text(" and at the same time ") ++ constraintToHtml(constraint2) ++ xml.Text(".")
+ scala.xml.Text("This conversion will take place only if ") ++ constraintToHtml(constraint1) ++
+ scala.xml.Text(" and at the same time ") ++ constraintToHtml(constraint2) ++ scala.xml.Text(".")
case constraints =>
<br/> ++ "This conversion will take place only if all of the following constraints are met:" ++ <br/> ++ {
var index = 0
- constraints map { constraint => xml.Text({ index += 1; index } + ". ") ++ constraintToHtml(constraint) ++ <br/> }
+ constraints map { constraint => scala.xml.Text({ index += 1; index } + ". ") ++ constraintToHtml(constraint) ++ <br/> }
}
}
@@ -440,18 +440,18 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
case d: Def => d.valueParams map (_ map (_ name) mkString("(", ", ", ")")) mkString
case _ => "" // no parameters
}
- <br/> ++ xml.Text("To access this member you can use a ") ++
+ <br/> ++ scala.xml.Text("To access this member you can use a ") ++
<a href="http://stackoverflow.com/questions/2087250/what-is-the-purpose-of-type-ascription-in-scala"
- target="_blank">type ascription</a> ++ xml.Text(":") ++
+ target="_blank">type ascription</a> ++ scala.xml.Text(":") ++
<br/> ++ <div class="cmt"><pre>{"(" + Template.lowerFirstLetter(tpl.name) + ": " + conv.targetType.name + ")." + mbr.name + params }</pre></div>
}
val shadowingWarning: NodeSeq =
if (mbr.isShadowedImplicit)
- xml.Text("This implicitly inherited member is shadowed by one or more members in this " +
+ scala.xml.Text("This implicitly inherited member is shadowed by one or more members in this " +
"class.") ++ shadowingSuggestion
else if (mbr.isAmbiguousImplicit)
- xml.Text("This implicitly inherited member is ambiguous. One or more implicitly " +
+ scala.xml.Text("This implicitly inherited member is ambiguous. One or more implicitly " +
"inherited members have similar signatures, so calling this member may produce an ambiguous " +
"implicit conversion compiler error.") ++ shadowingSuggestion
else NodeSeq.Empty
@@ -471,7 +471,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
if (fvs.isEmpty || isReduced) NodeSeq.Empty
else {
<dt>Attributes</dt>
- <dd>{ fvs map { fv => { inlineToHtml(fv.text) ++ xml.Text(" ") } } }</dd>
+ <dd>{ fvs map { fv => { inlineToHtml(fv.text) ++ scala.xml.Text(" ") } } }</dd>
}
}
@@ -480,7 +480,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
if ((inDefTpls.tail.isEmpty && (inDefTpls.head == inTpl)) || isReduced) NodeSeq.Empty
else {
<dt>Definition Classes</dt>
- <dd>{ templatesToHtml(inDefTpls, xml.Text(" → ")) }</dd>
+ <dd>{ templatesToHtml(inDefTpls, scala.xml.Text(" → ")) }</dd>
}
}
@@ -628,7 +628,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
<div class="toggleContainer block">
<span class="toggle">Linear Supertypes</span>
<div class="superTypes hiddenContent">{
- typesToHtml(dtpl.linearizationTypes, hasLinks = true, sep = xml.Text(", "))
+ typesToHtml(dtpl.linearizationTypes, hasLinks = true, sep = scala.xml.Text(", "))
}</div>
</div>
case _ => NodeSeq.Empty
@@ -639,7 +639,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
<div class="toggleContainer block">
<span class="toggle">Known Subclasses</span>
<div class="subClasses hiddenContent">{
- templatesToHtml(dtpl.allSubClasses.sortBy(_.name), xml.Text(", "))
+ templatesToHtml(dtpl.allSubClasses.sortBy(_.name), scala.xml.Text(", "))
}</div>
</div>
case _ => NodeSeq.Empty
@@ -663,7 +663,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
def boundsToHtml(hi: Option[TypeEntity], lo: Option[TypeEntity], hasLinks: Boolean): NodeSeq = {
def bound0(bnd: Option[TypeEntity], pre: String): NodeSeq = bnd match {
case None => NodeSeq.Empty
- case Some(tpe) => xml.Text(pre) ++ typeToHtml(tpe, hasLinks)
+ case Some(tpe) => scala.xml.Text(pre) ++ typeToHtml(tpe, hasLinks)
}
bound0(lo, " >: ") ++ bound0(hi, " <: ")
}
@@ -694,7 +694,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
def inside(hasLinks: Boolean, nameLink: String = ""): NodeSeq =
<xml:group>
<span class="modifier_kind">
- <span class="modifier">{ mbr.flags.map(flag => inlineToHtml(flag.text) ++ xml.Text(" ")) }</span>
+ <span class="modifier">{ mbr.flags.map(flag => inlineToHtml(flag.text) ++ scala.xml.Text(" ")) }</span>
<span class="kind">{ kindToString(mbr) }</span>
</span>
<span class="symbol">
@@ -872,7 +872,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
def argumentsToHtml0(argss: List[ValueArgument]): NodeSeq = argss match {
case Nil => NodeSeq.Empty
case arg :: Nil => argumentToHtml(arg)
- case arg :: args => argumentToHtml(arg) ++ xml.Text(", ") ++ argumentsToHtml0(args)
+ case arg :: args => argumentToHtml(arg) ++ scala.xml.Text(", ") ++ argumentsToHtml0(args)
}
<span class="args">({ argumentsToHtml0(argss) })</span>
}
@@ -922,29 +922,29 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
private def constraintToHtml(constraint: Constraint): NodeSeq = constraint match {
case ktcc: KnownTypeClassConstraint =>
- xml.Text(ktcc.typeExplanation(ktcc.typeParamName) + " (" + ktcc.typeParamName + ": ") ++
- templateToHtml(ktcc.typeClassEntity) ++ xml.Text(")")
+ scala.xml.Text(ktcc.typeExplanation(ktcc.typeParamName) + " (" + ktcc.typeParamName + ": ") ++
+ templateToHtml(ktcc.typeClassEntity) ++ scala.xml.Text(")")
case tcc: TypeClassConstraint =>
- xml.Text(tcc.typeParamName + " is ") ++
+ scala.xml.Text(tcc.typeParamName + " is ") ++
<a href="http://stackoverflow.com/questions/2982276/what-is-a-context-bound-in-scala" target="_blank">
- context-bounded</a> ++ xml.Text(" by " + tcc.typeClassEntity.qualifiedName + " (" + tcc.typeParamName + ": ") ++
- templateToHtml(tcc.typeClassEntity) ++ xml.Text(")")
+ context-bounded</a> ++ scala.xml.Text(" by " + tcc.typeClassEntity.qualifiedName + " (" + tcc.typeParamName + ": ") ++
+ templateToHtml(tcc.typeClassEntity) ++ scala.xml.Text(")")
case impl: ImplicitInScopeConstraint =>
- xml.Text("an implicit value of type ") ++ typeToHtml(impl.implicitType, true) ++ xml.Text(" is in scope")
+ scala.xml.Text("an implicit value of type ") ++ typeToHtml(impl.implicitType, true) ++ scala.xml.Text(" is in scope")
case eq: EqualTypeParamConstraint =>
- xml.Text(eq.typeParamName + " is " + eq.rhs.name + " (" + eq.typeParamName + " =:= ") ++
- typeToHtml(eq.rhs, true) ++ xml.Text(")")
+ scala.xml.Text(eq.typeParamName + " is " + eq.rhs.name + " (" + eq.typeParamName + " =:= ") ++
+ typeToHtml(eq.rhs, true) ++ scala.xml.Text(")")
case bt: BoundedTypeParamConstraint =>
- xml.Text(bt.typeParamName + " is a superclass of " + bt.lowerBound.name + " and a subclass of " +
+ scala.xml.Text(bt.typeParamName + " is a superclass of " + bt.lowerBound.name + " and a subclass of " +
bt.upperBound.name + " (" + bt.typeParamName + " >: ") ++
- typeToHtml(bt.lowerBound, true) ++ xml.Text(" <: ") ++
- typeToHtml(bt.upperBound, true) ++ xml.Text(")")
+ typeToHtml(bt.lowerBound, true) ++ scala.xml.Text(" <: ") ++
+ typeToHtml(bt.upperBound, true) ++ scala.xml.Text(")")
case lb: LowerBoundedTypeParamConstraint =>
- xml.Text(lb.typeParamName + " is a superclass of " + lb.lowerBound.name + " (" + lb.typeParamName + " >: ") ++
- typeToHtml(lb.lowerBound, true) ++ xml.Text(")")
+ scala.xml.Text(lb.typeParamName + " is a superclass of " + lb.lowerBound.name + " (" + lb.typeParamName + " >: ") ++
+ typeToHtml(lb.lowerBound, true) ++ scala.xml.Text(")")
case ub: UpperBoundedTypeParamConstraint =>
- xml.Text(ub.typeParamName + " is a subclass of " + ub.upperBound.name + " (" + ub.typeParamName + " <: ") ++
- typeToHtml(ub.upperBound, true) ++ xml.Text(")")
+ scala.xml.Text(ub.typeParamName + " is a subclass of " + ub.upperBound.name + " (" + ub.typeParamName + " <: ") ++
+ typeToHtml(ub.upperBound, true) ++ scala.xml.Text(")")
}
def makeDiagramHtml(tpl: DocTemplateEntity, diagram: Option[Diagram], description: String, id: String) = {
View
4 src/compiler/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
@@ -426,7 +426,7 @@ class DotDiagramGenerator(settings: doc.Settings) extends DiagramGenerator {
else if (klass.contains("object")) "object"
else ""
- def getPosition(g: xml.Node, axis: String, offset: Double): Option[Double] = {
+ def getPosition(g: scala.xml.Node, axis: String, offset: Double): Option[Double] = {
val node = g \ "a" \ "text" \ ("@" + axis)
if (node.isEmpty)
None
@@ -508,4 +508,4 @@ class DotDiagramGenerator(settings: doc.Settings) extends DiagramGenerator {
private val graphAttributesStr = graphAttributes.map{ case (key, value) => key + "=\"" + value + "\";\n" }.mkString
private val nodeAttributesStr = flatten(nodeAttributes)
private val edgeAttributesStr = flatten(edgeAttributes)
-}
+}
View
2  src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -154,7 +154,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
if (!sym.isTrait && (sym hasFlag Flags.ABSTRACT)) fgs += Paragraph(Text("abstract"))
/* Resetting the DEFERRED flag is a little trick here for refined types: (example from scala.collections)
* {{{
- * implicit def traversable2ops[T](t: collection.GenTraversableOnce[T]) = new TraversableOps[T] {
+ * implicit def traversable2ops[T](t: scala.collection.GenTraversableOnce[T]) = new TraversableOps[T] {
* def isParallel = ...
* }}}
* the type the method returns is TraversableOps, which has all-abstract symbols. But in reality, it couldn't have
View
2  src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
@@ -13,7 +13,7 @@ import scala.collection._
import scala.util.matching.Regex
import scala.annotation.switch
import scala.reflect.internal.util.{NoPosition, Position}
-import language.postfixOps
+import scala.language.postfixOps
/** The comment parser transforms raw comment strings into `Comment` objects.
* Call `parse` to run the parser. Note that the parser is stateless and
View
2  src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
@@ -4,7 +4,7 @@ package diagram
import model._
import comment.CommentFactory
-import collection.mutable
+import scala.collection.mutable
// statistics
import html.page.diagram.DiagramStats
View
2  src/compiler/scala/tools/nsc/interactive/BuildManager.scala
@@ -13,7 +13,7 @@ import scala.reflect.internal.util.FakePos
import dependencies._
import io.AbstractFile
-import language.implicitConversions
+import scala.language.implicitConversions
trait BuildManager {
View
2  src/compiler/scala/tools/nsc/interactive/ContextTrees.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc
package interactive
-import collection.mutable.ArrayBuffer
+import scala.collection.mutable.ArrayBuffer
import scala.reflect.internal.util.Position
trait ContextTrees { self: Global =>
View
2  src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -20,7 +20,7 @@ import scala.tools.nsc.io.Pickler._
import scala.tools.nsc.typechecker.DivergentImplicit
import scala.annotation.tailrec
import symtab.Flags.{ACCESSOR, PARAMACCESSOR}
-import language.implicitConversions
+import scala.language.implicitConversions
/** The main class of the presentation compiler in an interactive environment such as an IDE
*/
View
2  src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc
package interactive
-import collection.mutable.ArrayBuffer
+import scala.collection.mutable.ArrayBuffer
import scala.reflect.internal.util.Position
import reporters.Reporter
View
2  src/compiler/scala/tools/nsc/interactive/Picklers.scala
@@ -13,7 +13,7 @@ import util.EmptyAction
import scala.reflect.internal.util.{Position, RangePosition, NoPosition, OffsetPosition, TransparentPosition}
import io.{Pickler, CondPickler}
import io.Pickler._
-import collection.mutable
+import scala.collection.mutable
import mutable.ListBuffer
trait Picklers { self: Global =>
View
2  src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
@@ -220,7 +220,7 @@ class RefinedBuildManager(val settings: Settings) extends Changes with BuildMana
}
/** Return the set of source files that are invalidated by the given changes. */
- def invalidated(files: Set[AbstractFile], changesOf: collection.Map[Symbol, List[Change]],
+ def invalidated(files: Set[AbstractFile], changesOf: scala.collection.Map[Symbol, List[Change]],
processed: Set[AbstractFile] = Set.empty):
Set[AbstractFile] = {
val buf = new mutable.HashSet[AbstractFile]
View
2  src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala
@@ -6,7 +6,7 @@ package scala.tools.nsc
package interactive
import scala.reflect.internal.util.{SourceFile, Position, NoPosition}
-import collection.mutable.ArrayBuffer
+import scala.collection.mutable.ArrayBuffer
trait RichCompilationUnits { self: Global =>
View
4 src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
@@ -2,8 +2,8 @@ package scala.tools.nsc
package interactive
import scala.reflect.internal.util.{SourceFile, BatchSourceFile, RangePosition}
-import collection.mutable.ArrayBuffer
-import reflect.internal.Chars.{isLineBreakChar, isWhitespace}
+import scala.collection.mutable.ArrayBuffer
+import scala.reflect.internal.Chars.{isLineBreakChar, isWhitespace}
import ast.parser.Tokens._
trait ScratchPadMaker { self: Global =>
View
4 src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
@@ -15,7 +15,7 @@ import scala.annotation.migration
import scala.reflect.internal.util.Position
import scala.reflect.internal.util.SourceFile
-import collection.mutable.ListBuffer
+import scala.collection.mutable.ListBuffer
/** A base class for writing interactive compiler tests.
*
@@ -127,4 +127,4 @@ abstract class InteractiveTest
// the presentation compiler
sys.exit(0)
}
-}
+}
View
4 src/compiler/scala/tools/nsc/interactive/tests/Tester.scala
@@ -9,7 +9,7 @@ package tests
import scala.reflect.internal.util._
import reporters._
import io.AbstractFile
-import collection.mutable.ArrayBuffer
+import scala.collection.mutable.ArrayBuffer
class Tester(ntests: Int, inputs: Array[SourceFile], settings: Settings) {
@@ -168,7 +168,7 @@ class Tester(ntests: Int, inputs: Array[SourceFile], settings: Settings) {
}
case class ErrorTrace(
- sfidx: Int, changes: Seq[Change], infos: collection.Set[reporter.Info], content: Array[Char]) {
+ sfidx: Int, changes: Seq[Change], infos: scala.collection.Set[reporter.Info], content: Array[Char]) {
override def toString =
"Sourcefile: "+inputs(sfidx)+
"\nChanges:\n "+changes.mkString("\n ")+
View
4 src/compiler/scala/tools/nsc/interactive/tests/core/TestMarker.scala
@@ -3,7 +3,7 @@ package scala.tools.nsc.interactive.tests.core
case class DuplicateTestMarker(msg: String) extends Exception(msg)
object TestMarker {
- import collection.mutable.Map
+ import scala.collection.mutable.Map
private val markers: Map[String, TestMarker] = Map.empty
private def checkForDuplicate(marker: TestMarker) {
@@ -24,4 +24,4 @@ object CompletionMarker extends TestMarker("/*!*/")
object TypeMarker extends TestMarker("/*?*/")
-object HyperlinkMarker extends TestMarker("/*#*/")
+object HyperlinkMarker extends TestMarker("/*#*/")
View
2  src/compiler/scala/tools/nsc/interpreter/CompletionAware.scala
@@ -77,7 +77,7 @@ object CompletionAware {
/** Convenience factories.
*/
def apply(terms: () => List[String]): CompletionAware = apply(terms, _ => None)
- def apply(map: collection.Map[String, CompletionAware]): CompletionAware =
+ def apply(map: scala.collection.Map[String, CompletionAware]): CompletionAware =
apply(() => map.keys.toList, map.get _)
}
View
4 src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -23,7 +23,7 @@ import scala.reflect.NameTransformer._
import util.ScalaClassLoader
import ScalaClassLoader._
import scala.tools.util._
-import language.{implicitConversions, existentials}
+import scala.language.{implicitConversions, existentials}
import scala.reflect.{ClassTag, classTag}
import scala.tools.reflect.StdRuntimeTags._
@@ -839,7 +839,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
addThunk({
import scala.tools.nsc.io._
import Properties.userHome
- import compat.Platform.EOL
+ import scala.compat.Platform.EOL
val autorun = replProps.replAutorunCode.option flatMap (f => io.File(f).safeSlurp())
if (autorun.isDefined) intp.quietRun(autorun.get)
})
View
2  src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -25,7 +25,7 @@ import scala.util.control.Exception.{ ultimately }
import IMain._
import java.util.concurrent.Future
import typechecker.Analyzer
-import language.implicitConversions
+import scala.language.implicitConversions
import scala.reflect.runtime.{ universe => ru }
import scala.reflect.{ ClassTag, classTag }
import scala.tools.reflect.StdRuntimeTags._
View
2  src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
@@ -9,7 +9,7 @@ package interpreter
import scala.tools.jline._
import scala.tools.jline.console.completer._
import Completion._
-import collection.mutable.ListBuffer
+import scala.collection.mutable.ListBuffer
// REPL completor - queries supplied interpreter for valid
// completions based on current contents of buffer.
View
6 src/compiler/scala/tools/nsc/interpreter/LoopCommands.scala
@@ -6,12 +6,12 @@
package scala.tools.nsc
package interpreter
-import collection.{ mutable, immutable }
+import scala.collection.{ mutable, immutable }
import mutable.ListBuffer
-import language.implicitConversions
+import scala.language.implicitConversions
class ProcessResult(val line: String) {
- import sys.process._
+ import scala.sys.process._
private val buffer = new ListBuffer[String]
val builder = Process(line)
View
2  src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
@@ -10,7 +10,7 @@ import scala.collection.{ mutable, immutable }
import scala.PartialFunction.cond
import scala.reflect.internal.Chars
import scala.reflect.internal.Flags._
-import language.implicitConversions
+import scala.language.implicitConversions
trait MemberHandlers {
val intp: IMain
View
2  src/compiler/scala/tools/nsc/interpreter/NamedParam.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
package interpreter
import NamedParam._
-import language.implicitConversions
+import scala.language.implicitConversions
import scala.reflect.runtime.{universe => ru}
import scala.reflect.{ClassTag, classTag}
View
2  src/compiler/scala/tools/nsc/interpreter/Phased.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
package interpreter
import scala.collection.{ mutable, immutable }
-import language.implicitConversions
+import scala.language.implicitConversions
/** Mix this into an object and use it as a phasing
* swiss army knife.
View
2  src/compiler/scala/tools/nsc/interpreter/Power.scala
@@ -13,7 +13,7 @@ import session.{ History }
import scala.io.Codec
import java.net.{ URL, MalformedURLException }
import io.{ Path }
-import language.implicitConversions
+import scala.language.implicitConversions
import scala.reflect.runtime.{universe => ru}
import scala.reflect.{ClassTag, classTag}
View
2  src/compiler/scala/tools/nsc/interpreter/ReplVals.scala
@@ -6,7 +6,7 @@
package scala.tools.nsc
package interpreter
-import language.implicitConversions
+import scala.language.implicitConversions
import scala.reflect.base.{Universe => BaseUniverse}
import scala.reflect.runtime.{universe => ru}
View
4 src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
@@ -14,7 +14,7 @@ import scala.reflect.runtime.{universe => ru}
import scala.reflect.{ClassTag, classTag}
import typechecker.DestructureTypes
import scala.reflect.internal.util.StringOps.ojoin
-import language.implicitConversions
+import scala.language.implicitConversions
/** A more principled system for turning types into strings.
*/
@@ -256,4 +256,4 @@ trait TypeStrings {
)
}
-object TypeStrings extends TypeStrings { }
+object TypeStrings extends TypeStrings { }
View
4 src/compiler/scala/tools/nsc/interpreter/package.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc
-import language.implicitConversions
+import scala.language.implicitConversions
/** The main REPL related classes and values are as follows.
* In addition to standard compiler classes Global and Settings, there are:
@@ -38,7 +38,7 @@ package object interpreter extends ReplConfig with ReplStrings {
implicit def postfixOps = language.postfixOps // make all postfix ops in this package compile without warning
private[interpreter] implicit def javaCharSeqCollectionToScala(xs: JCollection[_ <: CharSequence]): List[String] = {
- import collection.JavaConverters._
+ import scala.collection.JavaConverters._
xs.asScala.toList map ("" + _)
}
View
2  src/compiler/scala/tools/nsc/interpreter/session/package.scala
@@ -5,7 +5,7 @@
package scala.tools.nsc
package interpreter
-import language.implicitConversions
+import scala.language.implicitConversions
/** Files having to do with the state of a repl session:
* lines of text entered, types and terms defined, etc.
View
4 src/compiler/scala/tools/nsc/io/Jar.scala