Skip to content

Commit

Permalink
parsing error should throw runtime exception
Browse files Browse the repository at this point in the history
  • Loading branch information
edadma committed Apr 26, 2018
1 parent caa7e25 commit dff5422
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.6-orange.svg)](https://github.com/edadma/liquescent/releases/tag/v0.1.6)
[![Version](https://img.shields.io/badge/latest_release-v0.1.7-orange.svg)](https://github.com/edadma/liquescent/releases/tag/v0.1.7)

*Liquescent* is an implementation of the [Liquid](https://shopify.github.io/liquid/) templating language for the [Scala](http://scala-lang.org) programming language.

Expand Down Expand Up @@ -52,7 +52,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.1.6.jar -j "{v: [\"one\", \"two\", \"three\"]}" --
echo "{{ v | join: \", \" }}" | java -jar liquescent-0.1.7.jar -j "{v: [\"one\", \"two\", \"three\"]}" --
```

The above command prints
Expand All @@ -74,7 +74,7 @@ Use the following definition to use Liquescent in your Maven project:
<dependency>
<groupId>xyz.hyperreal</groupId>
<artifactId>liquescent</artifactId>
<version>0.1.6</version>
<version>0.1.7</version>
</dependency>
```

Expand All @@ -83,7 +83,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.1.6"
libraryDependencies += "xyz.hyperreal" %% "liquescent" % "0.1.7"
```

Building
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "liquescent"

version := "0.1.6"
version := "0.1.7"

scalaVersion := "2.12.5"

Expand Down
4 changes: 1 addition & 3 deletions src/main/scala/LiquescentParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,7 @@ class ElementParser extends RegexParsers with PackratParsers {
def apply[T]( grammar: Parser[T], input: String ) =
parseAll( grammar, input ) match {
case Success( result, _ ) => result
case NoSuccess( msg, r ) =>
println( s"$msg (${r.pos})\n${r.pos.longString}" )
sys.exit( 1 )
case NoSuccess( msg, r ) => sys.error( s"$msg (${r.pos})\n${r.pos.longString}" )
}

}
4 changes: 2 additions & 2 deletions src/main/scala/Main.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ object Main extends App {

def usage {
"""
|liquescent v0.1.6
|liquescent v0.1.7
|
|Usage: java -jar liquescent-0.1.6.jar <options> <liquid template>
|Usage: java -jar liquescent-0.1.7.jar <options> <liquid template>
|
|Options: --help display this help and exit
| -s <name> <string> assign <string> to variable <name>
Expand Down

0 comments on commit dff5422

Please sign in to comment.