From 49c0c1306579d6a2ca771c2989402ab6f43e51f2 Mon Sep 17 00:00:00 2001 From: Chris Hansen Date: Fri, 17 Sep 2021 22:07:31 +1200 Subject: [PATCH] parsing error --- build.sbt | 2 +- src/main/scala/seasadj/Service.scala | 2 +- src/main/scala/seasadj/SpecificationParser.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 223e3ba..8d383ea 100755 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := """seasadj""" organization := "org.cmhh" scalaVersion := "2.13.6" -version := "0.2.0" +version := "0.2.1" scalacOptions += "-deprecation" libraryDependencies += "com.lihaoyi" %% "upickle" % "0.9.5" diff --git a/src/main/scala/seasadj/Service.scala b/src/main/scala/seasadj/Service.scala index 2994277..aa6c3a1 100755 --- a/src/main/scala/seasadj/Service.scala +++ b/src/main/scala/seasadj/Service.scala @@ -59,7 +59,7 @@ object Service extends App with CORSHandler { object routes { val version = path("version") { - complete(HttpEntity(ContentTypes.`application/json`, "[\"0.2.0\"]")) + complete(HttpEntity(ContentTypes.`application/json`, "[\"0.2.1\"]")) } val validateSPC = path("validateSPC") { diff --git a/src/main/scala/seasadj/SpecificationParser.scala b/src/main/scala/seasadj/SpecificationParser.scala index 2d90b0e..b723256 100644 --- a/src/main/scala/seasadj/SpecificationParser.scala +++ b/src/main/scala/seasadj/SpecificationParser.scala @@ -18,7 +18,7 @@ object SpecificationParser { // anything that could be a specificaton or parameter name val name = "(?:[a-zA-Z]+[a-zA-Z0-9]*)" // anything permitted inside a spec value - val anytext = "(?:[a-zA-Z]+[a-zA-Z0-9\r\n\\(\\)\"\'\\.,=\\\\/ -]*)" + val anytext = "(?:[a-zA-Z]+[a-zA-Z0-9\r\n\\(\\)\"\'\\.,=\\\\/ -_]*)" // anything permitted on the rhs of a spec parameter val anyrhs = "(?:[a-zA-Z\\(]+[a-zA-Z0-9\r\n\\(\\)\"\'\\.,\\\\/ -]*)" // high-level match for entire spec, i.e. spec { specname}