diff options
author | michelou <michelou@epfl.ch> | 2004-05-05 08:41:48 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2004-05-05 08:41:48 +0000 |
commit | f8791e07ecedc3b2856b2c67a784fc0053a87947 (patch) | |
tree | 70b1333c64c3665346bf4e81480b4ac20246d0c5 /sources/examples | |
parent | 5d65d5689a81150ff003b165dc7caf458401180c (diff) | |
download | scala-f8791e07ecedc3b2856b2c67a784fc0053a87947.tar.gz scala-f8791e07ecedc3b2856b2c67a784fc0053a87947.tar.bz2 scala-f8791e07ecedc3b2856b2c67a784fc0053a87947.zip |
- renamed 'parsers.scala' to 'parsers1.scala'.
Diffstat (limited to 'sources/examples')
-rw-r--r-- | sources/examples/Parsers.scala | 125 | ||||
-rw-r--r-- | sources/examples/parsers.scala | 118 | ||||
-rw-r--r-- | sources/examples/parsers1.scala | 164 |
3 files changed, 114 insertions, 293 deletions
diff --git a/sources/examples/Parsers.scala b/sources/examples/Parsers.scala index 582ad5b1f9..d99c3628ec 100644 --- a/sources/examples/Parsers.scala +++ b/sources/examples/Parsers.scala @@ -1,118 +1,65 @@ package examples; -object parsers { - abstract class Parsers { type intype; - abstract class Parser { + trait Parser[a] { - type Result = Option[intype]; + type Result = Option[Pair[a, intype]]; def apply(in: intype): Result; - /*** p &&& q applies first p, and if that succeeds, then q - */ - def &&& (def q: Parser) = new Parser { + def filter(pred: a => boolean) = new Parser[a] { def apply(in: intype): Result = Parser.this.apply(in) match { case None => None - case Some(in1) => q(in1) + case Some(Pair(x, in1)) => if (pred(x)) Some(Pair(x, in1)) else None } } - /*** p ||| q applies first p, and, if that fails, then q. - */ - def ||| (def q: Parser) = new Parser { + def map[b](f: a => b) = new Parser[b] { def apply(in: intype): Result = Parser.this.apply(in) match { - case None => q(in) - case s => s + case None => None + case Some(Pair(x, in1)) => Some(Pair(f(x), in1)) } } - } - - val empty = new Parser { - def apply(in: intype): Result = Some(in) - } - - val fail = new Parser { - def apply(in: intype): Result = None - } - - def opt(p: Parser): Parser = p ||| empty; // p? = (p | <empty>) - def rep(p: Parser): Parser = opt(rep1(p)); // p* = [p+] - def rep1(p: Parser): Parser = p &&& rep(p); // p+ = p p* -} - - abstract class ListParsers extends Parsers { - def chr(p: char => boolean): Parser; - def chr(c: char): Parser = chr(d: char => d == c); - - def letter : Parser = chr(Character.isLetter); - def digit : Parser = chr(Character.isDigit); - - def ident : Parser = letter &&& rep(letter ||| digit); - def number : Parser = digit &&& rep(digit); - def list : Parser = chr('(') &&& listElems &&& chr(')'); - def listElems : Parser = expr &&& (chr(',') &&& listElems ||| empty); - def expr : Parser = ident ||| number ||| list; - } - - abstract class ExprParsers extends Parsers { - def chr(p: char => boolean): Parser; - def chr(c: char): Parser = chr(d: char => d == c); - def digit : Parser = chr(Character.isDigit); - def number : Parser = digit &&& rep(digit); - def summand : Parser = number ||| chr('(') &&& expr &&& chr(')'); - def expr : Parser = summand &&& rep(chr('+') &&& summand) - } + def flatMap[b](f: a => Parser[b]) = new Parser[b] { + def apply(in: intype): Result = Parser.this.apply(in) match { + case None => None + case Some(Pair(x, in1)) => f(x).apply(in1) + } + } - class ParseString(s: String) extends Parsers { - type intype = int; - val input = 0; - def chr(p: char => boolean) = new Parser { - def apply(in: int): Parser#Result = - if (in < s.length() && p(s charAt in)) Some(in + 1); - else None; + def ||| (def p: Parser[a]) = new Parser[a] { + def apply(in: intype): Result = Parser.this.apply(in) match { + case None => p(in) + case s => s + } } - } - object TestList { + def &&& [b](def p: Parser[b]): Parser[b] = + for (val _ <- this; val x <- p) yield x; + } - def main(args: Array[String]): unit = - if (args.length == 1) { - val ps = new ListParsers with ParseString(args(0)); - ps.expr(ps.input) match { - case Some(n) => - Console.println("parsed: " + args(0).substring(0, n)); - case None => - Console.println("nothing parsed"); - } - } - else - Console.println("usage: java examples.TestList <expr-string>"); + def succeed[a](x: a) = new Parser[a] { + def apply(in: intype): Result = Some(Pair(x, in)) } - object TestExpr { + def rep[a](p: Parser[a]): Parser[List[a]] = + rep1(p) ||| succeed(List()); - def main(args: Array[String]): unit = - if (args.length == 1) { - val ps = new ExprParsers with ParseString(args(0)); - ps.expr(ps.input) match { - case Some(n) => - Console.println("parsed: " + args(0).substring(0, n)); - case None => - Console.println("nothing parsed"); - } - } - else - Console.println("usage: java examples.TestExpr <expr-string>"); - } + def rep1[a](p: Parser[a]): Parser[List[a]] = + for (val x <- p; val xs <- rep(p)) yield x :: xs; - def main(args: Array[String]): Unit = { - TestList.main(Array("(a,b,(1,2))")); - TestExpr.main(Array("2+3+(4+1)")) - } + def opt[a](p: Parser[a]): Parser[List[a]] = + (for (val x <- p) yield List(x)) ||| succeed(List()); +} +abstract class CharParsers extends Parsers { + def any: Parser[char]; + def chr(ch: char) = + for (val c <- any; c == ch) yield c; + def chr(p: char => boolean) = + for (val c <- any; p(c)) yield c; } diff --git a/sources/examples/parsers.scala b/sources/examples/parsers.scala deleted file mode 100644 index 582ad5b1f9..0000000000 --- a/sources/examples/parsers.scala +++ /dev/null @@ -1,118 +0,0 @@ -package examples; - -object parsers { - -abstract class Parsers { - - type intype; - - abstract class Parser { - - type Result = Option[intype]; - - def apply(in: intype): Result; - - /*** p &&& q applies first p, and if that succeeds, then q - */ - def &&& (def q: Parser) = new Parser { - def apply(in: intype): Result = Parser.this.apply(in) match { - case None => None - case Some(in1) => q(in1) - } - } - - /*** p ||| q applies first p, and, if that fails, then q. - */ - def ||| (def q: Parser) = new Parser { - def apply(in: intype): Result = Parser.this.apply(in) match { - case None => q(in) - case s => s - } - } - } - - val empty = new Parser { - def apply(in: intype): Result = Some(in) - } - - val fail = new Parser { - def apply(in: intype): Result = None - } - - def opt(p: Parser): Parser = p ||| empty; // p? = (p | <empty>) - def rep(p: Parser): Parser = opt(rep1(p)); // p* = [p+] - def rep1(p: Parser): Parser = p &&& rep(p); // p+ = p p* -} - - abstract class ListParsers extends Parsers { - def chr(p: char => boolean): Parser; - def chr(c: char): Parser = chr(d: char => d == c); - - def letter : Parser = chr(Character.isLetter); - def digit : Parser = chr(Character.isDigit); - - def ident : Parser = letter &&& rep(letter ||| digit); - def number : Parser = digit &&& rep(digit); - def list : Parser = chr('(') &&& listElems &&& chr(')'); - def listElems : Parser = expr &&& (chr(',') &&& listElems ||| empty); - def expr : Parser = ident ||| number ||| list; - } - - abstract class ExprParsers extends Parsers { - def chr(p: char => boolean): Parser; - def chr(c: char): Parser = chr(d: char => d == c); - - def digit : Parser = chr(Character.isDigit); - def number : Parser = digit &&& rep(digit); - def summand : Parser = number ||| chr('(') &&& expr &&& chr(')'); - def expr : Parser = summand &&& rep(chr('+') &&& summand) - } - - class ParseString(s: String) extends Parsers { - type intype = int; - val input = 0; - def chr(p: char => boolean) = new Parser { - def apply(in: int): Parser#Result = - if (in < s.length() && p(s charAt in)) Some(in + 1); - else None; - } - } - - object TestList { - - def main(args: Array[String]): unit = - if (args.length == 1) { - val ps = new ListParsers with ParseString(args(0)); - ps.expr(ps.input) match { - case Some(n) => - Console.println("parsed: " + args(0).substring(0, n)); - case None => - Console.println("nothing parsed"); - } - } - else - Console.println("usage: java examples.TestList <expr-string>"); - } - - object TestExpr { - - def main(args: Array[String]): unit = - if (args.length == 1) { - val ps = new ExprParsers with ParseString(args(0)); - ps.expr(ps.input) match { - case Some(n) => - Console.println("parsed: " + args(0).substring(0, n)); - case None => - Console.println("nothing parsed"); - } - } - else - Console.println("usage: java examples.TestExpr <expr-string>"); - } - - def main(args: Array[String]): Unit = { - TestList.main(Array("(a,b,(1,2))")); - TestExpr.main(Array("2+3+(4+1)")) - } - -} diff --git a/sources/examples/parsers1.scala b/sources/examples/parsers1.scala index 613789e495..426ec809fa 100644 --- a/sources/examples/parsers1.scala +++ b/sources/examples/parsers1.scala @@ -1,126 +1,118 @@ package examples; object parsers1 { -/* + abstract class Parsers { type intype; - trait Parser[a] { + abstract class Parser { - type Result = Option[Pair[a, intype]]; + type Result = Option[intype]; def apply(in: intype): Result; - def filter(pred: a => boolean) = new Parser[a] { + /*** p &&& q applies first p, and if that succeeds, then q + */ + def &&& (def q: Parser) = new Parser { def apply(in: intype): Result = Parser.this.apply(in) match { case None => None - case Some(Pair(x, in1)) => if (pred(x)) Some(Pair(x, in1)) else None + case Some(in1) => q(in1) } } - def map[b](f: a => b) = new Parser[b] { + /*** p ||| q applies first p, and, if that fails, then q. + */ + def ||| (def q: Parser) = new Parser { def apply(in: intype): Result = Parser.this.apply(in) match { - case None => None - case Some(Pair(x, in1)) => Some(Pair(f(x), in1)) - } - } - - def flatMap[b](f: a => Parser[b]) = new Parser[b] { - def apply(in: intype): Result = Parser.this.apply(in) match { - case None => None - case Some(Pair(x, in1)) => f(x).apply(in1) - } - } - - def ||| (def p: Parser[a]) = new Parser[a] { - def apply(in: intype): Result = Parser.this.apply(in) match { - case None => p(in) - case s => s + case None => q(in) + case s => s } } + } - def &&& [b](def p: Parser[b]): Parser[b] = - for (val _ <- this; val x <- p) yield x; + val empty = new Parser { + def apply(in: intype): Result = Some(in) } - def succeed[a](x: a) = new Parser[a] { - def apply(in: intype): Result = Some(Pair(x, in)) + val fail = new Parser { + def apply(in: intype): Result = None } - def rep[a](p: Parser[a]): Parser[List[a]] = - rep1(p) ||| succeed(List()); + def opt(p: Parser): Parser = p ||| empty; // p? = (p | <empty>) + def rep(p: Parser): Parser = opt(rep1(p)); // p* = [p+] + def rep1(p: Parser): Parser = p &&& rep(p); // p+ = p p* +} - def rep1[a](p: Parser[a]): Parser[List[a]] = - for (val x <- p; val xs <- rep(p)) yield x :: xs; + abstract class ListParsers extends Parsers { + def chr(p: char => boolean): Parser; + def chr(c: char): Parser = chr(d: char => d == c); - def opt[a](p: Parser[a]): Parser[List[a]] = - (for (val x <- p) yield List(x)) ||| succeed(List()); -} + def letter : Parser = chr(Character.isLetter); + def digit : Parser = chr(Character.isDigit); -abstract class CharParsers extends Parsers { - def any: Parser[char]; - def chr(ch: char) = - for (val c <- any; c == ch) yield c; - def chr(p: char => boolean) = - for (val c <- any; p(c)) yield c; -} -*/ -abstract class Tree{} -case class Id (s: String) extends Tree {} -case class Num(n: int) extends Tree {} -case class Lst(elems: List[Tree]) extends Tree {} - -abstract class ListParsers extends CharParsers { - - def ident: Parser[Tree] = - for ( - val c: char <- chr(Character.isLetter); - val cs: List[char] <- rep(chr(Character.isLetterOrDigit)) - ) yield Id((c :: cs).mkString("", "", "")); - - def number: Parser[Tree] = - for ( - val d: char <- chr(Character.isDigit); - val ds: List[char] <- rep(chr(Character.isDigit)) - ) yield Num(((d - '0') /: ds) ((x, digit) => x * 10 + digit - '0')); - - def list: Parser[Tree] = - for ( - val _ <- chr('('); - val es <- listElems ||| succeed(List()); - val _ <- chr(')') - ) yield Lst(es); - - def listElems: Parser[List[Tree]] = - for ( - val x <- expr; - val xs <- chr(',') &&& listElems ||| succeed(List()) - ) yield x :: xs; - - def expr: Parser[Tree] = - list ||| ident ||| number; + def ident : Parser = letter &&& rep(letter ||| digit); + def number : Parser = digit &&& rep(digit); + def list : Parser = chr('(') &&& listElems &&& chr(')'); + def listElems : Parser = expr &&& (chr(',') &&& listElems ||| empty); + def expr : Parser = ident ||| number ||| list; + } -} + abstract class ExprParsers extends Parsers { + def chr(p: char => boolean): Parser; + def chr(c: char): Parser = chr(d: char => d == c); + + def digit : Parser = chr(Character.isDigit); + def number : Parser = digit &&& rep(digit); + def summand : Parser = number ||| chr('(') &&& expr &&& chr(')'); + def expr : Parser = summand &&& rep(chr('+') &&& summand) + } class ParseString(s: String) extends Parsers { type intype = int; val input = 0; - def any = new Parser[char] { - def apply(in: int): Parser[char]#Result = - if (in < s.length()) Some(Pair(s charAt in, in + 1)) else None; + def chr(p: char => boolean) = new Parser { + def apply(in: int): Parser#Result = + if (in < s.length() && p(s charAt in)) Some(in + 1); + else None; } } - def main(args: Array[String]): unit = - Console.println( + object TestList { + + def main(args: Array[String]): unit = if (args.length == 1) { val ps = new ListParsers with ParseString(args(0)); ps.expr(ps.input) match { - case Some(Pair(list, _)) => Console.println("parsed: " + list); - case None => "nothing parsed" + case Some(n) => + Console.println("parsed: " + args(0).substring(0, n)); + case None => + Console.println("nothing parsed"); } - } else "usage: java examples.Test <expr-string>" - ); -} + } + else + Console.println("usage: java examples.TestList <expr-string>"); + } + + object TestExpr { + + def main(args: Array[String]): unit = + if (args.length == 1) { + val ps = new ExprParsers with ParseString(args(0)); + ps.expr(ps.input) match { + case Some(n) => + Console.println("parsed: " + args(0).substring(0, n)); + case None => + Console.println("nothing parsed"); + } + } + else + Console.println("usage: java examples.TestExpr <expr-string>"); + } + + def main(args: Array[String]): Unit = { + TestList.main(Array("(a,b,(1,2))")); + TestExpr.main(Array("2+3+(4+1)")) + } +} |