From be156a5d314e3e75dd6f424def88fc2aae2e504d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 26 Jan 2021 12:47:18 +0100
Subject: [PATCH] Throw NPE in case an argument or symbol is null in term

---
 .../models/jetbrains.mps.logic.dataform.mps   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index cc620ff7..d30ed5a1 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -380,6 +380,23 @@
     <node concept="3clFbW" id="1msb0mq8QV7" role="jymVt">
       <node concept="3cqZAl" id="1msb0mq8QV8" role="3clF45" />
       <node concept="3clFbS" id="1msb0mq8QVa" role="3clF47">
+        <node concept="3clFbJ" id="1RYTbd7HJZO" role="3cqZAp">
+          <node concept="3clFbS" id="1RYTbd7HJZQ" role="3clFbx">
+            <node concept="YS8fn" id="1RYTbd7HK7U" role="3cqZAp">
+              <node concept="2ShNRf" id="1RYTbd7HK8R" role="YScLw">
+                <node concept="1pGfFk" id="1RYTbd7HKnI" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="1RYTbd7HK5M" role="3clFbw">
+            <node concept="10Nm6u" id="1RYTbd7HK6U" role="3uHU7w" />
+            <node concept="37vLTw" id="1RYTbd7HK1Z" role="3uHU7B">
+              <ref role="3cqZAo" node="1msb0mq8QWr" resolve="symbol" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1msb0mq8QXE" role="3cqZAp">
           <node concept="37vLTI" id="1msb0mq8QXG" role="3clFbG">
             <node concept="2OqwBi" id="1msb0mq8QXK" role="37vLTJ">
@@ -1549,6 +1566,23 @@
         </node>
         <node concept="1DcWWT" id="77mpfA3RgQl" role="3cqZAp">
           <node concept="3clFbS" id="77mpfA3RgQn" role="2LFqv$">
+            <node concept="3clFbJ" id="1RYTbd7Hw8i" role="3cqZAp">
+              <node concept="3clFbS" id="1RYTbd7Hw8k" role="3clFbx">
+                <node concept="YS8fn" id="1RYTbd7Hwmv" role="3cqZAp">
+                  <node concept="2ShNRf" id="1RYTbd7Hwn4" role="YScLw">
+                    <node concept="1pGfFk" id="1RYTbd7Hw_V" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="1RYTbd7Hwld" role="3clFbw">
+                <node concept="10Nm6u" id="1RYTbd7HwlR" role="3uHU7w" />
+                <node concept="37vLTw" id="1RYTbd7Hwa_" role="3uHU7B">
+                  <ref role="3cqZAo" node="77mpfA3RgQo" resolve="arg" />
+                </node>
+              </node>
+            </node>
             <node concept="3clFbJ" id="77mpfA3RhKn" role="3cqZAp">
               <node concept="3clFbS" id="77mpfA3RhKp" role="3clFbx">
                 <node concept="3clFbF" id="77mpfA3Ri0z" role="3cqZAp">