From ace1303a9699657752e6826ab2fa8d6310646550 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 1 Apr 2020 11:44:40 +0200
Subject: [PATCH] Fix analysis to support new pseudo constraints.

---
 .../jetbrains.mps.lang.coderules.analysis.mps | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index 8fe022d6..d6e5cfa1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -4441,6 +4441,7 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="1ALxU7rj0US" role="3cqZAp" />
           </node>
           <node concept="3eNFk2" id="5VJ3UjChmrP" role="3eNLev">
             <node concept="3clFbS" id="5VJ3UjChmrR" role="3eOfB_">
@@ -4463,6 +4464,7 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="1ALxU7rj0Sc" role="3cqZAp" />
             </node>
             <node concept="2OqwBi" id="5VJ3UjChmxV" role="3eO9$A">
               <node concept="37vLTw" id="5VJ3UjChmxW" role="2Oq$k0">
@@ -4475,6 +4477,92 @@
               </node>
             </node>
           </node>
+          <node concept="3eNFk2" id="1ALxU7rj0C_" role="3eNLev">
+            <node concept="2OqwBi" id="1ALxU7rj4da" role="3eO9$A">
+              <node concept="37vLTw" id="1ALxU7rj3BH" role="2Oq$k0">
+                <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+              </node>
+              <node concept="1mIQ4w" id="1ALxU7rj4MU" role="2OqNvi">
+                <node concept="chp4Y" id="1ALxU7rj4Su" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="1ALxU7rj0CB" role="3eOfB_">
+              <node concept="2Gpval" id="1ALxU7rjauj" role="3cqZAp">
+                <node concept="3clFbS" id="1ALxU7rj8Ab" role="2LFqv$">
+                  <node concept="3clFbF" id="1ALxU7rj4YX" role="3cqZAp">
+                    <node concept="1rXfSq" id="1ALxU7rj4YY" role="3clFbG">
+                      <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
+                      <node concept="2GrUjf" id="1ALxU7rjbDi" role="37wK5m">
+                        <ref role="2Gs0qQ" node="1ALxU7rjauV" resolve="log" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="1ALxU7rj8Ah" role="2GsD0m">
+                  <node concept="1PxgMI" id="1ALxU7rj8Ai" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="1ALxU7rj8Aj" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
+                    </node>
+                    <node concept="37vLTw" id="1ALxU7rj8Ak" role="1m5AlR">
+                      <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="1ALxU7rj8Al" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM7Lv0S" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="2GrKxI" id="1ALxU7rjauV" role="2Gsz3X">
+                  <property role="TrG5h" value="log" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="1ALxU7rjc9E" role="3eNLev">
+            <node concept="2OqwBi" id="1ALxU7rjc9F" role="3eO9$A">
+              <node concept="37vLTw" id="1ALxU7rjc9G" role="2Oq$k0">
+                <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+              </node>
+              <node concept="1mIQ4w" id="1ALxU7rjc9H" role="2OqNvi">
+                <node concept="chp4Y" id="1ALxU7rjcUq" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:5itBwM7GBv1" resolve="ExpandMacroConstraint" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="1ALxU7rjc9J" role="3eOfB_">
+              <node concept="2Gpval" id="1ALxU7rjc9K" role="3cqZAp">
+                <node concept="3clFbS" id="1ALxU7rjc9L" role="2LFqv$">
+                  <node concept="3clFbF" id="1ALxU7rjc9M" role="3cqZAp">
+                    <node concept="1rXfSq" id="1ALxU7rjc9N" role="3clFbG">
+                      <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
+                      <node concept="2GrUjf" id="1ALxU7rjc9O" role="37wK5m">
+                        <ref role="2Gs0qQ" node="1ALxU7rjc9U" resolve="log" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="1ALxU7rjc9P" role="2GsD0m">
+                  <node concept="1PxgMI" id="1ALxU7rjc9Q" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="1ALxU7rjd0V" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:5itBwM7GBv1" resolve="ExpandMacroConstraint" />
+                    </node>
+                    <node concept="37vLTw" id="1ALxU7rjc9S" role="1m5AlR">
+                      <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="1ALxU7rjdhd" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM7GBKR" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="2GrKxI" id="1ALxU7rjc9U" role="2Gsz3X">
+                  <property role="TrG5h" value="log" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="1RMe_qTeMSl" role="1B3o_S" />