Implement comment in compiler

openmole · Feb 21, 2020 · 0603a24 · 0603a24
1 parent 085941a
commit 0603a24
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/api/src/main/scala/scalatex/stages/Compiler.scala b/api/src/main/scala/scalatex/stages/Compiler.scala
@@ -85,6 +85,9 @@ object Compiler{
         case Ast.Block.Text(offset1, str) =>
           incPos(q"$str", offset1)
 
+        case Ast.Block.Comment(offset1, comment) =>
+          incPos(q"Seq[$fragType]()", offset1)
+
         case Ast.Chain(offset1, code, parts) =>
           compileChain(code, parts, offset1)
 

diff --git a/api/src/test/scala/scalatex/ExampleTests.scala b/api/src/test/scala/scalatex/ExampleTests.scala
@@ -242,6 +242,21 @@ object ExampleTests extends TestSuite{
           """
         )
       }
+      'comment {
+        check(
+          tw("""
+            @val x = {1}
+            @val y = {2}
+
+            /* Comment */
+
+            @x + @y is @(x + y)
+          """),
+          """
+            1 + 2 is 3
+          """
+        )
+      }
     }
 
   }

diff --git a/api/src/test/scala/scalatex/ParserTests.scala b/api/src/test/scala/scalatex/ParserTests.scala
@@ -439,6 +439,13 @@ object ParserTests extends utest.TestSuite{
         File(_),
         Block(0,List(Block.Text(0, "\n"), Block.Comment(1,"/* This is a comment */"), Block.Text(24,"\nThis isn't")))
       )
+      'nestedComent - check(
+        """
+          |@b{Comment using /*Test*/}
+          |""".stripMargin,
+        File(_),
+        Block(0,List(Block.Text(0,"\n"), Chain(2,"b",List(Block(4,List(Block.Text(4,"Comment using /*Test*/"))))), Block.Text(27,"\n")))
+      )
     }
 ////    'Test{
 ////      check(

diff --git a/project/Constants.scala b/project/Constants.scala
@@ -1,6 +1,6 @@
 package scalatex
 object Constants{
-  val version = "0.4.4"
+  val version = "0.4.5"
   val scalaTags = "0.8.4"
   val scala212 = "2.12.10"
   val scala213 = "2.13.1"