fix parser glitch

edadma · May 24, 2018 · 897d8ce · 897d8ce
1 parent e012d05
commit 897d8ce
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Liquescent
 [![Build Status](https://www.travis-ci.org/edadma/liquescent.svg?branch=master)](https://www.travis-ci.org/edadma/liquescent)
 [![Coverage Status](https://coveralls.io/repos/github/edadma/liquescent/badge.svg?branch=master)](https://coveralls.io/github/edadma/liquescent?branch=master)
 [![License](https://img.shields.io/badge/license-ISC-blue.svg)](https://github.com/edadma/liquescent/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/latest_release-v0.2.2-orange.svg)](https://github.com/edadma/liquescent/releases/tag/v0.2.2)
+[![Version](https://img.shields.io/badge/latest_release-v0.2.3-orange.svg)](https://github.com/edadma/liquescent/releases/tag/v0.2.3)
 
 *Liquescent* is an implementation of the [Liquid](https://shopify.github.io/liquid/) templating language for the [Scala](http://scala-lang.org) programming language.
 
@@ -96,7 +96,7 @@ This program prints
 This next example shows how to use *Liquescent* as an executable on the command line.
 
 ```bash
-echo "{{ v | join: \", \" }}" | java -jar liquescent-0.2.2.jar -j "{v: [\"one\", \"two\", \"three\"]}" --
+echo "{{ v | join: \", \" }}" | java -jar liquescent-0.2.3.jar -j "{v: [\"one\", \"two\", \"three\"]}" --
 ```
 
 The above command prints
@@ -118,7 +118,7 @@ Use the following definition to use Liquescent in your Maven project:
 <dependency>
   <groupId>xyz.hyperreal</groupId>
   <artifactId>liquescent</artifactId>
-  <version>0.2.2</version>
+  <version>0.2.3</version>
 </dependency>
 ```
 
@@ -127,7 +127,7 @@ Add the following to your `build.sbt` file to use Liquescent in your SBT project
 ```sbt
 resolvers += "Hyperreal Repository" at "https://dl.bintray.com/edadma/maven"
 
-libraryDependencies += "xyz.hyperreal" %% "liquescent" % "0.2.2"
+libraryDependencies += "xyz.hyperreal" %% "liquescent" % "0.2.3"
 ```
 
 Building

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "liquescent"
 
-version := "0.2.2"
+version := "0.2.3"
 
 scalaVersion := "2.12.6"
 

diff --git a/src/main/scala/LiquescentParser.scala b/src/main/scala/LiquescentParser.scala
@@ -43,11 +43,16 @@ class LiquescentParser extends RegexParsers with PackratParsers {
 
   lazy val source: PackratParser[StatementAST] = block ~ opt(endTextOutput) ^^ {
     case b ~ None => b
+    case BlockStatementAST( Nil, _, _ ) ~ Some( t ) => t
     case BlockStatementAST( b, _, _ ) ~ Some( t ) => BlockStatementAST( b :+ t, false, false )
     case s ~ Some( t ) => BlockStatementAST( List(s, t), false, false )
   }
 
-  lazy val block: PackratParser[StatementAST] = rep(statement) ^^ (l => if (l.length == 1) l.head else BlockStatementAST( l, l.head.ls, l.last.rs ))
+  lazy val block: PackratParser[StatementAST] = rep(statement) ^^ {
+    case Nil => BlockStatementAST( Nil, false, false )
+    case List( s ) => s
+    case l => BlockStatementAST( l, l.head.ls, l.last.rs )
+  }
 
   lazy val statement: PackratParser[StatementAST] = tag | objectOutput | textOutput
 

diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala
@@ -15,9 +15,9 @@ object Main extends App {
 
 	def usage {
 		"""
-			|liquescent v0.2.2
+			|liquescent v0.2.3
 			|
-			|Usage:  java -jar liquescent-0.2.2.jar <options> <liquid template>
+			|Usage:  java -jar liquescent-0.2.3.jar <options> <liquid template>
 			|
 			|Options:  --help              display this help and exit
 			|          -s <name> <string>  assign <string> to variable <name>

diff --git a/src/test/scala/Main.scala b/src/test/scala/Main.scala
@@ -8,7 +8,7 @@ object Main extends Testing with App {
   val res =
     test(
       """
-        |{% include 'asdf' %}
+        |
       """.stripMargin, false, "list" -> List( 3, 4, 5 )
     )