Skip to content
Browse files

Absolutized paths involving the scala package.

Confusing, now-it-happens now-it-doesn't mysteries lurk
in the darkness. When scala packages are declared like this:

  package scala.collection.mutable

Then paths relative to scala can easily be broken via the unlucky
presence of an empty (or nonempty) directory. Example:

  // a.scala
  package scala.foo
  class Bar { new util.Random }

  % scalac ./a.scala
  % mkdir util
  % scalac ./a.scala
  ./a.scala:4: error: type Random is not a member of package util
    new util.Random
             ^
  one error found

There are two ways to play defense against this:

 - don't use relative paths; okay sometimes, less so others
 - don't "opt out" of the scala package

This commit mostly pursues the latter, with occasional doses
of the former.

I created a scratch directory containing these empty directories:

  actors annotation ant api asm beans cmd collection compat
  concurrent control convert docutil dtd duration event factory
  forkjoin generic hashing immutable impl include internal io
  logging macros man1 matching math meta model mutable nsc parallel
  parsing partest persistent process pull ref reflect reify remote
  runtime scalap scheduler script swing sys text threadpool tools
  transform unchecked util xml

I stopped when I could compile the main src directories
even with all those empties on my classpath.
  • Loading branch information...
1 parent 6eb33d4 commit 80ac7d006350c0d60ff1b293ee955c3435288a9e @paulp paulp committed May 3, 2013
Showing with 663 additions and 475 deletions.
  1. +2 −1 src/compiler/scala/reflect/reify/package.scala
  2. +1 −1 src/compiler/scala/reflect/reify/utils/Extractors.scala
  3. +2 −1 src/compiler/scala/tools/ant/Same.scala
  4. +2 −1 src/compiler/scala/tools/ant/sabbus/Break.scala
  5. +2 −1 src/compiler/scala/tools/ant/sabbus/Make.scala
  6. +2 −1 src/compiler/scala/tools/ant/sabbus/ScalacFork.scala
  7. +2 −1 src/compiler/scala/tools/ant/sabbus/Use.scala
  8. +2 −1 src/compiler/scala/tools/cmd/Demo.scala
  9. +2 −1 src/compiler/scala/tools/cmd/Interpolation.scala
  10. +2 −1 src/compiler/scala/tools/cmd/package.scala
  11. +3 −2 src/compiler/scala/tools/nsc/CompileClient.scala
  12. +2 −1 src/compiler/scala/tools/nsc/Driver.scala
  13. +3 −1 src/compiler/scala/tools/nsc/Global.scala
  14. +2 −1 src/compiler/scala/tools/nsc/MainTokenMetric.scala
  15. +2 −1 src/compiler/scala/tools/nsc/ScriptRunner.scala
  16. +1 −1 src/compiler/scala/tools/nsc/ast/Printers.scala
  17. +2 −1 src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
  18. +1 −1 src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
  19. +2 −1 src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
  20. +2 −1 src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
  21. +2 −1 src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
  22. +3 −2 src/compiler/scala/tools/nsc/backend/icode/Members.scala
  23. +4 −3 src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
  24. +2 −1 src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
  25. +2 −1 src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala
  26. +2 −1 src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
  27. +2 −1 src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
  28. +2 −1 src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala
  29. +2 −1 src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
  30. +2 −1 src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
  31. +2 −1 src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
  32. +26 −25 src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
  33. +2 −1 src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
  34. +2 −1 src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
  35. +2 −1 src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
  36. +2 −1 src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
  37. +2 −1 src/compiler/scala/tools/nsc/transform/TailCalls.scala
  38. +2 −1 src/compiler/scala/tools/nsc/transform/UnCurry.scala
  39. +2 −1 src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
  40. +2 −1 src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
  41. +6 −5 src/compiler/scala/tools/nsc/typechecker/Implicits.scala
  42. +2 −1 src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
  43. +2 −1 src/compiler/scala/tools/nsc/typechecker/Typers.scala
  44. +2 −1 src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala
  45. +2 −1 src/compiler/scala/tools/nsc/util/ShowPickled.scala
  46. +3 −1 src/compiler/scala/tools/nsc/util/package.scala
  47. +2 −1 src/compiler/scala/tools/reflect/ToolBoxFactory.scala
  48. +5 −4 src/compiler/scala/tools/util/PathResolver.scala
  49. +2 −1 src/compiler/scala/tools/util/SocketServer.scala
  50. +2 −1 src/interactive/scala/tools/nsc/interactive/REPL.scala
  51. +2 −1 src/interactive/scala/tools/nsc/interactive/ScratchPadMaker.scala
  52. +2 −1 src/interactive/scala/tools/nsc/interactive/tests/Tester.scala
  53. +2 −1 src/library/scala/collection/BitSet.scala
  54. +2 −1 src/library/scala/collection/BitSetLike.scala
  55. +2 −1 src/library/scala/collection/BufferedIterator.scala
  56. +2 −1 src/library/scala/collection/CustomParallelizable.scala
  57. +2 −1 src/library/scala/collection/DefaultMap.scala
  58. +2 −1 src/library/scala/collection/GenIterable.scala
  59. +2 −1 src/library/scala/collection/GenIterableLike.scala
  60. +2 −1 src/library/scala/collection/GenIterableView.scala
  61. +2 −1 src/library/scala/collection/GenIterableViewLike.scala
  62. +2 −1 src/library/scala/collection/GenMap.scala
  63. +2 −1 src/library/scala/collection/GenMapLike.scala
  64. +2 −1 src/library/scala/collection/GenSeq.scala
  65. +2 −1 src/library/scala/collection/GenSeqLike.scala
  66. +2 −1 src/library/scala/collection/GenSeqView.scala
  67. +2 −1 src/library/scala/collection/GenSeqViewLike.scala
  68. +2 −1 src/library/scala/collection/GenSet.scala
  69. +2 −1 src/library/scala/collection/GenSetLike.scala
  70. +2 −1 src/library/scala/collection/GenTraversable.scala
  71. +2 −1 src/library/scala/collection/GenTraversableLike.scala
  72. +2 −1 src/library/scala/collection/GenTraversableOnce.scala
  73. +2 −1 src/library/scala/collection/GenTraversableView.scala
  74. +2 −1 src/library/scala/collection/GenTraversableViewLike.scala
  75. +2 −1 src/library/scala/collection/IndexedSeq.scala
  76. +2 −1 src/library/scala/collection/IndexedSeqLike.scala
  77. +2 −1 src/library/scala/collection/Iterable.scala
  78. +2 −1 src/library/scala/collection/IterableProxy.scala
  79. +2 −1 src/library/scala/collection/IterableProxyLike.scala
  80. +2 −1 src/library/scala/collection/IterableView.scala
  81. +2 −1 src/library/scala/collection/IterableViewLike.scala
  82. +2 −1 src/library/scala/collection/JavaConversions.scala
  83. +2 −1 src/library/scala/collection/JavaConverters.scala
  84. +2 −1 src/library/scala/collection/LinearSeq.scala
  85. +2 −1 src/library/scala/collection/LinearSeqLike.scala
  86. +2 −1 src/library/scala/collection/LinearSeqOptimized.scala
  87. +2 −1 src/library/scala/collection/Map.scala
  88. +2 −2 src/library/scala/collection/MapLike.scala
  89. +2 −1 src/library/scala/collection/MapProxy.scala
  90. +2 −1 src/library/scala/collection/MapProxyLike.scala
  91. +2 −1 src/library/scala/collection/Parallel.scala
  92. +2 −1 src/library/scala/collection/Parallelizable.scala
  93. +2 −1 src/library/scala/collection/Searching.scala
  94. +2 −1 src/library/scala/collection/Seq.scala
  95. +2 −1 src/library/scala/collection/SeqExtractors.scala
  96. +2 −1 src/library/scala/collection/SeqProxy.scala
  97. +2 −1 src/library/scala/collection/SeqProxyLike.scala
  98. +2 −1 src/library/scala/collection/SeqView.scala
  99. +2 −1 src/library/scala/collection/SeqViewLike.scala
  100. +2 −2 src/library/scala/collection/Set.scala
  101. +2 −2 src/library/scala/collection/SetLike.scala
  102. +2 −1 src/library/scala/collection/SetProxy.scala
  103. +2 −1 src/library/scala/collection/SetProxyLike.scala
  104. +2 −1 src/library/scala/collection/SortedMap.scala
  105. +2 −1 src/library/scala/collection/SortedMapLike.scala
  106. +2 −1 src/library/scala/collection/SortedSet.scala
  107. +2 −1 src/library/scala/collection/SortedSetLike.scala
  108. +2 −1 src/library/scala/collection/Traversable.scala
  109. +2 −1 src/library/scala/collection/TraversableLike.scala
  110. +2 −1 src/library/scala/collection/TraversableOnce.scala
  111. +2 −1 src/library/scala/collection/TraversableProxy.scala
  112. +2 −1 src/library/scala/collection/TraversableProxyLike.scala
  113. +2 −1 src/library/scala/collection/TraversableView.scala
  114. +2 −1 src/library/scala/collection/TraversableViewLike.scala
  115. +2 −1 src/library/scala/collection/concurrent/Map.scala
  116. +5 −4 src/library/scala/collection/concurrent/TrieMap.scala
  117. +2 −1 src/library/scala/collection/convert/DecorateAsJava.scala
  118. +2 −1 src/library/scala/collection/convert/DecorateAsScala.scala
  119. +2 −1 src/library/scala/collection/convert/Decorators.scala
  120. +2 −1 src/library/scala/collection/convert/WrapAsJava.scala
  121. +2 −1 src/library/scala/collection/convert/WrapAsScala.scala
  122. +2 −1 src/library/scala/collection/convert/Wrappers.scala
  123. +2 −1 src/library/scala/collection/convert/package.scala
  124. +2 −1 src/library/scala/collection/generic/BitOperations.scala
  125. +2 −1 src/library/scala/collection/generic/BitSetFactory.scala
  126. +2 −1 src/library/scala/collection/generic/CanBuildFrom.scala
  127. +2 −1 src/library/scala/collection/generic/CanCombineFrom.scala
  128. +2 −1 src/library/scala/collection/generic/ClassTagTraversableFactory.scala
  129. +2 −1 src/library/scala/collection/generic/Clearable.scala
  130. +3 −2 src/library/scala/collection/generic/FilterMonadic.scala
  131. +2 −1 src/library/scala/collection/generic/GenMapFactory.scala
  132. +2 −1 src/library/scala/collection/generic/GenSeqFactory.scala
  133. +2 −1 src/library/scala/collection/generic/GenSetFactory.scala
  134. +2 −1 src/library/scala/collection/generic/GenTraversableFactory.scala
  135. +2 −1 src/library/scala/collection/generic/GenericClassTagCompanion.scala
  136. +2 −1 src/library/scala/collection/generic/GenericClassTagTraversableTemplate.scala
  137. +2 −1 src/library/scala/collection/generic/GenericCompanion.scala
  138. +2 −1 src/library/scala/collection/generic/GenericOrderedCompanion.scala
  139. +2 −1 src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala
  140. +3 −1 src/library/scala/collection/generic/GenericParCompanion.scala
  141. +3 −1 src/library/scala/collection/generic/GenericParTemplate.scala
  142. +2 −1 src/library/scala/collection/generic/GenericSeqCompanion.scala
  143. +2 −1 src/library/scala/collection/generic/GenericSetTemplate.scala
  144. +2 −1 src/library/scala/collection/generic/GenericTraversableTemplate.scala
  145. +5 −4 src/library/scala/collection/generic/Growable.scala
  146. +2 −1 src/library/scala/collection/generic/HasNewBuilder.scala
  147. +3 −1 src/library/scala/collection/generic/HasNewCombiner.scala
  148. +2 −1 src/library/scala/collection/generic/ImmutableMapFactory.scala
  149. +2 −1 src/library/scala/collection/generic/ImmutableSetFactory.scala
  150. +2 −1 src/library/scala/collection/generic/ImmutableSortedMapFactory.scala
  151. +2 −1 src/library/scala/collection/generic/ImmutableSortedSetFactory.scala
  152. +2 −1 src/library/scala/collection/generic/IndexedSeqFactory.scala
  153. +3 −2 src/library/scala/collection/generic/IsSeqLike.scala
  154. +2 −1 src/library/scala/collection/generic/IsTraversableLike.scala
  155. +2 −1 src/library/scala/collection/generic/IsTraversableOnce.scala
  156. +3 −1 src/library/scala/collection/generic/IterableForwarder.scala
  157. +2 −1 src/library/scala/collection/generic/MapFactory.scala
  158. +2 −1 src/library/scala/collection/generic/MutableMapFactory.scala
  159. +2 −1 src/library/scala/collection/generic/MutableSetFactory.scala
  160. +2 −1 src/library/scala/collection/generic/MutableSortedSetFactory.scala
  161. +2 −1 src/library/scala/collection/generic/OrderedTraversableFactory.scala
  162. +3 −1 src/library/scala/collection/generic/ParFactory.scala
  163. +3 −1 src/library/scala/collection/generic/ParMapFactory.scala
  164. +3 −1 src/library/scala/collection/generic/ParSetFactory.scala
  165. +2 −1 src/library/scala/collection/generic/SeqFactory.scala
  166. +3 −1 src/library/scala/collection/generic/SeqForwarder.scala
  167. +2 −1 src/library/scala/collection/generic/SetFactory.scala
  168. +2 −1 src/library/scala/collection/generic/Shrinkable.scala
  169. +3 −1 src/library/scala/collection/generic/Signalling.scala
  170. +3 −1 src/library/scala/collection/generic/Sizing.scala
  171. +2 −1 src/library/scala/collection/generic/SliceInterval.scala
  172. +2 −1 src/library/scala/collection/generic/Sorted.scala
  173. +2 −1 src/library/scala/collection/generic/SortedMapFactory.scala
  174. +2 −1 src/library/scala/collection/generic/SortedSetFactory.scala
  175. +2 −1 src/library/scala/collection/generic/Subtractable.scala
  176. +2 −1 src/library/scala/collection/generic/TraversableFactory.scala
  177. +3 −1 src/library/scala/collection/generic/TraversableForwarder.scala
  178. +2 −1 src/library/scala/collection/generic/package.scala
  179. +2 −1 src/library/scala/collection/immutable/BitSet.scala
  180. +2 −1 src/library/scala/collection/immutable/DefaultMap.scala
  181. +2 −1 src/library/scala/collection/immutable/IndexedSeq.scala
  182. +2 −1 src/library/scala/collection/immutable/Iterable.scala
  183. +2 −1 src/library/scala/collection/immutable/LinearSeq.scala
  184. +2 −1 src/library/scala/collection/immutable/List.scala
  185. +2 −1 src/library/scala/collection/immutable/ListMap.scala
  186. +2 −1 src/library/scala/collection/immutable/ListSet.scala
  187. +2 −1 src/library/scala/collection/immutable/Map.scala
  188. +2 −1 src/library/scala/collection/immutable/MapLike.scala
  189. +2 −1 src/library/scala/collection/immutable/MapProxy.scala
  190. +2 −1 src/library/scala/collection/immutable/NumericRange.scala
  191. +2 −1 src/library/scala/collection/immutable/PagedSeq.scala
  192. +2 −1 src/library/scala/collection/immutable/Queue.scala
  193. +2 −1 src/library/scala/collection/immutable/Range.scala
  194. +2 −1 src/library/scala/collection/immutable/Seq.scala
  195. +2 −1 src/library/scala/collection/immutable/Set.scala
  196. +2 −1 src/library/scala/collection/immutable/SetProxy.scala
  197. +2 −1 src/library/scala/collection/immutable/SortedMap.scala
  198. +2 −1 src/library/scala/collection/immutable/SortedSet.scala
  199. +2 −1 src/library/scala/collection/immutable/Stack.scala
  200. +2 −1 src/library/scala/collection/immutable/Stream.scala
  201. +2 −1 src/library/scala/collection/immutable/StreamView.scala
  202. +2 −1 src/library/scala/collection/immutable/StreamViewLike.scala
  203. +2 −1 src/library/scala/collection/immutable/StringLike.scala
  204. +2 −1 src/library/scala/collection/immutable/StringOps.scala
  205. +2 −1 src/library/scala/collection/immutable/Traversable.scala
  206. +2 −1 src/library/scala/collection/immutable/TreeMap.scala
  207. +2 −1 src/library/scala/collection/immutable/TreeSet.scala
  208. +2 −1 src/library/scala/collection/immutable/TrieIterator.scala
  209. +2 −1 src/library/scala/collection/immutable/WrappedString.scala
  210. +0 −1 src/library/scala/collection/mutable/AVLTree.scala
  211. +2 −1 src/library/scala/collection/mutable/ArrayBuffer.scala
  212. +2 −1 src/library/scala/collection/mutable/ArrayBuilder.scala
  213. +2 −1 src/library/scala/collection/mutable/ArrayLike.scala
  214. +2 −1 src/library/scala/collection/mutable/ArraySeq.scala
  215. +2 −1 src/library/scala/collection/mutable/BitSet.scala
  216. +2 −1 src/library/scala/collection/mutable/Buffer.scala
  217. +2 −1 src/library/scala/collection/mutable/BufferLike.scala
  218. +2 −1 src/library/scala/collection/mutable/BufferProxy.scala
  219. +2 −1 src/library/scala/collection/mutable/Cloneable.scala
  220. +2 −1 src/library/scala/collection/mutable/DefaultEntry.scala
  221. +2 −1 src/library/scala/collection/mutable/DefaultMapModel.scala
  222. +2 −1 src/library/scala/collection/mutable/DoubleLinkedList.scala
  223. +2 −1 src/library/scala/collection/mutable/DoubleLinkedListLike.scala
  224. +2 −3 src/library/scala/collection/mutable/FlatHashTable.scala
  225. +2 −1 src/library/scala/collection/mutable/GrowingBuilder.scala
  226. +2 −1 src/library/scala/collection/mutable/HashEntry.scala
  227. +2 −1 src/library/scala/collection/mutable/HashMap.scala
  228. +2 −1 src/library/scala/collection/mutable/HashSet.scala
  229. +2 −1 src/library/scala/collection/mutable/HashTable.scala
  230. +2 −1 src/library/scala/collection/mutable/History.scala
  231. +2 −1 src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
  232. +2 −1 src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
  233. +2 −1 src/library/scala/collection/mutable/IndexedSeq.scala
  234. +2 −1 src/library/scala/collection/mutable/IndexedSeqLike.scala
  235. +2 −1 src/library/scala/collection/mutable/IndexedSeqOptimized.scala
  236. +2 −1 src/library/scala/collection/mutable/IndexedSeqView.scala
  237. +2 −1 src/library/scala/collection/mutable/Iterable.scala
  238. +2 −1 src/library/scala/collection/mutable/LazyBuilder.scala
  239. +2 −1 src/library/scala/collection/mutable/LinearSeq.scala
  240. +2 −1 src/library/scala/collection/mutable/LinkedEntry.scala
  241. +2 −1 src/library/scala/collection/mutable/LinkedHashMap.scala
  242. +2 −1 src/library/scala/collection/mutable/LinkedHashSet.scala
  243. +2 −1 src/library/scala/collection/mutable/LinkedList.scala
  244. +2 −1 src/library/scala/collection/mutable/LinkedListLike.scala
  245. +3 −2 src/library/scala/collection/mutable/ListBuffer.scala
  246. +2 −1 src/library/scala/collection/mutable/ListMap.scala
  247. +2 −1 src/library/scala/collection/mutable/Map.scala
  248. +2 −1 src/library/scala/collection/mutable/MapBuilder.scala
  249. +3 −2 src/library/scala/collection/mutable/MapLike.scala
  250. +2 −1 src/library/scala/collection/mutable/MapProxy.scala
  251. +2 −1 src/library/scala/collection/mutable/MultiMap.scala
  252. +2 −1 src/library/scala/collection/mutable/MutableList.scala
  253. +2 −1 src/library/scala/collection/mutable/ObservableBuffer.scala
  254. +2 −1 src/library/scala/collection/mutable/ObservableMap.scala
  255. +2 −1 src/library/scala/collection/mutable/ObservableSet.scala
  256. +2 −3 src/library/scala/collection/mutable/PriorityQueue.scala
  257. +2 −1 src/library/scala/collection/mutable/PriorityQueueProxy.scala
  258. +2 −1 src/library/scala/collection/mutable/Publisher.scala
  259. +2 −1 src/library/scala/collection/mutable/Queue.scala
  260. +2 −1 src/library/scala/collection/mutable/QueueProxy.scala
  261. +2 −1 src/library/scala/collection/mutable/RevertibleHistory.scala
  262. +2 −1 src/library/scala/collection/mutable/Seq.scala
  263. +2 −1 src/library/scala/collection/mutable/SeqLike.scala
  264. +2 −1 src/library/scala/collection/mutable/Set.scala
  265. +2 −1 src/library/scala/collection/mutable/SetBuilder.scala
  266. +2 −1 src/library/scala/collection/mutable/SetLike.scala
  267. +2 −1 src/library/scala/collection/mutable/SetProxy.scala
  268. +2 −1 src/library/scala/collection/mutable/SortedSet.scala
  269. +2 −1 src/library/scala/collection/mutable/Stack.scala
  270. +2 −1 src/library/scala/collection/mutable/StackProxy.scala
  271. +2 −1 src/library/scala/collection/mutable/StringBuilder.scala
  272. +2 −1 src/library/scala/collection/mutable/Subscriber.scala
  273. +2 −1 src/library/scala/collection/mutable/SynchronizedBuffer.scala
  274. +2 −3 src/library/scala/collection/mutable/SynchronizedMap.scala
  275. +2 −1 src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
  276. +2 −1 src/library/scala/collection/mutable/SynchronizedQueue.scala
  277. +2 −1 src/library/scala/collection/mutable/SynchronizedSet.scala
  278. +2 −1 src/library/scala/collection/mutable/SynchronizedStack.scala
  279. +2 −1 src/library/scala/collection/mutable/Traversable.scala
  280. +2 −1 src/library/scala/collection/mutable/TreeSet.scala
  281. +2 −1 src/library/scala/collection/mutable/Undoable.scala
  282. +2 −1 src/library/scala/collection/mutable/UnrolledBuffer.scala
  283. +2 −1 src/library/scala/collection/mutable/WeakHashMap.scala
  284. +2 −1 src/library/scala/collection/mutable/WrappedArray.scala
  285. +2 −1 src/library/scala/collection/mutable/WrappedArrayBuilder.scala
  286. +8 −7 src/library/scala/collection/parallel/Combiner.scala
  287. +2 −1 src/library/scala/collection/parallel/ParIterable.scala
  288. +2 −5 src/library/scala/collection/parallel/ParIterableLike.scala
  289. +2 −1 src/library/scala/collection/parallel/ParIterableView.scala
  290. +2 −1 src/library/scala/collection/parallel/ParIterableViewLike.scala
  291. +2 −1 src/library/scala/collection/parallel/ParMap.scala
  292. +2 −1 src/library/scala/collection/parallel/ParMapLike.scala
  293. +2 −27 src/library/scala/collection/parallel/ParSeq.scala
  294. +2 −1 src/library/scala/collection/parallel/ParSeqLike.scala
  295. +2 −1 src/library/scala/collection/parallel/ParSeqView.scala
  296. +2 −1 src/library/scala/collection/parallel/ParSeqViewLike.scala
  297. +6 −44 src/library/scala/collection/parallel/ParSet.scala
  298. +2 −1 src/library/scala/collection/parallel/ParSetLike.scala
  299. +2 −1 src/library/scala/collection/parallel/PreciseSplitter.scala
  300. +2 −43 src/library/scala/collection/parallel/RemainsIterator.scala
Sorry, we could not display the entire diff because too many files (667) changed.
View
3 src/compiler/scala/reflect/reify/package.scala
@@ -1,4 +1,5 @@
-package scala.reflect
+package scala
+package reflect
import scala.reflect.macros.ReificationException
import scala.tools.nsc.Global
View
2 src/compiler/scala/reflect/reify/utils/Extractors.scala
@@ -11,7 +11,7 @@ trait Extractors {
// Example of a reified tree for `reify(List(1, 2))`:
// (also contains an example of a reified type as a third argument to the constructor of Expr)
// {
- // val $u: reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe;
+ // val $u: scala.reflect.runtime.universe.type = scala.reflect.runtime.`package`.universe;
// val $m: $u.Mirror = $u.runtimeMirror(Test.this.getClass().getClassLoader());
// $u.Expr[List[Int]]($m, {
// final class $treecreator1 extends scala.reflect.api.TreeCreator {
View
3 src/compiler/scala/tools/ant/Same.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.tools.ant
+package scala
+package tools.ant
import java.io.{File, FileInputStream}
View
3 src/compiler/scala/tools/ant/sabbus/Break.scala
@@ -7,7 +7,8 @@
\* */
-package scala.tools.ant.sabbus
+package scala
+package tools.ant.sabbus
import org.apache.tools.ant.Task
View
3 src/compiler/scala/tools/ant/sabbus/Make.scala
@@ -7,7 +7,8 @@
\* */
-package scala.tools.ant.sabbus
+package scala
+package tools.ant.sabbus
import java.io.File
import org.apache.tools.ant.Task
View
3 src/compiler/scala/tools/ant/sabbus/ScalacFork.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.tools.ant
+package scala
+package tools.ant
package sabbus
import java.io.{ File, FileWriter }
View
3 src/compiler/scala/tools/ant/sabbus/Use.scala
@@ -7,7 +7,8 @@
\* */
-package scala.tools.ant
+package scala
+package tools.ant
package sabbus
import java.io.File
View
3 src/compiler/scala/tools/cmd/Demo.scala
@@ -3,7 +3,8 @@
* @author Paul Phillips
*/
-package scala.tools
+package scala
+package tools
package cmd
/** A sample command specification for illustrative purposes.
View
3 src/compiler/scala/tools/cmd/Interpolation.scala
@@ -3,7 +3,8 @@
* @author Paul Phillips
*/
-package scala.tools
+package scala
+package tools
package cmd
/** Interpolation logic for generated files. The idea is to be
View
3 src/compiler/scala/tools/cmd/package.scala
@@ -3,7 +3,8 @@
* @author Paul Phillips
*/
-package scala.tools
+package scala
+package tools
package object cmd {
def returning[T](x: T)(f: T => Unit): T = { f(x) ; x }
View
5 src/compiler/scala/tools/nsc/CompileClient.scala
@@ -3,11 +3,12 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
import settings.FscSettings
import scala.tools.util.CompileOutputCommon
-import sys.SystemProperties.preferIPv4Stack
+import scala.sys.SystemProperties.preferIPv4Stack
/** The client part of the fsc offline compiler. Instead of compiling
* things itself, it send requests to a CompileServer.
View
3 src/compiler/scala/tools/nsc/Driver.scala
@@ -1,4 +1,5 @@
-package scala.tools.nsc
+package scala
+package tools.nsc
import scala.tools.nsc.reporters.ConsoleReporter
import Properties.{ versionString, copyrightString, residentPromptString }
View
4 src/compiler/scala/tools/nsc/Global.scala
@@ -3,7 +3,9 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools
+package nsc
import java.io.{ File, FileOutputStream, PrintWriter, IOException, FileNotFoundException }
import java.nio.charset.{ Charset, CharsetDecoder, IllegalCharsetNameException, UnsupportedCharsetException }
View
3 src/compiler/scala/tools/nsc/MainTokenMetric.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
import scala.tools.nsc.reporters.ConsoleReporter
View
3 src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
import io.{ Directory, File, Path }
import java.io.IOException
View
2 src/compiler/scala/tools/nsc/ast/Printers.scala
@@ -42,7 +42,7 @@ trait Printers extends scala.reflect.internal.Printers { this: Global =>
}
}
- // overflow cases missing from TreePrinter in reflect.api
+ // overflow cases missing from TreePrinter in scala.reflect.api
override def xprintTree(treePrinter: super.TreePrinter, tree: Tree) = tree match {
case DocDef(comment, definition) =>
treePrinter.print(comment.raw)
View
3 src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package ast
import java.awt.{List => awtList, _}
View
2 src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
@@ -696,7 +696,7 @@ trait Scanners extends ScannersCommon {
}
}
- @annotation.tailrec private def getStringPart(multiLine: Boolean): Unit = {
+ @scala.annotation.tailrec private def getStringPart(multiLine: Boolean): Unit = {
def finishStringPart() = {
setStrVal()
token = STRINGPART
View
3 src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend
import scala.collection.{ mutable, immutable }
View
3 src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -4,7 +4,8 @@
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend
package icode
View
3 src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
@@ -4,7 +4,8 @@
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend
package icode
View
5 src/compiler/scala/tools/nsc/backend/icode/Members.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend
package icode
@@ -73,7 +74,7 @@ trait Members {
)
startBlock = b.successors.head
}
-
+
blocks -= b
assert(!blocks.contains(b))
method.exh filter (_ covers b) foreach (_.covered -= b)
View
7 src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend
package icode
@@ -394,14 +395,14 @@ trait Opcodes { self: ICodes =>
override def category = mthdsCat
}
-
+
/**
* A place holder entry that allows us to parse class files with invoke dynamic
* instructions. Because the compiler doesn't yet really understand the
* behavior of invokeDynamic, this op acts as a poison pill. Any attempt to analyze
* this instruction will cause a failure. The only optimization that
* should ever look at non-Scala generated icode is the inliner, and it
- * has been modified to not examine any method with invokeDynamic
+ * has been modified to not examine any method with invokeDynamic
* instructions. So if this poison pill ever causes problems then
* there's been a serious misunderstanding
*/
View
3 src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend.icode.analysis
import scala.collection.{ mutable, immutable }
View
3 src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala
@@ -4,7 +4,8 @@
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend.icode.analysis
import scala.collection.{ mutable, immutable }
View
3 src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend.icode.analysis
import scala.collection.{mutable, immutable}
View
3 src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend.jvm
import scala.collection.{ mutable, immutable }
View
3 src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala
@@ -3,7 +3,8 @@
* @author James Iry
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package backend.opt
import scala.tools.nsc.backend.icode.analysis.LubException
View
3 src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package reporters
import java.io.{ BufferedReader, IOException, PrintWriter }
View
3 src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
@@ -3,7 +3,8 @@
* @author Paul Phillips
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package settings
trait AbsScalaSettings {
View
3 src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -4,7 +4,8 @@
*/
// $Id$
-package scala.tools
+package scala
+package tools
package nsc
package settings
View
51 src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
@@ -4,7 +4,8 @@
*/
// $Id$
-package scala.tools.nsc.settings
+package scala
+package tools.nsc.settings
/**
* Represents a single Scala version in a manner that
@@ -19,7 +20,7 @@ abstract class ScalaVersion extends Ordered[ScalaVersion] {
*/
case object NoScalaVersion extends ScalaVersion {
def unparse = "none"
-
+
def compare(that: ScalaVersion): Int = that match {
case NoScalaVersion => 0
case _ => 1
@@ -33,7 +34,7 @@ case object NoScalaVersion extends ScalaVersion {
* to segregate builds
*/
case class SpecificScalaVersion(major: Int, minor: Int, rev: Int, build: ScalaBuild) extends ScalaVersion {
- def unparse = s"${major}.${minor}.${rev}.${build.unparse}"
+ def unparse = s"${major}.${minor}.${rev}.${build.unparse}"
def compare(that: ScalaVersion): Int = that match {
case SpecificScalaVersion(thatMajor, thatMinor, thatRev, thatBuild) =>
@@ -48,15 +49,15 @@ case class SpecificScalaVersion(major: Int, minor: Int, rev: Int, build: ScalaBu
else build compare thatBuild
case AnyScalaVersion => 1
case NoScalaVersion => -1
- }
+ }
}
/**
* A Scala version that sorts lower than all actual versions
*/
case object AnyScalaVersion extends ScalaVersion {
def unparse = "any"
-
+
def compare(that: ScalaVersion): Int = that match {
case AnyScalaVersion => 0
case _ => -1
@@ -70,7 +71,7 @@ object ScalaVersion {
private val dot = "\\."
private val dash = "\\-"
private def not(s:String) = s"[^${s}]"
- private val R = s"((${not(dot)}*)(${dot}(${not(dot)}*)(${dot}(${not(dash)}*)(${dash}(.*))?)?)?)".r
+ private val R = s"((${not(dot)}*)(${dot}(${not(dot)}*)(${dot}(${not(dash)}*)(${dash}(.*))?)?)?)".r
def apply(versionString : String, errorHandler: String => Unit): ScalaVersion = {
def errorAndValue() = {
@@ -82,41 +83,41 @@ object ScalaVersion {
)
AnyScalaVersion
}
-
+
def toInt(s: String) = s match {
case null | "" => 0
case _ => s.toInt
}
-
+
def isInt(s: String) = util.Try(toInt(s)).isSuccess
-
+
def toBuild(s: String) = s match {
case null | "FINAL" => Final
case s if (s.toUpperCase.startsWith("RC") && isInt(s.substring(2))) => RC(toInt(s.substring(2)))
case s if (s.toUpperCase.startsWith("M") && isInt(s.substring(1))) => Milestone(toInt(s.substring(1)))
case _ => Development(s)
}
-
+
try versionString match {
case "none" => NoScalaVersion
case "any" => AnyScalaVersion
- case R(_, majorS, _, minorS, _, revS, _, buildS) =>
+ case R(_, majorS, _, minorS, _, revS, _, buildS) =>
SpecificScalaVersion(toInt(majorS), toInt(minorS), toInt(revS), toBuild(buildS))
- case _ =>
+ case _ =>
errorAndValue()
} catch {
case e: NumberFormatException => errorAndValue()
}
}
-
- def apply(versionString: String): ScalaVersion =
+
+ def apply(versionString: String): ScalaVersion =
apply(versionString, msg => throw new NumberFormatException(msg))
-
+
/**
* The version of the compiler running now
*/
val current = apply(util.Properties.versionNumberString)
-
+
/**
* The 2.8.0 version.
*/
@@ -126,7 +127,7 @@ object ScalaVersion {
/**
* Represents the data after the dash in major.minor.rev-build
*/
-abstract class ScalaBuild extends Ordered[ScalaBuild] {
+abstract class ScalaBuild extends Ordered[ScalaBuild] {
/**
* Return a version of this build information that can be parsed back into the
* same ScalaBuild
@@ -138,7 +139,7 @@ abstract class ScalaBuild extends Ordered[ScalaBuild] {
*/
case class Development(id: String) extends ScalaBuild {
def unparse = s"-${id}"
-
+
def compare(that: ScalaBuild) = that match {
// sorting two development builds based on id is reasonably valid for two versions created with the same schema
// otherwise it's not correct, but since it's impossible to put a total ordering on development build versions
@@ -154,7 +155,7 @@ case class Development(id: String) extends ScalaBuild {
*/
case object Final extends ScalaBuild {
def unparse = ""
-
+
def compare(that: ScalaBuild) = that match {
case Final => 0
// a final is newer than anything other than a development build or another final
@@ -168,27 +169,27 @@ case object Final extends ScalaBuild {
*/
case class RC(n: Int) extends ScalaBuild {
def unparse = s"-RC${n}"
-
+
def compare(that: ScalaBuild) = that match {
// compare two rcs based on their RC numbers
case RC(thatN) => n - thatN
// an rc is older than anything other than a milestone or another rc
case Milestone(_) => 1
- case _ => -1
- }
+ case _ => -1
+ }
}
/**
* An intermediate release
*/
case class Milestone(n: Int) extends ScalaBuild {
def unparse = s"-M${n}"
-
+
def compare(that: ScalaBuild) = that match {
// compare two milestones based on their milestone numbers
case Milestone(thatN) => n - thatN
// a milestone is older than anything other than another milestone
case _ => -1
-
- }
+
+ }
}
View
3 src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package symtab
package classfile
View
3 src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
@@ -3,7 +3,8 @@
* @author Iulian Dragos
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package symtab
package classfile
View
3 src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package transform
import symtab._
View
3 src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -3,7 +3,8 @@
* @author Iulian Dragos
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package transform
import scala.tools.nsc.symtab.Flags
View
3 src/compiler/scala/tools/nsc/transform/TailCalls.scala
@@ -3,7 +3,8 @@
* @author Iulian Dragos
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package transform
import symtab.Flags
View
3 src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -3,7 +3,8 @@
* @author
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package transform
import symtab.Flags._
View
3 src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
@@ -4,7 +4,8 @@
* @author Adriaan Moors
*/
-package scala.tools.nsc.transform.patmat
+package scala
+package tools.nsc.transform.patmat
import scala.language.postfixOps
import scala.collection.mutable
View
3 src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package typechecker
import java.lang.ArithmeticException
View
11 src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -8,7 +8,8 @@
//todo: disallow C#D in superclass
//todo: treat :::= correctly
-package scala.tools.nsc
+package scala
+package tools.nsc
package typechecker
import scala.annotation.tailrec
@@ -167,7 +168,7 @@ trait Implicits {
override def isFailure = true
override def isDivergent = true
}
-
+
lazy val AmbiguousSearchFailure = new SearchResult(EmptyTree, EmptyTreeTypeSubstituter) {
override def isFailure = true
override def isAmbiguousFailure = true
@@ -799,16 +800,16 @@ trait Implicits {
// Initially null, will be saved on first diverging expansion.
private var implicitSym: Symbol = _
private var countdown: Int = 1
-
+
def sym: Symbol = implicitSym
- def apply(search: SearchResult, i: ImplicitInfo): SearchResult =
+ def apply(search: SearchResult, i: ImplicitInfo): SearchResult =
if (search.isDivergent && countdown > 0) {
countdown -= 1
implicitSym = i.sym
log("discarding divergent implicit ${implicitSym} during implicit search")
SearchFailure
} else search
- }
+ }
/** Sorted list of eligible implicits.
*/
View
3 src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -4,7 +4,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package typechecker
import scala.collection.{ mutable, immutable }
View
3 src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -9,7 +9,8 @@
// Added: Thu Apr 12 18:23:58 2007
//todo: disallow C#D in superclass
//todo: treat :::= correctly
-package scala.tools.nsc
+package scala
+package tools.nsc
package typechecker
import scala.collection.mutable
View
3 src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package util
import scala.reflect.internal.Chars._
View
3 src/compiler/scala/tools/nsc/util/ShowPickled.scala
@@ -3,7 +3,8 @@
* @author Martin Odersky
*/
-package scala.tools
+package scala
+package tools
package nsc
package util
View
4 src/compiler/scala/tools/nsc/util/package.scala
@@ -3,7 +3,9 @@
* @author Paul Phillips
*/
-package scala.tools.nsc
+package scala
+package tools
+package nsc
import java.io.{ OutputStream, PrintStream, ByteArrayOutputStream, PrintWriter, StringWriter }
View
3 src/compiler/scala/tools/reflect/ToolBoxFactory.scala
@@ -1,4 +1,5 @@
-package scala.tools
+package scala
+package tools
package reflect
import scala.tools.nsc.EXPRmode
View
9 src/compiler/scala/tools/util/PathResolver.scala
@@ -3,13 +3,14 @@
* @author Paul Phillips
*/
-package scala.tools
+package scala
+package tools
package util
import scala.tools.reflect.WrappedProperties.AccessControl
-import nsc.{ Settings, GenericRunnerSettings }
-import nsc.util.{ ClassPath, JavaClassPath, ScalaClassLoader }
-import nsc.io.{ File, Directory, Path, AbstractFile }
+import scala.tools.nsc.{ Settings, GenericRunnerSettings }
+import scala.tools.nsc.util.{ ClassPath, JavaClassPath, ScalaClassLoader }
+import scala.tools.nsc.io.{ File, Directory, Path, AbstractFile }
import ClassPath.{ JavaContext, DefaultJavaContext, join, split }
import PartialFunction.condOpt
import scala.language.postfixOps
View
3 src/compiler/scala/tools/util/SocketServer.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.tools.util
+package scala
+package tools.util
import java.net.{ ServerSocket, SocketException, SocketTimeoutException }
import java.io.{ PrintWriter, BufferedReader }
View
3 src/interactive/scala/tools/nsc/interactive/REPL.scala
@@ -2,7 +2,8 @@
* Copyright 2009-2013 Typesafe/Scala Solutions and LAMP/EPFL
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package interactive
import scala.reflect.internal.util._
View
3 src/interactive/scala/tools/nsc/interactive/ScratchPadMaker.scala
@@ -1,4 +1,5 @@
-package scala.tools.nsc
+package scala
+package tools.nsc
package interactive
import scala.reflect.internal.util.{SourceFile, BatchSourceFile, RangePosition}
View
3 src/interactive/scala/tools/nsc/interactive/tests/Tester.scala
@@ -2,7 +2,8 @@
* Copyright 2009-2013 Typesafe/Scala Solutions and LAMP/EPFL
* @author Martin Odersky
*/
-package scala.tools.nsc
+package scala
+package tools.nsc
package interactive
package tests
View
3 src/library/scala/collection/BitSet.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/BitSetLike.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import BitSetLike._
import mutable.StringBuilder
View
3 src/library/scala/collection/BufferedIterator.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
/** Buffered iterators are iterators which provide a method `head`
* that inspects the next element without discarding it.
View
3 src/library/scala/collection/CustomParallelizable.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import parallel.Combiner
View
3 src/library/scala/collection/DefaultMap.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
/** A default map which implements the `+` and `-` methods of maps.
*
View
3 src/library/scala/collection/GenIterable.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenIterableLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic.{ CanBuildFrom => CBF }
View
3 src/library/scala/collection/GenIterableView.scala
@@ -6,6 +6,7 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
trait GenIterableView[+A, +Coll] extends GenIterableViewLike[A, Coll, GenIterableView[A, Coll]] { }
View
3 src/library/scala/collection/GenIterableViewLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
trait GenIterableViewLike[+A,
+Coll,
View
3 src/library/scala/collection/GenMap.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenMapLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
/** A trait for all maps upon which operations may be
* implemented in parallel.
View
3 src/library/scala/collection/GenSeq.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenSeqLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenSeqView.scala
@@ -6,6 +6,7 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
trait GenSeqView[+A, +Coll] extends GenSeqViewLike[A, Coll, GenSeqView[A, Coll]] { }
View
3 src/library/scala/collection/GenSeqViewLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
View
3 src/library/scala/collection/GenSet.scala
@@ -7,7 +7,8 @@
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenSetLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
/** A template trait for sets which may possibly
View
3 src/library/scala/collection/GenTraversable.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenTraversableLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/GenTraversableOnce.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import scala.reflect.ClassTag
import scala.collection.generic.CanBuildFrom
View
3 src/library/scala/collection/GenTraversableView.scala
@@ -6,6 +6,7 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
trait GenTraversableView[+A, +Coll] extends GenTraversableViewLike[A, Coll, GenTraversableView[A, Coll]] { }
View
3 src/library/scala/collection/GenTraversableViewLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
View
3 src/library/scala/collection/IndexedSeq.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import generic._
import mutable.Builder
View
3 src/library/scala/collection/IndexedSeqLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
import mutable.ArrayBuffer
import scala.annotation.tailrec
View
3 src/library/scala/collection/Iterable.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import generic._
import mutable.Builder
View
3 src/library/scala/collection/IterableProxy.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala
+package collection
/** This trait implements a proxy for iterable objects. It forwards all calls
* to a different iterable object.
View
3 src/library/scala/collection/IterableProxyLike.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import generic._
import mutable.Buffer
View
3 src/library/scala/collection/IterableView.scala
@@ -8,7 +8,8 @@
-package scala.collection
+package scala
+package collection
import generic._
import TraversableView.NoBuilder
View
3 src/library/scala/collection/IterableViewLike.scala
@@ -6,7 +6,8 @@
** |/ **
\* */
-package scala.collection
+package scala