Merge branch 'master'

Author: jad-hamza

build.sbt

@@ -8,7 +8,7 @@ javaOptions in IntegrationTest ++= Seq("-Xss128M")
 
 fork in IntegrationTest := true
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test,it"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0-RC3" % "test"
 
 logBuffered in IntegrationTest := false
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.0

project/plugins.sbt

@@ -1,6 +1 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-
-// avoids warning from sbt-git, see https://github.com/sbt/sbt-git#known-issues
-libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.21"
-
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")

src/main/scala/smtlib/theories/Constructors.scala

@@ -75,7 +75,7 @@ object Constructors {
     }
   }
 
-  def or(t1: Term, t2: Term, ts: Term*): Term = and(t1 +: t2 +: ts)
+  def or(t1: Term, t2: Term, ts: Term*): Term = or(t1 +: t2 +: ts)
   def or(ts: Seq[Term]): Term = {
     val flat = ts.flatMap{
       case Or(es@_*) => es

src/main/scala/smtlib/trees/TreeTransformer.scala

@@ -328,13 +328,13 @@ abstract class SimpleTreeTransformer extends PrePostTreeTransformer {
   final def transform(term: Term): Term = transform(term, ())._1
   final def transform(sort: Sort): Sort = transform(sort, ())._1
 
-  override final def transform(id: Identifier, c: C): (Identifier, R) = transform(id, c)
+  override final def transform(id: Identifier, c: C): (Identifier, R) = super.transform(id, c)
   final def transform(id: Identifier): Identifier = transform(id, ())._1
 
-  override final def transform(varBinding: VarBinding, c: C): (VarBinding, R) = transform(varBinding, c)
+  override final def transform(varBinding: VarBinding, c: C): (VarBinding, R) = super.transform(varBinding, c)
   final def transform(varBinding: VarBinding): VarBinding = transform(varBinding, ())._1
 
-  override final def transform(sortedVar: SortedVar, c: C): (SortedVar, R) = transform(sortedVar, c)
+  override final def transform(sortedVar: SortedVar, c: C): (SortedVar, R) = super.transform(sortedVar, c)
   final def transform(sortedVar: SortedVar): SortedVar = transform(sortedVar, ())._1
 
 }

src/main/scala/smtlib/trees/Trees.scala

@@ -113,7 +113,7 @@ object Terms {
   sealed trait Constant extends Term with AttributeValue
 
   /*
-   * Literal do not necessarly have an associated expected meaning (SNumeral as an
+   * Literal do not necessarily have an associated expected meaning (SNumeral as an
    * integer or SBinary as a 2-complement integer). They are just syntactic units,
    * and each local theory gives them a semantics.
    *

src/test/scala/smtlib/parser/CommandsResponsesParserTests.scala

@@ -343,7 +343,7 @@ class CommandsResponsesParserTests extends FunSuite {
   /*
    * TODO: the standard requires at least one value, currently we return empty list
    */
-  ignore("get-value response must contains at least one valuation pair") {
+  ignore("get-value response must contain at least one valuation pair") {
     intercept[UnexpectedTokenException] {
       Parser.fromString("()").parseGetValueResponse
     }