Commit cae4687d authored by André Pacak's avatar André Pacak
Browse files

working type checker for variant types in IncA

parent e961a976
......@@ -7,59 +7,22 @@
</component>
<component name="ChangeListManager">
<list default="true" id="676692ec-cd16-4102-9017-0f40d5cf3cc0" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/GrammarCellsSubstituteMenu_ITerm.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/classes_gen/VariantTypes_Checker/test/ok_simple_lookup/trace.info" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_simple_lookup.mps" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_simple_lookup/dependencies" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_simple_lookup/generated" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_ConditionCaseQuerySpecification.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/test/ok_simple_lookup/trace.info" afterDir="false" />
<change afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_LookupCaseConditionQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.mps/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.mps/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/editor/trace.info" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/editor/trace.info" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/structure/aspectcps-descriptorclasses.mps" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/structure/aspectcps-descriptorclasses.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/structure/trace.info" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/classes_gen/VariantTypes/structure/trace.info" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/models/structure.mps" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/models/structure.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/editor/dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/editor/dependencies" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/editor/generated" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/editor/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/generated" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/structure/generated" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen.caches/VariantTypes/structure/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/Add_EditorBuilder_a.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/Add_EditorBuilder_a.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/App_EditorBuilder_a.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/App_EditorBuilder_a.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/EditorAspectDescriptorImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/EditorAspectDescriptorImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/GrammarActionsDescriptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/GrammarActionsDescriptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/GrammarCellsSubstituteMenu_Term.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/GrammarCellsSubstituteMenu_ExpTerm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/Let_EditorBuilder_a.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/Let_EditorBuilder_a.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/trace.info" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/editor/trace.info" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/ConceptPresentationAspectImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/ConceptPresentationAspectImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/LanguageConceptSwitch.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/LanguageConceptSwitch.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/StructureAspectDescriptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/StructureAspectDescriptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/aspectcps-descriptorclasses.mps" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/aspectcps-descriptorclasses.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/trace.info" beforeDir="false" afterPath="$PROJECT_DIR$/languages/VariantTypes/source_gen/VariantTypes/structure/trace.info" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/classes_gen/VariantTypes_Checker/model/trace.info" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/classes_gen/VariantTypes_Checker/model/trace.info" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/model.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/model.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.fail_match_not_variant.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.fail_match_not_variant.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.fail_unequal_types_cases.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.fail_unequal_types_cases.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_cases_same_binding.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_cases_same_binding.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_different_order.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_different_order.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_shadow_binding.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_shadow_binding.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_single.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_single.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_two.mps" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/models/test.ok_match_two.mps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/model/dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/model/dependencies" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/model/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/model/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/fail_match_not_variant/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/fail_match_not_variant/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/fail_unequal_types_cases/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/fail_unequal_types_cases/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_cases_same_binding/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_cases_same_binding/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_different_order/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_different_order/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_shadow_binding/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_shadow_binding/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_single/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_single/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_two/generated" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen.caches/VariantTypes_Checker/test/ok_match_two/generated" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/QuerySpecificationHints.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/QuerySpecificationHints.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AllvarsQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AllvarsQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeVariantQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeVariantQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeVariant_WrappedQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_AsLTypeVariant_WrappedQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_CheckErrorQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_CheckErrorQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_CheckQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_CheckQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_ConditionCaseQuerySpecification.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_InferQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_InferQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_Infer_WrappedQuerySpecification.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_LookupFailureQuerySpecification.java" beforeDir="false" afterPath="$PROJECT_DIR$/solutions/VariantTypes_Checker/source_gen/VariantTypes_Checker/model/Typing_LookupFailureQuerySpecification.java" afterDir="false" />
......@@ -145,14 +108,10 @@
<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="527" />
<property name="caretXRelative" value="24" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="Constant_s6y1qd_a">
<node node_reference="r:80294164-e888-44a0-ba22-3face65ddbcf(VariantTypes_Checker.test.ok_match_single)/3402207517369893738" />
</cellInfo>
<stackElement className="org.inca.ui.plugin.MatchSelection" moduleID="50774306-a9df-40b3-8571-64880ad234e2(org.inca.ui)">
<property name="modelRef" value="r:80294164-e888-44a0-ba22-3face65ddbcf(VariantTypes_Checker.test.ok_match_single)" />
<property name="nodeId_0" value="3402207517369893707" />
<property name="numberOfNodes" value="1" />
</stackElement>
</selectionStack>
<errorMarkers />
......@@ -160,7 +119,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -176,18 +135,18 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.ok_match_two/OkMatchTwo">
<entry file="mps://node://VariantTypes/VariantTypes.structure/Type">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="751" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="263" />
<property name="caretXRelative" value="0" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:2537f932-f3a5-4fde-8ad7-c6541a571f8c(VariantTypes_Checker.test.ok_match_two)/3402207517369893312" />
<cellInfo cellId="Constant_7v1nzk_a1c0a">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273039" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -196,7 +155,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -207,6 +166,7 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273039" />
</state>
</provider>
</entry>
......@@ -215,15 +175,15 @@
<entry file="mps://node://VariantTypes_Checker/VariantTypes_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="1587">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="2328">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="249" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="183" />
<property name="caretXRelative" value="40" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="Constant_k4kwan_e0">
<node node_reference="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" />
<cellInfo cellId="property_name">
<node node_reference="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -238,7 +198,7 @@
</foldable>
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -254,27 +214,33 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.ok_match_cases_same_binding/OkMatchCasesSameBinding">
<entry file="mps://node://org.inca.gp#4530729936991344011/org.inca.gp.generator.template.main@generator/removeSuperfluousConceptConstraint">
<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="687" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="135" />
<property name="caretXRelative" value="0" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:134647b5-c93f-4462-b6a8-4b558f519866(VariantTypes_Checker.test.ok_match_cases_same_binding)/3402207517370292727" />
<node node_reference="r:d7788ae3-4afe-431e-a7ca-f1369bead1e8(org.inca.gp.generator.template.main@generator)/2902997482898814960" />
</cellInfo>
</stackElement>
</selectionStack>
<errorMarkers />
<transactionalProperties />
<foldable />
<foldable>
<collapsedElement isCollapsed="false">
<cellIdElement cellId="Collection_trik0f_b0">
<node node_reference="r:d7788ae3-4afe-431e-a7ca-f1369bead1e8(org.inca.gp.generator.template.main@generator)/2902997482898814961" />
</cellIdElement>
</collapsedElement>
</foldable>
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -290,18 +256,18 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.ok_match_different_order/OkMatchDifferentOrder">
<entry file="mps://node://VariantTypes/VariantTypes.structure/Term">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="791" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="119" />
<property name="caretXRelative" value="88" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:b86781b4-8a26-4291-bd64-072692a64465(VariantTypes_Checker.test.ok_match_different_order)/3402207517370291992" />
<cellInfo cellId="Constant_7v1nzk_h1c0">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356272849" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -310,7 +276,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -321,23 +287,24 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356272849" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.ok_match_shadow_binding/OkMatchShadowBinding">
<entry file="mps://node://VariantTypes/VariantTypes.structure/VariantType">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="239" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="71" />
<property name="caretXRelative" value="56" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:ca582064-e735-4859-9ec8-8131c304c76d(VariantTypes_Checker.test.ok_match_shadow_binding)/3402207517370292416" />
<cellInfo cellId="Constant_ueqr71_c0a">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/2294833391481651910" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -346,7 +313,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -357,23 +324,24 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/2294833391481651910" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.fail_match_not_variant/FailMatchNotVariant">
<entry file="mps://node://VariantTypes/VariantTypes.structure/Case">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="279" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="207" />
<property name="caretXRelative" value="0" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:a94d52e9-b58e-4bde-ba1d-231755a66774(VariantTypes_Checker.test.fail_match_not_variant)/3402207517370293261" />
<cellInfo cellId="Constant_ueqr71_a1b4a0">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/658257277626152737" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -382,7 +350,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -393,23 +361,24 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/658257277626152737" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.fail_unequal_types_cases/FailUnequalTypesCases">
<entry file="mps://node://VariantTypes/VariantTypes.structure/VariantTypeEntry">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="751" />
<property name="caretXRelative" value="8" />
<property name="caretX" value="71" />
<property name="caretXRelative" value="56" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:8bec8a94-d66b-4337-a523-f4c6eadcb284(VariantTypes_Checker.test.fail_unequal_types_cases)/3402207517370293558" />
<cellInfo cellId="Constant_ueqr71_c0a">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/2294833391481651919" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -418,7 +387,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -429,23 +398,24 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/2294833391481651919" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.fail_wrong_label/FailWrongLabel">
<entry file="mps://node://VariantTypes/VariantTypes.structure/Nat">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="71" />
<property name="caretXRelative" value="0" />
<property name="caretXRelative" value="56" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:60c38956-03a5-404e-a831-38ee6a02b96e(VariantTypes_Checker.test.fail_wrong_label)/3402207517370293006" />
<cellInfo cellId="Constant_ueqr71_c0a">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273132" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -454,7 +424,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -465,23 +435,24 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273132" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="mps://node://VariantTypes_Checker/VariantTypes_Checker.test.fail_wrong_type_for_tag/FailWrongTypeForTag">
<entry file="mps://node://VariantTypes/VariantTypes.structure/ParensType">
<provider selected="true" editor-type-id="MPSFileEditor">
<state class="jetbrains.mps.ide.editor.BaseNodeEditor$BaseEditorState">
<state class="jetbrains.mps.ide.editor.tabs.TabbedEditor$TabbedEditorState">
<memento saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack>
<stackElement className="jetbrains.mps.nodeEditor.selection.EditorCellLabelSelection">
<property name="hasNonTrivialSelection" value="false" />
<property name="caretX" value="71" />
<property name="caretXRelative" value="0" />
<property name="caretXRelative" value="56" />
<property name="sideSelectDirection" value="NONE" />
<cellInfo cellId="property_name">
<node node_reference="r:4c0ace86-b74a-4b0c-a36a-42c13c487d6f(VariantTypes_Checker.test.fail_wrong_type_for_tag)/3402207517370292817" />
<cellInfo cellId="Constant_ueqr71_c0a">
<node node_reference="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273146" />
</cellInfo>
</stackElement>
</selectionStack>
......@@ -490,7 +461,7 @@
<foldable />
<restoreAlways />
</memento>
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/224259003508001431" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<inspectorMemento currentlyEditedNode="r:57415604-d587-413c-ace0-857998fadcf8(VariantTypes_Checker.model)/2294833391489025186" saveSessionState="false" viewPositionX="0" viewPositionY="0">
<selectionStack />
<errorMarkers />
<transactionalProperties />
......@@ -501,6 +472,7 @@
<enabledHintsElement enabledHintsAttribute="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
</enabledHints>
</inspectorMemento>
<node node_ref="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure)/1894367444356273146" />
</state>
</provider>
</entry>
......@@ -529,6 +501,7 @@
<component name="NodeEditorSearchHistory">
<option name="searches">
<list>
<option value="required" />
<option value="Bot" />
<option value="false" />
<option value="CC" />
......@@ -790,78 +763,6 @@
<panes>
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ca075e5a-5554-4bc1-b03e-f6edd882bbc2" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:80294164-e888-44a0-ba22-3face65ddbcf(VariantTypes_Checker.test.ok_match_single) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/solutions/VariantTypes_Checker/models/test.ok_match_single.mps]" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ca075e5a-5554-4bc1-b03e-f6edd882bbc2" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:a94d52e9-b58e-4bde-ba1d-231755a66774(VariantTypes_Checker.test.fail_match_not_variant) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/solutions/VariantTypes_Checker/models/test.fail_match_not_variant.mps]" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ca075e5a-5554-4bc1-b03e-f6edd882bbc2" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:134647b5-c93f-4462-b6a8-4b558f519866(VariantTypes_Checker.test.ok_match_cases_same_binding) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/solutions/VariantTypes_Checker/models/test.ok_match_cases_same_binding.mps]" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
......@@ -876,43 +777,7 @@
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="type" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ca075e5a-5554-4bc1-b03e-f6edd882bbc2" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Project" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ca075e5a-5554-4bc1-b03e-f6edd882bbc2" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:ca5e44b2-3da6-47ec-b23a-250e58e1b434(VariantTypes_Checker.test.ok_three_variant) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/solutions/VariantTypes_Checker/models/test.ok_three_variant.mps]" />
<option name="myItemId" value="term" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
......@@ -943,14 +808,6 @@
<option name="myItemId" value="VariantTypes_Checker" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:ca582064-e735-4859-9ec8-8131c304c76d(VariantTypes_Checker.test.ok_match_shadow_binding) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/solutions/VariantTypes_Checker/models/test.ok_match_shadow_binding.mps]" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
......@@ -961,20 +818,12 @@
<option name="myItemId" value="3ace5b6c-22d5-4933-9217-595f2ebf8d6a(VariantTypes)" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="r:cc1f3bc7-690e-4d71-8bfd-44a4ce63edf7(VariantTypes.structure) in IdeaFile[file:///Users/andiderp/repos/itypes/inca-translation/languages/VariantTypes/models/structure.mps]" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>