First flesh out of Semantic Differences

2 files changed, 10 insertions, 13 deletions

diff --git a/scalatexApi/src/main/scala/scalatex/stages/Compiler.scala b/scalatexApi/src/main/scala/scalatex/stages/Compiler.scala
index 43c23a8..b34e94d 100644
--- a/scalatexApi/src/main/scala/scalatex/stages/Compiler.scala
+++ b/scalatexApi/src/main/scala/scalatex/stages/Compiler.scala
@@ -50,7 +50,7 @@ object Compiler{
 
       }
 
-      q"$out: $fragType"
+      out
     }
     def compileBlock(parts: Seq[Ast.Block.Sub], offset: Int): Seq[c.Tree] = {
       val res = parts.map{
@@ -69,7 +69,6 @@ object Compiler{
 
           val res = If(incPosRec(cond, offset1 + 2), compileBlockWrapped(parts2, offset2), elseCompiled)
 
-          println("Tree " + res)
           incPos(res, offset1)
           res
         case Ast.Block.For(generators, Ast.Block(parts2, offset2), offset1) =>
@@ -86,11 +85,7 @@ object Compiler{
               compileBlockWrapped(parts2, offset2)
           }
 
-          val out = rec(tree)
-          println(out)
-
-          q"$out: $fragType"
-
+          rec(tree)
       }
       res
     }
diff --git a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala
index 3b79878..6929f34 100644
--- a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala
+++ b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala
@@ -109,26 +109,28 @@ class Parser(input: ParserInput, indent: Int = 0, offset: Int = 0) extends Scala
     ')'
   }
   def BlockExpr2: Rule0 = rule { '{' ~ Ws ~ (CaseClauses | Block) ~ '}' }
-  def BraceBlock: Rule1[Ast.Block] = rule{ '{' ~ Body ~ '}' }
+  def BraceBlock: Rule1[Ast.Block] = rule{ '{' ~ BodyNoBrace ~ '}' }
 
-  def BodyItem: Rule1[Seq[Ast.Block.Sub]] = rule{
+  def BodyItem(exclusions: String): Rule1[Seq[Ast.Block.Sub]] = rule{
     ForLoop ~> (Seq(_)) |
     LoneForLoop ~> (Seq(_, _)) |
     IfElse ~> (Seq(_)) |
     LoneScalaChain ~> (Seq(_, _)) |
     HeaderBlock ~> (Seq(_)) |
-    TextNot("@}") ~> (Seq(_)) |
+    TextNot("@" + exclusions) ~> (Seq(_)) |
     (push(offsetCursor) ~ capture(Indent) ~> ((i, x) => Seq(Ast.Block.Text(x, i)))) |
     (push(offsetCursor) ~ capture(BlankLine) ~> ((i, x) => Seq(Ast.Block.Text(x, i)))) |
     ScalaChain ~> (Seq(_: Ast.Block.Sub))
   }
-  def Body = rule{
-    push(offsetCursor) ~ oneOrMore(BodyItem) ~> {(i, x) =>
+  def Body = rule{ BodyEx() }
+  def BodyNoBrace = rule{ BodyEx("}") }
+  def BodyEx(exclusions: String = "") = rule{
+    push(offsetCursor) ~ oneOrMore(BodyItem(exclusions)) ~> {(i, x) =>
       Ast.Block(x.flatten, i)
     }
   }
   def Body0 = rule{
-    push(offsetCursor) ~ zeroOrMore(BodyItem) ~> {(i, x) =>
+    push(offsetCursor) ~ zeroOrMore(BodyItem("")) ~> {(i, x) =>
       Ast.Block(x.flatten, i)
     }
   }