diff options
-rw-r--r-- | src/library/scala/xml/dtd/ContentModel.scala | 3 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/DocType.scala | 6 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/ElementValidator.scala | 6 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/ExternalID.scala | 3 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/Base.scala (renamed from src/library/scala/util/regexp/Base.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/BaseBerrySethi.scala (renamed from src/library/scala/util/automata/BaseBerrySethi.scala) | 5 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/DetWordAutom.scala (renamed from src/library/scala/util/automata/DetWordAutom.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/Inclusion.scala (renamed from src/library/scala/util/automata/Inclusion.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/NondetWordAutom.scala (renamed from src/library/scala/util/automata/NondetWordAutom.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/PointedHedgeExp.scala (renamed from src/library/scala/util/regexp/PointedHedgeExp.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/SubsetConstruction.scala (renamed from src/library/scala/util/automata/SubsetConstruction.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/SyntaxError.scala (renamed from src/library/scala/util/regexp/SyntaxError.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/WordBerrySethi.scala (renamed from src/library/scala/util/automata/WordBerrySethi.scala) | 5 | ||||
-rw-r--r-- | src/library/scala/xml/dtd/impl/WordExp.scala (renamed from src/library/scala/util/regexp/WordExp.scala) | 4 | ||||
-rw-r--r-- | test/files/pos/t0422.scala | 3 | ||||
-rw-r--r-- | test/files/pos/t2698.scala | 3 | ||||
-rw-r--r-- | test/files/pos/t422.scala | 17 |
17 files changed, 31 insertions, 52 deletions
diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index abc71f55bd..debdf37975 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -11,8 +11,7 @@ package scala.xml package dtd -import scala.util.regexp.WordExp -import scala.util.automata._ +import scala.xml.dtd.impl._ import scala.xml.Utility.sbToString import PartialFunction._ diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index ce067bee79..b2510baa18 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -18,8 +18,7 @@ package dtd * @param extID NoExternalID or the external ID of this doctype * @param intSubset sequence of internal subset declarations */ -case class DocType(name: String, extID: ExternalID, intSubset: Seq[dtd.Decl]) -{ +case class DocType(name: String, extID: ExternalID, intSubset: Seq[dtd.Decl]) { if (!Utility.isName(name)) throw new IllegalArgumentException(name+" must be an XML Name") @@ -33,8 +32,7 @@ case class DocType(name: String, extID: ExternalID, intSubset: Seq[dtd.Decl]) } } -object DocType -{ +object DocType { /** Creates a doctype with no external id, nor internal subset declarations. */ def apply(name: String): DocType = apply(name, NoExternalID, Nil) } diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 66951bf390..e73e209daa 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -12,10 +12,12 @@ package scala.xml package dtd import PartialFunction._ +import scala.collection.mutable + import ContentModel.ElemName import MakeValidationException._ // @todo other exceptions -import scala.util.automata._ -import scala.collection.mutable + +import impl._ /** validate children and/or attributes of an element * exceptions are created but not thrown. diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index e346f89d0a..80ada0caaa 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -14,8 +14,7 @@ package dtd * * @author Burak Emir */ -abstract class ExternalID extends parsing.TokenTests -{ +abstract class ExternalID extends parsing.TokenTests { def quoted(s: String) = { val c = if (s contains '"') '\'' else '"' c + s + c diff --git a/src/library/scala/util/regexp/Base.scala b/src/library/scala/xml/dtd/impl/Base.scala index 7dbe60a34e..dd277779f6 100644 --- a/src/library/scala/util/regexp/Base.scala +++ b/src/library/scala/xml/dtd/impl/Base.scala @@ -8,7 +8,7 @@ -package scala.util.regexp +package scala.xml.dtd.impl /** Basic regular expressions. * @@ -17,7 +17,7 @@ package scala.util.regexp */ @deprecated("This class will be removed", "2.10.0") -abstract class Base { +private[dtd] abstract class Base { type _regexpT <: RegExp abstract class RegExp { diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala index 3f6f4507a9..99d5ab62e1 100644 --- a/src/library/scala/util/automata/BaseBerrySethi.scala +++ b/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala @@ -6,9 +6,8 @@ ** |/ ** \* */ -package scala.util.automata +package scala.xml.dtd.impl -import scala.util.regexp.{ Base } import scala.collection.{ mutable, immutable } // todo: replace global variable pos with acc @@ -18,7 +17,7 @@ import scala.collection.{ mutable, immutable } * position automata construction (also called ''Berry-Sethi'' or ''Glushkov''). */ @deprecated("This class will be removed", "2.10.0") -abstract class BaseBerrySethi { +private[dtd] abstract class BaseBerrySethi { val lang: Base import lang.{ Alt, Eps, Meta, RegExp, Sequ, Star } diff --git a/src/library/scala/util/automata/DetWordAutom.scala b/src/library/scala/xml/dtd/impl/DetWordAutom.scala index 5d709106f8..5c1dcb7ff8 100644 --- a/src/library/scala/util/automata/DetWordAutom.scala +++ b/src/library/scala/xml/dtd/impl/DetWordAutom.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.util.automata +package scala.xml.dtd.impl import scala.collection.{ mutable, immutable } @@ -21,7 +21,7 @@ import scala.collection.{ mutable, immutable } * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -abstract class DetWordAutom[T <: AnyRef] { +private[dtd] abstract class DetWordAutom[T <: AnyRef] { val nstates: Int val finals: Array[Int] val delta: Array[mutable.Map[T, Int]] diff --git a/src/library/scala/util/automata/Inclusion.scala b/src/library/scala/xml/dtd/impl/Inclusion.scala index 91441bd3a8..0ae78519ca 100644 --- a/src/library/scala/util/automata/Inclusion.scala +++ b/src/library/scala/xml/dtd/impl/Inclusion.scala @@ -8,7 +8,7 @@ -package scala.util.automata +package scala.xml.dtd.impl /** A fast test of language inclusion between minimal automata. @@ -18,7 +18,7 @@ package scala.util.automata * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -trait Inclusion[A <: AnyRef] { +private[dtd] trait Inclusion[A <: AnyRef] { val labels: Seq[A] diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/xml/dtd/impl/NondetWordAutom.scala index 24c6612d0f..ddb994c4a3 100644 --- a/src/library/scala/util/automata/NondetWordAutom.scala +++ b/src/library/scala/xml/dtd/impl/NondetWordAutom.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.util.automata +package scala.xml.dtd.impl import scala.collection.{ immutable, mutable } @@ -18,7 +18,7 @@ import scala.collection.{ immutable, mutable } * the partial function `finals` is defined. */ @deprecated("This class will be removed", "2.10.0") -abstract class NondetWordAutom[T <: AnyRef] { +private[dtd] abstract class NondetWordAutom[T <: AnyRef] { val nstates: Int val labels: Seq[T] val finals: Array[Int] // 0 means not final diff --git a/src/library/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala index 5c0379b6f8..0b5297510d 100644 --- a/src/library/scala/util/regexp/PointedHedgeExp.scala +++ b/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala @@ -8,7 +8,7 @@ -package scala.util.regexp +package scala.xml.dtd.impl /** Pointed regular hedge expressions, a useful subclass of regular hedge expressions. * @@ -16,7 +16,7 @@ package scala.util.regexp * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -abstract class PointedHedgeExp extends Base { +private[dtd] abstract class PointedHedgeExp extends Base { type _regexpT <: RegExp type _labelT diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/xml/dtd/impl/SubsetConstruction.scala index 0ee768587c..8e4b5cc0f0 100644 --- a/src/library/scala/util/automata/SubsetConstruction.scala +++ b/src/library/scala/xml/dtd/impl/SubsetConstruction.scala @@ -6,12 +6,12 @@ ** |/ ** \* */ -package scala.util.automata +package scala.xml.dtd.impl import scala.collection.{ mutable, immutable } @deprecated("This class will be removed", "2.10.0") -class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { +private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { import nfa.labels def selectTag(Q: immutable.BitSet, finals: Array[Int]) = diff --git a/src/library/scala/util/regexp/SyntaxError.scala b/src/library/scala/xml/dtd/impl/SyntaxError.scala index 1788fdfb84..b0e0b8b6cd 100644 --- a/src/library/scala/util/regexp/SyntaxError.scala +++ b/src/library/scala/xml/dtd/impl/SyntaxError.scala @@ -8,7 +8,7 @@ -package scala.util.regexp +package scala.xml.dtd.impl /** This runtime exception is thrown if an attempt to instantiate a * syntactically incorrect expression is detected. @@ -17,4 +17,4 @@ package scala.util.regexp * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -class SyntaxError(e: String) extends RuntimeException(e) +private[dtd] class SyntaxError(e: String) extends RuntimeException(e) diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/xml/dtd/impl/WordBerrySethi.scala index 2f4625da44..90d7fe760a 100644 --- a/src/library/scala/util/automata/WordBerrySethi.scala +++ b/src/library/scala/xml/dtd/impl/WordBerrySethi.scala @@ -6,10 +6,9 @@ ** |/ ** \* */ -package scala.util.automata +package scala.xml.dtd.impl import scala.collection.{ immutable, mutable } -import scala.util.regexp.WordExp /** This class turns a regular expression into a [[scala.util.automata.NondetWordAutom]] * celebrated position automata construction (also called ''Berry-Sethi'' or ''Glushkov''). @@ -18,7 +17,7 @@ import scala.util.regexp.WordExp * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -abstract class WordBerrySethi extends BaseBerrySethi { +private[dtd] abstract class WordBerrySethi extends BaseBerrySethi { override val lang: WordExp import lang.{ Alt, Eps, Letter, RegExp, Sequ, Star, _labelT } diff --git a/src/library/scala/util/regexp/WordExp.scala b/src/library/scala/xml/dtd/impl/WordExp.scala index 3c0c2ec156..38f8aea697 100644 --- a/src/library/scala/util/regexp/WordExp.scala +++ b/src/library/scala/xml/dtd/impl/WordExp.scala @@ -8,7 +8,7 @@ -package scala.util.regexp +package scala.xml.dtd.impl /** * The class `WordExp` provides regular word expressions. @@ -39,7 +39,7 @@ package scala.util.regexp * @version 1.0 */ @deprecated("This class will be removed", "2.10.0") -abstract class WordExp extends Base { +private[dtd] abstract class WordExp extends Base { abstract class Label diff --git a/test/files/pos/t0422.scala b/test/files/pos/t0422.scala index cb3ba279d4..2adfa392d2 100644 --- a/test/files/pos/t0422.scala +++ b/test/files/pos/t0422.scala @@ -1,5 +1,4 @@ -import scala.util.regexp.WordExp; -import scala.util.automata.WordBerrySethi; +package scala.xml.dtd.impl object BoolWordExp extends WordExp { type _labelT = MyLabels; diff --git a/test/files/pos/t2698.scala b/test/files/pos/t2698.scala index 0e2662de61..7de50a13d6 100644 --- a/test/files/pos/t2698.scala +++ b/test/files/pos/t2698.scala @@ -1,5 +1,6 @@ +package scala.xml.dtd.impl + import scala.collection._ -import scala.util.regexp._ abstract class S2 { val lang: WordExp diff --git a/test/files/pos/t422.scala b/test/files/pos/t422.scala deleted file mode 100644 index cb3ba279d4..0000000000 --- a/test/files/pos/t422.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.util.regexp.WordExp; -import scala.util.automata.WordBerrySethi; - -object BoolWordExp extends WordExp { - type _labelT = MyLabels; - type _regexpT = RegExp; - abstract class MyLabels extends Label ; - case class MyLabel(c:Char) extends MyLabels; -} - -object MyTranslator extends WordBerrySethi { - override val lang = BoolWordExp; - import lang._; - override protected def seenLabel( r:RegExp, i:Int, label: _labelT ): Unit = { - super.seenLabel(r,i,label) - } -} |