Commit 4897d286 authored by Sebastian Erdweg's avatar Sebastian Erdweg

added remaining inference rules for type checking MiniJava

parent 03712120
......@@ -10,8 +10,8 @@
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
<import index="z9af" ref="r:92efe085-3295-42c0-bd7e-2ea049fae522(org.inca.extensions.structure)" />
<import index="b83y" ref="r:63340c72-1a1f-4a8d-acb4-c73b4c9c590a(TypeLang.structure)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="hqsm" ref="r:aa4c3470-43ab-4dad-b73e-20da0ee43be1(org.inca.core.structure)" implicit="true" />
<import index="gcg1" ref="r:d6f14cc5-a2a7-4aaf-8f86-e35059edbf3b(org.inca.core.behavior)" implicit="true" />
</imports>
......@@ -218,23 +218,6 @@
<ref role="1M2myG" to="b83y:2_58u12cYDt" resolve="Delimiter" />
<node concept="EnEH3" id="2_58u12dRvk" role="1MhHOB">
<ref role="EomxK" to="b83y:2_58u12cYDu" resolve="text" />
<node concept="QB0g5" id="2_58u12dRvu" role="QCWH9">
<node concept="3clFbS" id="2_58u12dRvv" role="2VODD2">
<node concept="3clFbF" id="2_58u12dRAP" role="3cqZAp">
<node concept="3fqX7Q" id="2_58u12dRAN" role="3clFbG">
<node concept="2OqwBi" id="2_58u12dSeT" role="3fr31v">
<node concept="1Wqviy" id="2_58u12dRLZ" role="2Oq$k0" />
<node concept="liA8E" id="2_58u12dSRb" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence):boolean" resolve="contains" />
<node concept="Xl_RD" id="2_58u12dSZv" role="37wK5m">
<property role="Xl_RC" value=" " />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1M2fIO" id="2_58u12hfo7">
......
......@@ -74,6 +74,7 @@
<concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
<concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
<property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
<property id="1139852716018" name="noTargetText" index="1$x2rV" />
<property id="1140017977771" name="readOnly" index="1Intyy" />
<property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
......@@ -93,7 +94,9 @@
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
<child id="1219418656006" name="styleItem" index="3F10Kt" />
</concept>
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
<child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
</concept>
<concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
<concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
<child id="1225898971709" name="getter" index="1Hhtcw" />
......@@ -2182,5 +2185,112 @@
<node concept="l2Vlx" id="6OMXo1VSU57" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="6OMXo1W4qgU">
<property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:6OMXo1W4qg3" resolve="FoldJudgmentInstance" />
<node concept="3EZMnI" id="6OMXo1W4qgW" role="2wV5jI">
<node concept="3F1sOY" id="6OMXo1W4qh3" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qga" resolve="res" />
</node>
<node concept="3F0ifn" id="6OMXo1W4qh9" role="3EZMnx">
<property role="3F0ifm" value=":=" />
</node>
<node concept="3F0ifn" id="6OMXo1W4qhh" role="3EZMnx">
<property role="3F0ifm" value="fold" />
</node>
<node concept="3F1sOY" id="6OMXo1W4qhr" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qg6" resolve="list" />
</node>
<node concept="3F0ifn" id="6OMXo1W4qhB" role="3EZMnx">
<property role="3F0ifm" value="init" />
<node concept="pVoyu" id="6OMXo1W4qhX" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="lj46D" id="6OMXo1W4qi2" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="6OMXo1W4qhP" role="3EZMnx">
<property role="3F0ifm" value=":=" />
</node>
<node concept="3F1sOY" id="6OMXo1W4qig" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qg7" resolve="init" />
</node>
<node concept="3F0ifn" id="6OMXo1W4qiA" role="3EZMnx">
<property role="3F0ifm" value="step" />
<node concept="pVoyu" id="6OMXo1W4qiM" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="lj46D" id="6OMXo1W4qiR" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="6OMXo1W4qj9" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qge" resolve="stepVar" />
<node concept="3F0ifn" id="6OMXo1W5m9q" role="2ruayu" />
</node>
<node concept="3F1sOY" id="6OMXo1W4qjB" role="3EZMnx">
<property role="1$x2rV" value="acc" />
<ref role="1NtTu8" to="b83y:6OMXo1W4qgj" resolve="accVar" />
</node>
<node concept="3F0ifn" id="6OMXo1W4qk7" role="3EZMnx">
<property role="3F0ifm" value=":=" />
</node>
<node concept="3F0ifn" id="6OMXo1WduHq" role="3EZMnx">
<property role="3F0ifm" value="{" />
<node concept="ljvvj" id="6OMXo1WduIZ" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="6OMXo1WduI0" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qgp" resolve="stepBody" />
<node concept="lj46D" id="6OMXo1WduJ4" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="ljvvj" id="6OMXo1WduIX" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="6OMXo1WduIC" role="3EZMnx">
<property role="3F0ifm" value="}" />
<node concept="lj46D" id="6OMXo1WduJ8" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="l2Vlx" id="6OMXo1W4qgZ" role="2iSdaV" />
</node>
</node>
<node concept="24kQdi" id="6OMXo1W4qn6">
<property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:6OMXo1W4qgw" resolve="FoldJudgmentInstanceBody" />
<node concept="3EZMnI" id="6OMXo1WenZ6" role="2wV5jI">
<node concept="3F2HdR" id="6OMXo1W9Rs$" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qgC" resolve="judgments" />
<node concept="l2Vlx" id="6OMXo1W9RsA" role="2czzBx" />
<node concept="lj46D" id="6OMXo1W9RsX" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pj6Ft" id="6OMXo1W9RsF" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pVoyu" id="6OMXo1WbEir" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="6OMXo1WfgUb" role="3EZMnx">
<property role="3F0ifm" value="yield" />
<node concept="lj46D" id="6OMXo1WenZu" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pVoyu" id="6OMXo1WenZD" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="6OMXo1WenZm" role="3EZMnx">
<ref role="1NtTu8" to="b83y:6OMXo1W4qgy" resolve="yield" />
</node>
<node concept="l2Vlx" id="6OMXo1WenZ7" role="2iSdaV" />
</node>
</node>
</model>
......@@ -965,5 +965,76 @@
<ref role="20lvS9" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node>
</node>
<node concept="1TIwiD" id="6OMXo1W4qg3">
<property role="EcuMT" value="7868621431155827715" />
<property role="3GE5qa" value="judgment" />
<property role="TrG5h" value="FoldJudgmentInstance" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="6OMXo1W4qg4" role="PzmwI">
<ref role="PrY4T" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qga" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827722" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="res" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qg6" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827718" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="list" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="6OMXo1VI$Iz" resolve="IListMetaTerm" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qg7" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827719" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="init" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qge" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827726" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="stepVar" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qgj" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827731" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="accVar" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qgp" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827737" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="stepBody" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="6OMXo1W4qgw" resolve="FoldJudgmentInstanceBody" />
</node>
</node>
<node concept="1TIwiD" id="6OMXo1W4qgw">
<property role="EcuMT" value="7868621431155827744" />
<property role="3GE5qa" value="judgment" />
<property role="TrG5h" value="FoldJudgmentInstanceBody" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="6OMXo1W4qgC" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827752" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="judgments" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node>
<node concept="1TJgyj" id="6OMXo1W4qgy" role="1TKVEi">
<property role="IQ2ns" value="7868621431155827746" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="yield" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
</node>
</model>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment