Fixed syntax

Author: bhermann

build.sbt

@@ -29,7 +29,7 @@ ThisBuild / publishTo := {
 }
 ThisBuild / publishMavenStyle := true
 
-ThisBuild / version      := "0.9.0"
+ThisBuild / version      := "0.9.1"
 
 lazy val scala212 = "2.12.10"
 lazy val scala213 = "2.13.1"

core/src/main/scala/de/upb/cs/swt/delphi/core/ql/Syntax.scala

@@ -67,10 +67,10 @@ class Syntax(val input : ParserInput) extends Parser {
   def IsTrue = rule { FieldReferenceRule ~> IsTrueExpr }
 
   // Literals
-  def FieldReferenceRule = rule { "[" ~ capture(oneOrMore(CharPredicate.AlphaNum ++ '-' ++ ' ' ++  '_' ++ '(' ++ ':' ++')')) ~ "]"  ~> FieldReference }
+  def FieldReferenceRule = rule { "[" ~ capture(oneOrMore(CharPredicate.AlphaNum ++ '.' ++ '-' ++ ' ' ++  '_' ++ '(' ++ ':' ++')')) ~ "]"  ~> FieldReference }
 
   def IntegerLiteral = rule { capture(oneOrMore(CharPredicate.Digit)) }
-  def StringLiteral = rule { '"' ~ capture(oneOrMore(CharPredicate.AlphaNum)) ~ '"'}
+  def StringLiteral = rule { '"' ~ capture(oneOrMore(CharPredicate.Printable -- '"' )) ~ '"'}
 
   def Literal = rule { (IntegerLiteral | StringLiteral ) ~> (_.toString) }
 

core/src/test/scala/de/upb/cs/swt/delphi/core/SyntaxTest.scala

@@ -16,7 +16,8 @@
 
 package de.upb.cs.swt.delphi.core
 
-import de.upb.cs.swt.delphi.core.ql.Syntax
+import de.upb.cs.swt.delphi.core.ql._
+import org.parboiled2.ParseError
 import org.scalatest.{FlatSpec, Matchers}
 
 import scala.util.{Failure, Success}
@@ -166,7 +167,7 @@ class SyntaxTest extends FlatSpec with Matchers {
 
   "Syntax.notConditionComplex" should "be valid" in {
     val parseResult = new Syntax("!!([Filter1])&&!([Filter2]<=0||!([Filter3]&&![Filter4]%\"abc\"))").QueryRule.run()
-    parseResult shouldBe a [Success[_]]
+    parseResult shouldBe a[Success[_]]
     parseResult match {
       case Success(ast) => {
         ast.toString shouldEqual "AndExpr(NotExpr(NotExpr(IsTrueExpr(FieldReference(Filter1))))," +
@@ -175,4 +176,23 @@ class SyntaxTest extends FlatSpec with Matchers {
       }
     }
   }
+
+    "Complex query" should "be valid" in {
+      val parser = new Syntax("[metrics.classversion.9] > 0 && [metrics.classversion.8] = 0 && [maven.groupId] = \"com.github.xmlet\"")
+      val parseResult = parser.QueryRule.run()
+      parseResult match {
+        case Success(ast) => {
+          ast shouldEqual
+            AndExpr(
+              AndExpr(
+                GreaterThanExpr(FieldReference("metrics.classversion.9"),"0"),
+                EqualExpr(FieldReference("metrics.classversion.8"),"0")),
+              EqualExpr(FieldReference("maven.groupId"),"com.github.xmlet"))
+        }
+        case Failure(exception : ParseError) => {
+          fail(parser.formatError(exception))
+        }
+        case _ => fail()
+      }
+    }
 }