diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-07-11 16:07:57 +0000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-07-11 16:07:57 +0000 |
commit | 4358c5019d4e7d6f3fc7767105ef9b2ca6ee6f20 (patch) | |
tree | ed8c14192cb018dae75dea2efe7ba7780318016a /src/library | |
parent | 76e2ea8895ebc598862b44cacb42a45a3c48d1b9 (diff) | |
download | scala-4358c5019d4e7d6f3fc7767105ef9b2ca6ee6f20.tar.gz scala-4358c5019d4e7d6f3fc7767105ef9b2ca6ee6f20.tar.bz2 scala-4358c5019d4e7d6f3fc7767105ef9b2ca6ee6f20.zip |
fixed warnings..
Diffstat (limited to 'src/library')
3 files changed, 12 insertions, 11 deletions
diff --git a/src/library/scala/util/parsing/ast/Binders.scala b/src/library/scala/util/parsing/ast/Binders.scala index c1cbead24c..0c2283f3cf 100644 --- a/src/library/scala/util/parsing/ast/Binders.scala +++ b/src/library/scala/util/parsing/ast/Binders.scala @@ -10,7 +10,7 @@ package scala.util.parsing.ast import scala.collection.mutable.Map -//DISCLAIMER: this code is not well-tested -- consider it beta-quality! +//DISCLAIMER: this code is highly experimental! // TODO: avoid clashes when substituting // TODO: check binders in the same scope are distinct diff --git a/src/library/scala/util/parsing/combinator/syntactical/BindingParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/BindingParsers.scala index 8ce806f1eb..892f566565 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/BindingParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/BindingParsers.scala @@ -13,7 +13,7 @@ package scala.util.parsing.combinator.syntactical import scala.util.parsing.ast._ -// DISCLAIMER: this code is not well-tested -- consider it beta-quality! +//DISCLAIMER: this code is highly experimental! /** <p> * This component augments the generic parsers with support for variable binding. @@ -124,7 +124,7 @@ trait BindingParsers extends Parsers with Binders { * wrapping its result in a `BoundElement' */ def bound[bt <: NameElement](boundElementParser: Parser[bt]) = - boundElementParser ^? ({case x: bt if !findScope(x).isEmpty => BoundElement(x, findScope(x).get)}, (x: bt) => """Unbound variable `"""+x+"""'""") + boundElementParser ^? ({case x: NameElement if !findScope(x).isEmpty => BoundElement(x, findScope(x).get)}, (x: bt) => """Unbound variable `"""+x+"""'""") private var binderEnv: BinderEnv = EmptyBinderEnv diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala index f3ac96221f..4ac50a4f8c 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/library/scala/util/parsing/json/JSON.scala @@ -32,20 +32,21 @@ object JSON extends Parser { def resolveType(input: Any): Any = input match { - case jo: List[(String,Any)] => + case jo: List[_] => /*println("Resolving object")*/ val objMap = new HashMap[String, Any]() - jo.foreach { - case (key, value) => + if(jo.forall { + case (key: String, value) => objMap.update(key, resolveType(value)) + true + case _ => false + }) objMap + else { + /*println("Resolving array"); */ + jo.toArray } - objMap - - case ja: List[Any] => - /*println("Resolving array"); */ - ja.toArray case _ @ elem => /*println("Resolving element"); */ elem |