diff options
| author | Jesse Luehrs <doy@tozt.net> | 2013-02-26 23:43:36 -0600 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2013-02-26 23:43:36 -0600 |
| commit | 67321fc7c67265d1a4bd529e9c57413587d564f6 (patch) | |
| tree | 2da68f94adf9000e25724e0e38d8ef00540820fb | |
| parent | 955c36b1f9474a0cfbd5343f47a45f814acf7659 (diff) | |
| download | scala-test-more-67321fc7c67265d1a4bd529e9c57413587d564f6.tar.gz scala-test-more-67321fc7c67265d1a4bd529e9c57413587d564f6.zip | |
generate plan and result events
ignore comments and subtests completely for now
| -rw-r--r-- | src/main/scala/org/perl8/test/tap/Parser.scala | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/scala/org/perl8/test/tap/Parser.scala b/src/main/scala/org/perl8/test/tap/Parser.scala index d66c2c7..27f085a 100644 --- a/src/main/scala/org/perl8/test/tap/Parser.scala +++ b/src/main/scala/org/perl8/test/tap/Parser.scala @@ -47,13 +47,19 @@ class Parser private ( } private def plan: Parser[Plan] = - planLine ^^ { _.plan } + planLine ^^ { p => + cb(PlanEvent(p.plan)) + p.plan + } private def result: Parser[TestResult] = simpleResult | subtestResult private def simpleResult: Parser[TestResult] = - resultLine ^^ { _.result } + resultLine ^^ { r => + cb(ResultEvent(r.result)) + r.result + } private def subtestResult: Parser[TestResult] = subtest ~ simpleResult ^^ { case subtest ~ simpleResult => @@ -72,7 +78,7 @@ class Parser private ( // type (the path dependent type associated with the new Parser instance // we create here, rather than the path dependent type associated with // this) - val subParser = new org.perl8.test.tap.Parser(cb, in.first.indent) + val subParser = new org.perl8.test.tap.Parser(e => (), in.first.indent) subParser.tap(in) match { case subParser.Success(p, rest) => Success(p, rest) case subParser.Failure(m, rest) => Failure(m, rest) |