diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-05 20:50:25 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-05 20:50:25 -0800 |
commit | 14ede69b487af5ebb8b0311a410f4d49dc66f540 (patch) | |
tree | c067b620e24aa7ecbe7c19c0f0c8ed4c76c2ad25 /scalatexApi/src/main/scala/scalatex | |
parent | 80beed1c4184bb564b2e669cc6f43ef4c6108d06 (diff) | |
download | hands-on-scala-js-14ede69b487af5ebb8b0311a410f4d49dc66f540.tar.gz hands-on-scala-js-14ede69b487af5ebb8b0311a410f4d49dc66f540.tar.bz2 hands-on-scala-js-14ede69b487af5ebb8b0311a410f4d49dc66f540.zip |
Refactored trim
Diffstat (limited to 'scalatexApi/src/main/scala/scalatex')
-rw-r--r-- | scalatexApi/src/main/scala/scalatex/package.scala | 2 | ||||
-rw-r--r-- | scalatexApi/src/main/scala/scalatex/stages/Parser.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scalatexApi/src/main/scala/scalatex/package.scala b/scalatexApi/src/main/scala/scalatex/package.scala index 1f00b72..78df45f 100644 --- a/scalatexApi/src/main/scala/scalatex/package.scala +++ b/scalatexApi/src/main/scala/scalatex/package.scala @@ -78,7 +78,7 @@ package object scalatex { def compile(s: String): c.Tree = { val realPos = new OffsetPosition(source, point).asInstanceOf[c.universe.Position] - Compiler(c)(realPos, Parser(stages.Trim.old(s))) + Compiler(c)(realPos, Parser.tupled(stages.Trim(s))) } diff --git a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala index 45f82e0..d78ec8d 100644 --- a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala +++ b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala @@ -13,7 +13,7 @@ import Util._ */ object Parser extends ((String, Int) => Ast.Block){ def apply(input: String, offset: Int = 0): Ast.Block = { - new Parser(input).Body.run().get + new Parser(input, offset).Body.run().get } } class Parser(input: ParserInput, indent: Int = 0, offset: Int = 0) extends ScalaSyntax(input) { |