From 2872190ca21b8474dd17918c67684721a8e905d2 Mon Sep 17 00:00:00 2001
From: chathhorn <chathhorn@gmail.com>
Date: Tue, 24 Sep 2019 13:50:41 -0500
Subject: [PATCH] Tweaks

---
 Jenkinsfile                                           |  4 ++--
 semantics/cpp/language/translation/decl/initializer.k | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4aa386f85..c95e20ec0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,14 +2,14 @@
 def img
 
 pipeline {
-  agent none 
+  agent none
   options {
     ansiColor('xterm')
   }
   stages {
     stage ( 'Pull Request' ) {
       agent any
-      when { 
+      when {
         changeRequest()
         beforeAgent true
       }
diff --git a/semantics/cpp/language/translation/decl/initializer.k b/semantics/cpp/language/translation/decl/initializer.k
index 502e4e6b6..1d135243d 100644
--- a/semantics/cpp/language/translation/decl/initializer.k
+++ b/semantics/cpp/language/translation/decl/initializer.k
@@ -326,13 +326,15 @@ module CPP-TRANSLATION-DECL-INITIALIZER
 
      syntax Bool ::= hasInit(CId, Map) [function]
 
-     rule hasInit(X:CId, X |-> M::Map _) => notBool isNoInit(M)
+     rule hasInit(X:CId, (X |-> M:Map) _) => #hasInit(M)
 
-     syntax Bool ::= isNoInit(Map) [function]
+     rule hasInit(_, _) => false [owise]
 
-     rule isNoInit(_ |-> (_, NoInit())) => true
+     syntax Bool ::= #hasInit(Map) [function]
 
-     rule isNoInit(_ |-> _) => false [owise]
+     rule #hasInit(_ |-> (_, NoInit())) => false
+
+     rule #hasInit(_) => true [owise]
 
      syntax Expr ::= classAggInit(base: LVal, fields: List, initList: List, initializers: Map, class: Class, initExp: K, ctype: ConstructorType, duration: Duration)