Skip to content

Commit

Permalink
core: fix modules typesystem after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@coolya
coolya committed Feb 10, 2016
1 parent a2b253e commit ec75245
Showing 1 changed file with 51 additions and 95 deletions.
146 changes: 51 additions & 95 deletions ...languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,18 @@
<language id="97a52717-898f-4598-8150-573d9fd03868" name="jetbrains.mps.lang.dataFlow.analyzers">
<concept id="95073643532950038" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerRunnerCreator" flags="nn" index="2v6lVJ">
<reference id="95073643532950039" name="analyzer" index="2v6lVI" />
<child id="3993089038374473158" name="parameters" index="3fIO2k" />
<child id="178770917832625312" name="nodeToCheck" index="3vVDej" />
</concept>
</language>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
<concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
<child id="1238852204892" name="componentType" index="1Lm7xW" />
</concept>
<concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
<child id="1238857764950" name="tuple" index="1LFl5Q" />
<child id="1238857834412" name="index" index="1LF_Uc" />
</concept>
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
Expand Down Expand Up @@ -6616,128 +6624,76 @@
</node>
</node>
<node concept="3clFbH" id="7t5t4Tsyipk" role="3cqZAp" />
<node concept="3cpWs8" id="7PgKJZviVLJ" role="3cqZAp">
<node concept="3cpWsn" id="7PgKJZviVLK" role="3cpWs9">
<property role="TrG5h" value="pointerAnalyzer" />
<node concept="3uibUv" id="7PgKJZviVLL" role="1tU5fm">
<ref role="3uigEE" to="mu20:9V7Nft_x9B" resolve="CustomAnalyzerRunner" />
<node concept="3uibUv" id="7PgKJZviWRD" role="11_B2D">
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
<node concept="3uibUv" id="4zFXTqq1wgH" role="11_B2D">
<ref role="3uigEE" to="9xhd:4zFXTqpFLST" resolve="VariableWrapper" />
</node>
<node concept="3uibUv" id="7PgKJZviVLM" role="11_B2D">
<node concept="3SKdUt" id="1uoAWUP6qlZ" role="3cqZAp">
<node concept="3SKdUq" id="1uoAWUP6qm1" role="3SKWNk">
<property role="3SKdUp" value="uninitialized read analysis" />
</node>
</node>
<node concept="3cpWs8" id="1uoAWUP6ioS" role="3cqZAp">
<node concept="3cpWsn" id="1uoAWUP6ioT" role="3cpWs9">
<property role="TrG5h" value="_result" />
<node concept="1LlUBW" id="1uoAWUP6ioz" role="1tU5fm">
<node concept="3uibUv" id="1uoAWUP6ioP" role="1Lm7xW">
<ref role="3uigEE" to="1fjm:~Program" resolve="Program" />
</node>
<node concept="3uibUv" id="1uoAWUP6ioM" role="1Lm7xW">
<ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
<node concept="3uibUv" id="1uoAWUP6ioN" role="11_B2D">
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
<node concept="3uibUv" id="4zFXTqq1xhA" role="11_B2D">
<node concept="3uibUv" id="1uoAWUP6ioO" role="11_B2D">
<ref role="3uigEE" to="9xhd:4zFXTqpFLST" resolve="VariableWrapper" />
</node>
</node>
</node>
</node>
<node concept="2v6lVJ" id="7PgKJZviVLO" role="33vP2m">
<ref role="2v6lVI" to="9xhd:7PgKJZveLFT" resolve="PointerAnalyzer" />
<node concept="1YBJjd" id="7PgKJZviVLP" role="3vVDej">
<node concept="2YIFZM" id="1uoAWUP6ioU" role="33vP2m">
<ref role="37wK5l" to="9xhd:1uoAWUP63od" resolve="analyze" />
<ref role="1Pybhc" to="9xhd:7d9zFs_pkq2" resolve="InitializedVariablesAnalyzerHelper" />
<node concept="1YBJjd" id="1uoAWUP6ioV" role="37wK5m">
<ref role="1YBMHb" node="2GqtAvyKZ4G" resolve="statements" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="321ojDtvop9" role="3cqZAp">
<node concept="3cpWsn" id="321ojDtvopa" role="3cpWs9">
<property role="TrG5h" value="pointerAnalyzerResult" />
<node concept="3uibUv" id="321ojDtvop8" role="1tU5fm">
<ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
</node>
<node concept="2OqwBi" id="321ojDtvopb" role="33vP2m">
<node concept="37vLTw" id="321ojDtvopc" role="2Oq$k0">
<ref role="3cqZAo" node="7PgKJZviVLK" resolve="pointerAnalyzer" />
</node>
<node concept="liA8E" id="321ojDtvopd" role="2OqNvi">
<ref role="37wK5l" to="1fjm:~AnalyzerRunner.analyze():jetbrains.mps.lang.dataFlow.framework.AnalysisResult" resolve="analyze" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3v8GxaBwb3y" role="3cqZAp">
<node concept="2YIFZM" id="3v8GxaBwcKn" role="3clFbG">
<ref role="37wK5l" to="9xhd:3v8GxaBvSGW" resolve="store" />
<ref role="1Pybhc" to="9xhd:3v8GxaBuqXe" resolve="SymbolicInstructionMapping" />
<node concept="2OqwBi" id="3v8GxaBwcSM" role="37wK5m">
<node concept="37vLTw" id="3v8GxaBwcKA" role="2Oq$k0">
<ref role="3cqZAo" node="7PgKJZviVLK" resolve="pointerAnalyzer" />
</node>
<node concept="liA8E" id="3v8GxaBweeA" role="2OqNvi">
<ref role="37wK5l" to="mu20:1lfJxt4aCKl" resolve="getProgram" />
</node>
<node concept="3cpWs8" id="1uoAWUP6nTh" role="3cqZAp">
<node concept="3cpWsn" id="1uoAWUP6nTi" role="3cpWs9">
<property role="TrG5h" value="program" />
<node concept="3uibUv" id="1uoAWUP6nSC" role="1tU5fm">
<ref role="3uigEE" to="1fjm:~Program" resolve="Program" />
</node>
</node>
</node>
<node concept="3clFbH" id="7PgKJZviTp2" role="3cqZAp" />
<node concept="3SKdUt" id="7t5t4TsykIh" role="3cqZAp">
<node concept="3SKdUq" id="7t5t4Tsyl7J" role="3SKWNk">
<property role="3SKdUp" value="Uninitialized read analysis" />
</node>
</node>
<node concept="3cpWs8" id="3ivm4e3BU9O" role="3cqZAp">
<node concept="3cpWsn" id="3ivm4e3BU9P" role="3cpWs9">
<property role="TrG5h" value="uninitializedReadAnalyzer" />
<node concept="3uibUv" id="3ivm4e3BU9Q" role="1tU5fm">
<ref role="3uigEE" to="mu20:9V7Nft_x9B" resolve="CustomAnalyzerRunner" />
<node concept="3uibUv" id="7PgKJZv9WMv" role="11_B2D">
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
<node concept="3uibUv" id="4zFXTqpMCOv" role="11_B2D">
<ref role="3uigEE" to="9xhd:4zFXTqpFLST" resolve="VariableWrapper" />
</node>
</node>
</node>
<node concept="2v6lVJ" id="3ivm4e3BU9U" role="33vP2m">
<ref role="2v6lVI" to="9xhd:7vcqB$mvpmV" resolve="InitializedVariablesAnalyzer" />
<node concept="37vLTw" id="_oDvx5PFZa" role="3fIO2k">
<ref role="3cqZAo" node="321ojDtvopa" resolve="pointerAnalyzerResult" />
</node>
<node concept="1YBJjd" id="2GqtAvyMzld" role="3vVDej">
<ref role="1YBMHb" node="2GqtAvyKZ4G" resolve="statements" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3v8GxaBwhGQ" role="3cqZAp">
<node concept="2YIFZM" id="3v8GxaBwj_E" role="3clFbG">
<ref role="37wK5l" to="9xhd:3v8GxaBvSGW" resolve="store" />
<ref role="1Pybhc" to="9xhd:3v8GxaBuqXe" resolve="SymbolicInstructionMapping" />
<node concept="2OqwBi" id="3v8GxaBwjFV" role="37wK5m">
<node concept="37vLTw" id="3v8GxaBwj_T" role="2Oq$k0">
<ref role="3cqZAo" node="3ivm4e3BU9P" resolve="uninitializedReadAnalyzer" />
<node concept="1LFfDK" id="1uoAWUP6nTj" role="33vP2m">
<node concept="3cmrfG" id="1uoAWUP6nTk" role="1LF_Uc">
<property role="3cmrfH" value="0" />
</node>
<node concept="liA8E" id="3v8GxaBwke_" role="2OqNvi">
<ref role="37wK5l" to="mu20:1lfJxt4aCKl" resolve="getProgram" />
<node concept="37vLTw" id="1uoAWUP6nTl" role="1LFl5Q">
<ref role="3cqZAo" node="1uoAWUP6ioT" resolve="_result" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="3ivm4e3BU9W" role="3cqZAp">
<node concept="3cpWsn" id="3ivm4e3BU9X" role="3cpWs9">
<property role="TrG5h" value="uninitializedReadAnalyzerResult" />
<node concept="3uibUv" id="3ivm4e3BU9Y" role="1tU5fm">
<node concept="3cpWs8" id="1uoAWUP67pj" role="3cqZAp">
<node concept="3cpWsn" id="1uoAWUP67pk" role="3cpWs9">
<property role="TrG5h" value="result" />
<node concept="3uibUv" id="1uoAWUP67p9" role="1tU5fm">
<ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
<node concept="3uibUv" id="7PgKJZv9Xed" role="11_B2D">
<node concept="3uibUv" id="1uoAWUP67pg" role="11_B2D">
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
<node concept="3uibUv" id="4zFXTqpMGmw" role="11_B2D">
<node concept="3uibUv" id="1uoAWUP67ph" role="11_B2D">
<ref role="3uigEE" to="9xhd:4zFXTqpFLST" resolve="VariableWrapper" />
</node>
</node>
</node>
<node concept="2OqwBi" id="3ivm4e3BUa2" role="33vP2m">
<node concept="37vLTw" id="3GM_nagTrV5" role="2Oq$k0">
<ref role="3cqZAo" node="3ivm4e3BU9P" resolve="uninitializedReadAnalyzer" />
<node concept="1LFfDK" id="1uoAWUP6lBp" role="33vP2m">
<node concept="3cmrfG" id="1uoAWUP6lOh" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="liA8E" id="3ivm4e3BUa4" role="2OqNvi">
<ref role="37wK5l" to="1fjm:~AnalyzerRunner.analyze():jetbrains.mps.lang.dataFlow.framework.AnalysisResult" resolve="analyze" />
<node concept="37vLTw" id="1uoAWUP6ioW" role="1LFl5Q">
<ref role="3cqZAo" node="1uoAWUP6ioT" resolve="_result" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="2GqtAvyM$5e" role="3cqZAp" />
<node concept="3clFbH" id="1uoAWUP6dBa" role="3cqZAp" />
<node concept="1DcWWT" id="2GqtAvyV0RX" role="3cqZAp">
<node concept="3clFbS" id="2GqtAvyV0RY" role="2LFqv$">
<node concept="3cpWs8" id="2GqtAvz8HZ_" role="3cqZAp">
Expand Down

0 comments on commit ec75245

Please sign in to comment.