diff options
author | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
commit | 40707e0f49eb991ba1cbc07bdb1bcf65a640006b (patch) | |
tree | 00b6b70e32b941f9aa4502a91ad07fd0fc807e3d /src/scalap | |
parent | 8a78d3748319811d7b0adc80d4ee8926dc8d90bf (diff) | |
download | scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.gz scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.bz2 scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.zip |
switch to unnested packages.
Diffstat (limited to 'src/scalap')
18 files changed, 63 insertions, 22 deletions
diff --git a/src/scalap/scala/tools/scalap/Properties.scala b/src/scalap/scala/tools/scalap/Properties.scala index 05452c448e..5329c0398b 100644 --- a/src/scalap/scala/tools/scalap/Properties.scala +++ b/src/scalap/scala/tools/scalap/Properties.scala @@ -14,5 +14,5 @@ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "decoder" protected def pickJarBasedOn = classOf[Classfile] - val cmdName = nsc.Properties.cmdName -}
\ No newline at end of file + val cmdName = scala.tools.nsc.Properties.cmdName +} diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala b/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala index 2bc2cf5380..f8761ca0ed 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala @@ -1,4 +1,6 @@ -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Arrows extends UnitFunctors { type Arr[-A, +B] <: Arrow[A, B] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala index b9de5c71da..aa95b48d44 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Functor[+A] { type M[+A] <: Functor[A] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala index c01f1d88c9..370eb0d054 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Input[+A] extends Iterable[A] { diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala b/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala index 0bcae2bded..1324ea695a 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules import scala.collection.mutable.HashMap diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala b/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala index 1b03b5d3fa..639c414675 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Monad[+A] extends Functor[A] { type M[+A] <: Monad[A] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Result.scala b/src/scalap/scala/tools/scalap/scalax/rules/Result.scala index cb8ec4b290..6befbb83c8 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Result.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Result.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules; +package scala.tools.scalap +package scalax +package rules; /** Represents the combined value of two rules applied in sequence. * diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala index f540d9ad8d..1500b81050 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules /** A Rule is a function from some input to a Result. The result may be: * <ul> diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala index fa6f959384..4e8ddc8dbe 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Name { def name : String diff --git a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala index d32300f832..6b36721c50 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules /** * A workaround for the difficulties of dealing with diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala index 5b90cf9e58..182054c01b 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import java.io.IOException diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala index c567cdf715..8027f0c4c1 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig trait Flags { def hasFlag(flag : Long) : Boolean diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala index ad29ac0701..146fc5ce05 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig object ScalaSigParser { @@ -320,4 +323,4 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules { * ConstAnnotArg = Constant | AnnotInfo | AnnotArgArray * * len is remaining length after `len'. - */
\ No newline at end of file + */ diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala index f3e395ae75..7177f1c3a4 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -7,7 +7,10 @@ // $Id$ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import java.io.{PrintStream, ByteArrayOutputStream} import java.util.regex.Pattern diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala index f02ca870b0..fc5a75c046 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig /** * @author ilyas diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala index f8c5e88db1..47fb39ae0f 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import ScalaSigEntryParsers._ diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala index f6986b28b7..e224525d06 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig abstract class Type @@ -19,4 +22,4 @@ case class ImplicitMethodType(resultType : Type, paramSymbols : Seq[Symbol]) ext case class AnnotatedType(typeRef : Type, attribTreeRefs : List[Int]) extends Type case class AnnotatedWithSelfType(typeRef : Type, symbol : Symbol, attribTreeRefs : List[Int]) extends Type case class DeBruijnIndexType(typeLevel : Int, typeIndex : Int) extends Type -case class ExistentialType(typeRef : Type, symbols : Seq[Symbol]) extends Type
\ No newline at end of file +case class ExistentialType(typeRef : Type, symbols : Seq[Symbol]) extends Type diff --git a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala index 7986763b7b..6077eded0f 100644 --- a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala +++ b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala @@ -1,4 +1,6 @@ -package scala.tools.scalap.scalax.util +package scala.tools.scalap +package scalax +package util import java.beans.Introspector @@ -14,4 +16,4 @@ object StringUtil { def cutSubstring(dom: String)(s: String) = if (dom != null && s != null) dom.replace(s, "") else dom -}
\ No newline at end of file +} |