equal
deleted
inserted
replaced
40 |
40 |
41 val antiq: Parser[String] = |
41 val antiq: Parser[String] = |
42 "@{" ~ rep(antiq_body) ~ "}" ^^ { case x ~ y ~ z => x + y.mkString + z } |
42 "@{" ~ rep(antiq_body) ~ "}" ^^ { case x ~ y ~ z => x + y.mkString + z } |
43 |
43 |
44 val antiquote: Parser[Antiquote] = |
44 val antiquote: Parser[Antiquote] = |
45 control ^^ (x => Control(x)) | (antiq ^^ (x => Antiq(x)) | txt ^^ (x => Text(x))) |
45 txt ^^ (x => Text(x)) | (control ^^ (x => Control(x)) | antiq ^^ (x => Antiq(x))) |
46 } |
46 } |
47 |
47 |
48 |
48 |
49 /* read */ |
49 /* read */ |
50 |
50 |