add checkError

bfeedd2a · André Pacak · d6602f99 · bfeedd2a · bfeedd2a
Commit bfeedd2a authored Aug 06, 2019 by André Pacak
Showing with 117 additions and 62 deletions

inca-translation/.mps/workspace.xml inca-translation/.mps/workspace.xml +61 -62

inca-translation/solutions/SumTypes_Checker/models/model.mps inca-translation/solutions/SumTypes_Checker/models/model.mps +56 -0

No files found.
--- a/inca-translation/.mps/workspace.xml
+++ b/inca-translation/.mps/workspace.xml
@@ -8,7 +8,6 @@
  <component name="ChangeListManager">
    <list default="true" id="676692ec-cd16-4102-9017-0f40d5cf3cc0" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.mps/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.mps/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/solutions/SumTypes_Checker/models/model.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/SumTypes_Checker/models/model.mps" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../src/ExtendedTLC/Base.hs" beforeDir="false" afterPath="$PROJECT_DIR$/../src/ExtendedTLC/Base.hs" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../src/ExtendedTLC/EliminateContextArgument.hs" beforeDir="false" afterPath="$PROJECT_DIR$/../src/ExtendedTLC/EliminateContextArgument.hs" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../src/ExtendedTLC/EliminateTypeArgumentOfCheck.hs" beforeDir="false" afterPath="$PROJECT_DIR$/../src/ExtendedTLC/EliminateTypeArgumentOfCheck.hs" afterDir="false" />
@@ -35,7 +34,7 @@
        <TabState>
          <option name="title" value="Console" />
          <tab>
-            <model ref="2b983704-1311-467c-a32a-5577f9eca39c/r:21eb5075-1bda-40be-a471-2e461d8b5bfe(TempModule2b983704-1311-467c-a32a-5577f9eca39c/TempModel_87207266803392)">
+            <model ref="e7ef8b00-55cc-4878-8e36-a84f4b09358f/r:543c6c31-57f5-480f-9ff7-b454d4a3adb4(TempModulee7ef8b00-55cc-4878-8e36-a84f4b09358f/TempModel_1201324111790)">
              <persistence version="9" />
              <languages>
                <devkit ref="70d3d6da-af63-483d-a75f-9c8acf8de332(jetbrains.mps.console.devkit)" />
@@ -55,11 +54,11 @@
                  <concept id="757553790980850366" name="jetbrains.mps.console.base.structure.History" flags="ng" index="3balQm" />
                </language>
              </registry>
-              <node concept="aymSD" id="5nh18u9eLXV">
-                <node concept="3balQm" id="5nh18u9eLXW" role="aymYE" />
-                <node concept="2Clz$F" id="5nh18u9eLXX" role="aymYO" />
-                <node concept="2_V_lH" id="5nh18u9eLXY" role="1PhJh3">
-                  <ref role="2_V_lI" node="5nh18u9eLXX" resolve="CommandHolder" />
+              <node concept="aymSD" id="3LD9l6bM4va">
+                <node concept="3balQm" id="3LD9l6bM4vb" role="aymYE" />
+                <node concept="2Clz$F" id="3LD9l6bM4vc" role="aymYO" />
+                <node concept="2_V_lH" id="3LD9l6bM4vd" role="1PhJh3">
+                  <ref role="2_V_lI" node="3LD9l6bM4vc" resolve="CommandHolder" />
                </node>
              </node>
            </model>
@@ -171,7 +170,7 @@
                  </collapsedElement>
                </restoreAlways>
              </memento>
-              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
                <selectionStack />
                <errorMarkers />
                <transactionalProperties />
@@ -190,15 +189,15 @@
        <entry file="mps://node://SumTypes_Checker/SumTypes_Checker.model/Typing">
          <provider selected="true" editor-type-id="MPSFileEditor">
            <state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState" editorFocused="true">
-              <memento saveSessionState="false" viewPositionX="0" viewPositionY="101">
+              <memento saveSessionState="false" viewPositionX="0" viewPositionY="49">
                <selectionStack>
                  <stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
                    <property name="hasNonTrivialSelection" value="false" />
-                    <property name="caretX" value="22" />
+                    <property name="caretX" value="212" />
                    <property name="caretXRelative" value="7" />
                    <property name="sideSelectDirection" value="NONE" />
-                    <cellInfo cellId="Constant_630h0h_c0">
-                      <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" />
+                    <cellInfo cellId="Constant_k4kwan_e0">
+                      <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" />
                    </cellInfo>
                  </stackElement>
                </selectionStack>
@@ -213,7 +212,7 @@
                </foldable>
                <restoreAlways />
              </memento>
-              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
                <selectionStack />
                <errorMarkers />
                <transactionalProperties />
@@ -253,7 +252,7 @@
                <foldable />
                <restoreAlways />
              </memento>
-              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+              <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
                <selectionStack />
                <errorMarkers />
                <transactionalProperties />
@@ -290,10 +289,10 @@
    </option>
  </component>
  <component name="ProjectFrameBounds">
-    <option name="x" value="960" />
+    <option name="x" value="480" />
    <option name="y" value="23" />
    <option name="width" value="960" />
-    <option name="height" value="1057" />
+    <option name="height" value="877" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectPluginManager">
@@ -556,7 +555,7 @@
    <configuration />
  </component>
  <component name="ToolWindowManager">
-    <frame x="960" y="23" width="960" height="1057" extended-state="0" />
+    <frame x="480" y="23" width="960" height="877" extended-state="0" />
    <editor active="true" />
    <layout>
      <window_info content_ui="combo" id="Project" order="0" weight="0.20305677" />
@@ -578,7 +577,7 @@
      <window_info anchor="bottom" id="Chart" order="14" />
      <window_info anchor="bottom" id="Generation Tracer" order="15" />
      <window_info anchor="bottom" id="Classpath Explorer" order="16" />
-      <window_info active="true" anchor="bottom" id="Documentation" order="17" visible="true" weight="0.3409802" />
+      <window_info active="true" anchor="bottom" id="Documentation" order="17" visible="true" weight="0.34274712" />
      <window_info anchor="bottom" id="Usages" order="18" weight="0.33376125" />
      <window_info anchor="bottom" id="Node Explorer" order="19" />
      <window_info anchor="bottom" id="Module Dependencies" order="20" />
@@ -1430,44 +1429,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="mps://node://SumTypes_Checker/SumTypes_Checker.model/Test">
-      <provider selected="true" editor-type-id="MPSFileEditor">
-        <state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
-          <memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
-            <selectionStack>
-              <stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
-                <property name="hasNonTrivialSelection" value="false" />
-                <property name="caretX" value="64" />
-                <property name="caretXRelative" value="0" />
-                <property name="sideSelectDirection" value="NONE" />
-                <cellInfo cellId="property_name">
-                  <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/7775541183377581960" />
-                </cellInfo>
-              </stackElement>
-            </selectionStack>
-            <errorMarkers>
-              <errorMarker text="" propertyCell="false" cellId="Error">
-                <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/7775541183377581961" />
-              </errorMarker>
-            </errorMarkers>
-            <transactionalProperties />
-            <foldable />
-            <restoreAlways />
-          </memento>
-          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
-            <selectionStack />
-            <errorMarkers />
-            <transactionalProperties />
-            <foldable />
-            <restoreAlways />
-            <enabledHints>
-              <enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor_doNotUseThisHint" />
-              <enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
-            </enabledHints>
-          </inspectorMemento>
-        </state>
-      </provider>
-    </entry>
    <entry file="mps://node://SumTypes_Checker/SumTypes_Checker.model/LType">
      <provider selected="true" editor-type-id="MPSFileEditor">
        <state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
@@ -1555,7 +1516,45 @@
              </collapsedElement>
            </restoreAlways>
          </memento>
-          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+            <selectionStack />
+            <errorMarkers />
+            <transactionalProperties />
+            <foldable />
+            <restoreAlways />
+            <enabledHints>
+              <enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor_doNotUseThisHint" />
+              <enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
+            </enabledHints>
+          </inspectorMemento>
+        </state>
+      </provider>
+    </entry>
+    <entry file="mps://node://SumTypes_Checker/SumTypes_Checker.model/Test">
+      <provider selected="true" editor-type-id="MPSFileEditor">
+        <state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
+          <memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
+            <selectionStack>
+              <stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
+                <property name="hasNonTrivialSelection" value="false" />
+                <property name="caretX" value="64" />
+                <property name="caretXRelative" value="0" />
+                <property name="sideSelectDirection" value="NONE" />
+                <cellInfo cellId="property_name">
+                  <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/7775541183377581960" />
+                </cellInfo>
+              </stackElement>
+            </selectionStack>
+            <errorMarkers>
+              <errorMarker text="" propertyCell="false" cellId="Error">
+                <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/7775541183377581961" />
+              </errorMarker>
+            </errorMarkers>
+            <transactionalProperties />
+            <foldable />
+            <restoreAlways />
+          </memento>
+          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
            <selectionStack />
            <errorMarkers />
            <transactionalProperties />
@@ -1572,15 +1571,15 @@
    <entry file="mps://node://SumTypes_Checker/SumTypes_Checker.model/Typing">
      <provider selected="true" editor-type-id="MPSFileEditor">
        <state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState" editorFocused="true">
-          <memento saveSessionState="false" viewPositionX="0" viewPositionY="101">
+          <memento saveSessionState="false" viewPositionX="0" viewPositionY="49">
            <selectionStack>
              <stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
                <property name="hasNonTrivialSelection" value="false" />
-                <property name="caretX" value="22" />
+                <property name="caretX" value="212" />
                <property name="caretXRelative" value="7" />
                <property name="sideSelectDirection" value="NONE" />
-                <cellInfo cellId="Constant_630h0h_c0">
-                  <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" />
+                <cellInfo cellId="Constant_k4kwan_e0">
+                  <node node_reference="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" />
                </cellInfo>
              </stackElement>
            </selectionStack>
@@ -1595,7 +1594,7 @@
            </foldable>
            <restoreAlways />
          </memento>
-          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526505608" saveSessionState="false" viewPositionX="0" viewPositionY="0">
+          <inspectorMemento currentlyEditedNode="r:7f6445f1-fd3e-4963-8d4e-6aee490660f0(SumTypes_Checker.model)/6183728743526516507" saveSessionState="false" viewPositionX="0" viewPositionY="0">
            <selectionStack />
            <errorMarkers />
            <transactionalProperties />

--- a/inca-translation/solutions/SumTypes_Checker/models/model.mps
+++ b/inca-translation/solutions/SumTypes_Checker/models/model.mps
@@ -19,6 +19,9 @@
  </imports>
  <registry>
    <language id="8c9a2720-9d21-4370-a226-819eb3e76e1e" name="org.inca.fun">
+      <concept id="5746856838774042406" name="org.inca.fun.structure.Def" flags="ng" index="2dT$3Y">
+        <child id="5746856838774042549" name="expression" index="2dT$1H" />
+      </concept>
      <concept id="996292992024530460" name="org.inca.fun.structure.PatternFunctionCall" flags="ng" index="2k1GkI">
        <child id="996292992028393460" name="call" index="2nKVj6" />
      </concept>
@@ -1719,6 +1722,59 @@
      </node>
    </node>
    <node concept="1XdyHe" id="5nh18u9fHnw" role="1dubk0" />
+    <node concept="3zyOaB" id="3LD9l6bMfWV" role="1dubk0">
+      <property role="TrG5h" value="checkError" />
+      <node concept="3zV_Rz" id="3LD9l6bMfWW" role="3zVECS">
+        <node concept="19sAKZ" id="3LD9l6bMjpq" role="1dgzf0">
+          <node concept="30KbLJ" id="3LD9l6bMjpr" role="19sVOa">
+            <property role="TrG5h" value="term" />
+          </node>
+          <node concept="19NcOt" id="3LD9l6bMjqe" role="19sVOf">
+            <node concept="2kdjtB" id="3LD9l6bMjqc" role="19NcOs">
+              <ref role="2UGuZ7" to="xkot:1Da9ityUTbh" resolve="Term" />
+            </node>
+          </node>
+          <node concept="CU8gp" id="3LD9l6bMjpt" role="19sVO2">
+            <node concept="34ocy7" id="3LD9l6bMjqL" role="1dgzf0">
+              <node concept="2dT$3Y" id="3LD9l6bMjrk" role="34ocs8">
+                <node concept="2k1GkI" id="3LD9l6bMjsg" role="2dT$1H">
+                  <node concept="2k1_uq" id="3LD9l6bMjse" role="2nKVj6">
+                    <ref role="2nKBpL" node="5nh18u8IaY1" resolve="required" />
+                    <node concept="30NkWi" id="3LD9l6bMjsN" role="2nKBpO">
+                      <ref role="XkjO9" node="3LD9l6bMjpr" resolve="term" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="34ocy7" id="3LD9l6bMlG_" role="1dgzf0">
+              <node concept="34sUYq" id="3LD9l6bMlHV" role="34ocs8">
+                <node concept="2k1GkI" id="3LD9l6bMlJb" role="34sUSb">
+                  <node concept="2k1_uq" id="3LD9l6bMlJ9" role="2nKVj6">
+                    <ref role="2nKBpL" node="6JCho9VDhNF" resolve="check" />
+                    <node concept="30NkWi" id="3LD9l6bMlK8" role="2nKBpO">
+                      <ref role="XkjO9" node="3LD9l6bMjpr" resolve="term" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="Muu81" id="3LD9l6bModL" role="1dgzf0">
+              <node concept="MupYM" id="3LD9l6bMofZ" role="Muu86" />
+              <node concept="30NkWi" id="3LD9l6bMohI" role="Muu87">
+                <ref role="XkjO9" node="3LD9l6bMjpr" resolve="term" />
+              </node>
+              <node concept="MuuBa" id="3LD9l6bModP" role="Muu84">
+                <node concept="Mu3nt" id="3LD9l6bMojL" role="MuuBj">
+                  <property role="Mu3ny" value="check failed" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1XdyHe" id="3LD9l6bM99s" role="1dubk0" />
    <node concept="C6Zt3" id="6JCho9VDhCo" role="xaH5_">
      <ref role="ws7DW" node="6JCho9VD4ev" resolve="LType" />
    </node>