Gave new utility method a proper signature

Author: marcoeilers

src/main/scala/viper/silver/ast/utility/Consistency.scala

@@ -270,8 +270,8 @@ object Consistency {
       case Old(nested) => validTrigger(nested, program) // case corresponds to OldTrigger node
       case LabelledOld(nested, _) => validTrigger(nested, program)
       case ee: ExtensionExp => ee.extensionIsValidTrigger()
-      case wand: MagicWand => wand.subexpressionsToEvaluate(program).forall(e => !e.existsDefined(Expressions.isForbiddenInTrigger))
-      case _ : PossibleTrigger | _: FieldAccess | _: PredicateAccess => !e.existsDefined(Expressions.isForbiddenInTrigger)
+      case wand: MagicWand => wand.subexpressionsToEvaluate(program).forall(e => !e.exists(Expressions.isForbiddenInTrigger))
+      case _ : PossibleTrigger | _: FieldAccess | _: PredicateAccess => !e.exists(Expressions.isForbiddenInTrigger)
       case _ => false
     }
   }

src/main/scala/viper/silver/ast/utility/Expressions.scala

@@ -295,9 +295,10 @@ object Expressions {
     leftConds ++ guardedRightConds
   }
 
-  def isForbiddenInTrigger: PartialFunction[Node, Unit] = {
-    case _: ForbiddenInTrigger =>
-    case ee: ExtensionExp if ee.extensionIsForbiddenInTrigger() =>
+  def isForbiddenInTrigger(n: Node): Boolean = n match {
+    case _: ForbiddenInTrigger => true
+    case ee: ExtensionExp => ee.extensionIsForbiddenInTrigger()
+    case _ => false
   }
 
   /** See [[viper.silver.ast.utility.Triggers.TriggerGeneration.generateTriggerSetGroups]] */

src/main/scala/viper/silver/ast/utility/Triggers.scala

@@ -39,7 +39,7 @@ object Triggers {
     /* Note: If Add and Sub were type arguments of GenericTriggerGenerator, the latter
      *       could implement isForbiddenInTrigger already */
     def isForbiddenInTrigger(e: Exp) = (customIsForbiddenInTrigger orElse {
-      case e if Expressions.isForbiddenInTrigger.isDefinedAt(e) => true
+      case e if Expressions.isForbiddenInTrigger(e) => true
       case _ => false
     }: PartialFunction[Exp, Boolean])(e)
 

src/main/scala/viper/silver/plugin/standard/adt/AdtASTExtension.scala

@@ -207,7 +207,7 @@ case class AdtConstructorApp(name: String, args: Seq[Exp], typVarMap: Map[TypeVa
     }
   }
 
-  override def extensionIsValidTrigger(): Boolean = args.forall(a => !a.existsDefined(Expressions.isForbiddenInTrigger))
+  override def extensionIsValidTrigger(): Boolean = args.forall(a => !a.exists(Expressions.isForbiddenInTrigger))
 
   override def extensionIsForbiddenInTrigger(): Boolean = false
 }
@@ -258,7 +258,7 @@ case class AdtDestructorApp(name: String, rcv: Exp, typVarMap: Map[TypeVar, Type
     }
   }
 
-  override def extensionIsValidTrigger(): Boolean = !rcv.existsDefined(Expressions.isForbiddenInTrigger)
+  override def extensionIsValidTrigger(): Boolean = !rcv.exists(Expressions.isForbiddenInTrigger)
 
   override def extensionIsForbiddenInTrigger(): Boolean = false
 }