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

added more models, problem with t1_t3 currently this version does not work

one problem is that there is now case for the beginning of type checking (empty context)
parent fcdde1d7
......@@ -13023,19 +13023,29 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6OMXo1UPM9M" role="3cqZAp">
<node concept="2OqwBi" id="6OMXo1UPM9N" role="3clFbG">
<node concept="liA8E" id="6OMXo1UPM9P" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<node concept="2OqwBi" id="6OMXo1UPM9Q" role="37wK5m">
<node concept="37vLTw" id="6OMXo1UPM9R" role="2Oq$k0">
<ref role="3cqZAo" node="6OMXo1UPM9E" resolve="rulebody" />
</node>
<node concept="3Tsc0h" id="6OMXo1UPM9S" role="2OqNvi">
<ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
<node concept="3cpWs8" id="3S6Aqr3Lo4N" role="3cqZAp">
<node concept="3cpWsn" id="3S6Aqr3Lo4O" role="3cpWs9">
<property role="TrG5h" value="block" />
<node concept="3Tqbb2" id="3S6Aqr3Lo4b" role="1tU5fm">
<ref role="ehGHo" to="tpee:fK9aQHR" resolve="BlockStatement" />
</node>
<node concept="2pJPEk" id="3S6Aqr3Lo4P" role="33vP2m">
<node concept="2pJPED" id="3S6Aqr3Lo4Q" role="2pJPEn">
<ref role="2pJxaS" to="tpee:fK9aQHR" resolve="BlockStatement" />
<node concept="2pIpSj" id="3S6Aqr3Lo4R" role="2pJxcM">
<ref role="2pIpSl" to="tpee:fK9aQHS" resolve="statements" />
<node concept="36biLy" id="3S6Aqr3Lo4S" role="2pJxcZ">
<node concept="37vLTw" id="3S6Aqr3Lo4U" role="36biLW">
<ref role="3cqZAo" node="6OMXo1UPM9E" resolve="rulebody" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6OMXo1UPM9M" role="3cqZAp">
<node concept="2OqwBi" id="6OMXo1UPM9N" role="3clFbG">
<node concept="2OqwBi" id="6OMXo1UVpf6" role="2Oq$k0">
<node concept="2OqwBi" id="6OMXo1UVpf7" role="2Oq$k0">
<node concept="37vLTw" id="6OMXo1UVpf8" role="2Oq$k0">
......@@ -13049,6 +13059,11 @@
<ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
</node>
</node>
<node concept="TSZUe" id="3S6Aqr3LuXq" role="2OqNvi">
<node concept="37vLTw" id="3S6Aqr3Lvnx" role="25WWJ7">
<ref role="3cqZAo" node="3S6Aqr3Lo4O" resolve="block" />
</node>
</node>
</node>
</node>
</node>
......@@ -13539,7 +13554,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="6OMXo1UywFX" role="3cqZAp" />
<node concept="3cpWs6" id="6OMXo1Uyxtb" role="3cqZAp">
<node concept="37vLTw" id="6OMXo1VpXVD" role="3cqZAk">
<ref role="3cqZAo" node="6OMXo1VpQ56" resolve="rootlist" />
......@@ -2968,9 +2968,7 @@
<node concept="avzCv" id="6faGdFztht0" role="avys_">
<node concept="3clFbS" id="6faGdFztht1" role="2VODD2">
<node concept="3cpWs6" id="6faGdFzth$n" role="3cqZAp">
<node concept="3clFbT" id="6faGdFzthN5" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
<node concept="3clFbT" id="6faGdFzthN5" role="3cqZAk" />
</node>
</node>
</node>
......
......@@ -226,6 +226,10 @@
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq" />
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="6329021646629175155" name="commentPart" index="3SKWNk" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
</language>
......@@ -607,6 +611,19 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="7kcFSsqfSIo" role="jymVt">
<property role="TrG5h" value="printTuples" />
<node concept="3Tm1VV" id="7kcFSsqfSIq" role="1B3o_S" />
<node concept="3cqZAl" id="7kcFSsqfSIr" role="3clF45" />
<node concept="3clFbS" id="7kcFSsqfSIs" role="3clF47">
<node concept="3SKdUt" id="7kcFSsqfTq5" role="3cqZAp">
<node concept="3SKdUq" id="7kcFSsqfTq6" role="3SKWNk" />
</node>
</node>
<node concept="2AHcQZ" id="7kcFSsqfSIt" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="1qgtRARGDmm" role="jymVt" />
<node concept="3clFb_" id="7Xsfc_nKpS7" role="jymVt">
<property role="TrG5h" value="getName" />
......
......@@ -136,6 +136,7 @@
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
......@@ -158,6 +159,9 @@
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
......@@ -607,6 +611,95 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7kcFSsqaeqJ" role="jymVt" />
<node concept="2tJIrI" id="7kcFSsqaeSR" role="jymVt" />
<node concept="3clFb_" id="7kcFSsqafx$" role="jymVt">
<property role="TrG5h" value="printTuples" />
<node concept="3Tm1VV" id="7kcFSsqafxA" role="1B3o_S" />
<node concept="3cqZAl" id="7kcFSsqafxB" role="3clF45" />
<node concept="3clFbS" id="7kcFSsqafxC" role="3clF47">
<node concept="3clFbF" id="7kcFSsqagc1" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqagx4" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqagdx" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqagR1" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqahIW" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqahN3" role="3uHU7w">
<ref role="37wK5l" node="2GXA5BXOuZf" resolve="getNumberOfTuplesInTyped" />
</node>
<node concept="Xl_RD" id="7kcFSsqagSh" role="3uHU7B">
<property role="Xl_RC" value="typeOf: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqajgJ" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqajgK" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqajgL" role="2Oq$k0">
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="7kcFSsqajgM" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqajgN" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqap3b" role="3uHU7w">
<ref role="37wK5l" node="72nGkaoe0hL" resolve="getNumberOfTuplesInADTType" />
</node>
<node concept="Xl_RD" id="7kcFSsqajgP" role="3uHU7B">
<property role="Xl_RC" value="type_adttype: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaiJW" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaiJX" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaiJY" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqaiJZ" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaiK0" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqamar" role="3uHU7w">
<ref role="37wK5l" node="72nGkaodXGz" resolve="getNumberOfTuplesInLookup" />
</node>
<node concept="Xl_RD" id="7kcFSsqaiK2" role="3uHU7B">
<property role="Xl_RC" value="lookup: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaikP" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaikQ" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaikR" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqaikS" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaikT" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqakIG" role="3uHU7w">
<ref role="37wK5l" node="72nGkaodUQP" resolve="getNumberOfTuplesInErrors" />
</node>
<node concept="Xl_RD" id="7kcFSsqaikV" role="3uHU7B">
<property role="Xl_RC" value="typeOf_errors: " />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="7kcFSsqafxD" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7kcFSsqaq4S" role="jymVt" />
<node concept="3clFb_" id="7Xsfc_nKpS7" role="jymVt">
<property role="TrG5h" value="getName" />
<node concept="3Tm1VV" id="7Xsfc_nKpS9" role="1B3o_S" />
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -139,6 +139,7 @@
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
......@@ -161,6 +162,9 @@
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
......@@ -395,6 +399,13 @@
<ref role="Vdrjr" node="59rzbLoQnLE" resolve="type_adttype" />
</node>
</node>
<node concept="312cEg" id="7kcFSsqaQBI" role="jymVt">
<property role="TrG5h" value="evaluatorAllVars" />
<node concept="3Tm1VV" id="7kcFSsqaPcK" role="1B3o_S" />
<node concept="VdqW6" id="7kcFSsqaQkp" role="1tU5fm">
<ref role="Vdrjr" node="59rzbLoQnLK" resolve="allVars" />
</node>
</node>
<node concept="2tJIrI" id="59rzbLoQnIm" role="jymVt" />
<node concept="312cEg" id="59rzbLoQnIn" role="jymVt">
<property role="TrG5h" value="scope" />
......@@ -472,6 +483,19 @@
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaRUq" role="3cqZAp">
<node concept="37vLTI" id="7kcFSsqaSnW" role="3clFbG">
<node concept="2UzQ1s" id="7kcFSsqaS$B" role="37vLTx">
<ref role="2UzQ1C" node="59rzbLoQnLK" resolve="allVars" />
<node concept="37vLTw" id="7kcFSsqaSHx" role="HflyE">
<ref role="3cqZAo" node="59rzbLoQnIV" resolve="scope" />
</node>
</node>
<node concept="37vLTw" id="7kcFSsqaRUo" role="37vLTJ">
<ref role="3cqZAo" node="7kcFSsqaQBI" resolve="evaluatorAllVars" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="59rzbLoQnIU" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
......@@ -628,6 +652,115 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7kcFSsqaFyG" role="jymVt" />
<node concept="3clFb_" id="7kcFSsqaKcW" role="jymVt">
<property role="TrG5h" value="printTuples" />
<node concept="3Tm1VV" id="7kcFSsqaKcX" role="1B3o_S" />
<node concept="3cqZAl" id="7kcFSsqaKcY" role="3clF45" />
<node concept="3clFbS" id="7kcFSsqaKcZ" role="3clF47">
<node concept="3clFbF" id="7kcFSsqaKd0" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaKd1" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaKd2" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqaKd3" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaKd4" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqaKd5" role="3uHU7w">
<ref role="37wK5l" node="59rzbLoQnIx" resolve="getNumberOfTuplesInTyped" />
</node>
<node concept="Xl_RD" id="7kcFSsqaKd6" role="3uHU7B">
<property role="Xl_RC" value="typeOf: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaKd7" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaKd8" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaKd9" role="2Oq$k0">
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="7kcFSsqaKda" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaKdb" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqaKdc" role="3uHU7w">
<ref role="37wK5l" node="59rzbLoQnIB" resolve="getNumberOfTuplesInADTType" />
</node>
<node concept="Xl_RD" id="7kcFSsqaKdd" role="3uHU7B">
<property role="Xl_RC" value="type_adttype: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaKde" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaKdf" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaKdg" role="2Oq$k0">
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="7kcFSsqaKdh" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaKdi" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqaKdj" role="3uHU7w">
<ref role="37wK5l" node="59rzbLoQnI_" resolve="getNumberOfTuplesInLookup" />
</node>
<node concept="Xl_RD" id="7kcFSsqaKdk" role="3uHU7B">
<property role="Xl_RC" value="lookup: " />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaTve" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaTvf" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaTvg" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqaTvh" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaTvi" role="37wK5m">
<node concept="Xl_RD" id="7kcFSsqaTvk" role="3uHU7B">
<property role="Xl_RC" value="allVars: " />
</node>
<node concept="2OqwBi" id="7kcFSsqaYv1" role="3uHU7w">
<node concept="37vLTw" id="7kcFSsqaXCo" role="2Oq$k0">
<ref role="3cqZAo" node="7kcFSsqaQBI" resolve="evaluatorAllVars" />
</node>
<node concept="VqFXI" id="7kcFSsqaZhO" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kcFSsqaikP" role="3cqZAp">
<node concept="2OqwBi" id="7kcFSsqaikQ" role="3clFbG">
<node concept="10M0yZ" id="7kcFSsqaikR" role="2Oq$k0">
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
</node>
<node concept="liA8E" id="7kcFSsqaikS" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="7kcFSsqaikT" role="37wK5m">
<node concept="1rXfSq" id="7kcFSsqakIG" role="3uHU7w">
<ref role="37wK5l" node="59rzbLoQnIz" resolve="getNumberOfTuplesInErrors" />
</node>
<node concept="Xl_RD" id="7kcFSsqaikV" role="3uHU7B">
<property role="Xl_RC" value="typeOf_errors: " />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="7kcFSsqaKdl" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="59rzbLoQnIu" role="jymVt" />
<node concept="3clFb_" id="59rzbLoQnIv" role="jymVt">
<property role="TrG5h" value="expectedType" />
......
......@@ -98,6 +98,12 @@
<node concept="3Tm1VV" id="7Xsfc_nKoEs" role="1B3o_S" />
<node concept="17QB3L" id="7Xsfc_nKoDo" role="3clF45" />
</node>
<node concept="3clFb_" id="7kcFSsqa6Ph" role="jymVt">
<property role="TrG5h" value="printTuples" />
<node concept="3clFbS" id="7kcFSsqa6Pk" role="3clF47" />
<node concept="3Tm1VV" id="7kcFSsqa6Pl" role="1B3o_S" />
<node concept="3cqZAl" id="7kcFSsqa58J" role="3clF45" />
</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