Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed cardinality of connections #2

Open
wants to merge 1 commit into
base: 2019.3
Choose a base branch
from
Open

Changed cardinality of connections #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions languages/Component/Component.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency reexport="false">4cc07462-84b3-4d01-8adb-629ddd3cebd4(Capabilities)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
Expand All @@ -42,12 +42,12 @@
<language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="4" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
Expand Down
39 changes: 22 additions & 17 deletions languages/Component/models/behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</concept>
<concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="1350122676458893092" name="text" index="3ndbpf" />
<child id="8356039341262087992" name="line" index="1aUNEU" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
Expand Down Expand Up @@ -257,10 +257,10 @@
</concept>
</language>
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
<property id="155656958578482949" name="value" index="3oM_SC" />
</concept>
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="ng" index="1PaTwC">
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
<child id="2535923850359271783" name="elements" index="1PaTwD" />
</concept>
</language>
Expand Down Expand Up @@ -1011,7 +1011,7 @@
</node>
</node>
<node concept="3SKdUt" id="5g8KHvCSIOa" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWV5" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWV5" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWV7" role="1PaTwD">
<property role="3oM_SC" value="try" />
</node>
Expand Down Expand Up @@ -1107,7 +1107,7 @@
</node>
</node>
<node concept="3SKdUt" id="5g8KHvCSIPa" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVe" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVe" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVg" role="1PaTwD">
<property role="3oM_SC" value="" />
</node>
Expand Down Expand Up @@ -1204,7 +1204,7 @@
</node>
</node>
<node concept="3SKdUt" id="5g8KHvCSIPS" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVl" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVl" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVn" role="1PaTwD">
<property role="3oM_SC" value="try" />
</node>
Expand Down Expand Up @@ -1347,7 +1347,7 @@
</node>
</node>
<node concept="3SKdUt" id="4LsNulDhzca" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVu" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVu" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVw" role="1PaTwD">
<property role="3oM_SC" value="try" />
</node>
Expand Down Expand Up @@ -1416,7 +1416,7 @@
<node concept="3clFbJ" id="4LsNulDhL1Z" role="3cqZAp">
<node concept="3clFbS" id="4LsNulDhL21" role="3clFbx">
<node concept="3SKdUt" id="4LsNulDhL8w" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVB" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVB" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVD" role="1PaTwD">
<property role="3oM_SC" value="target" />
</node>
Expand Down Expand Up @@ -1556,7 +1556,7 @@
</node>
</node>
<node concept="3SKdUt" id="4LsNulDhLBv" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVL" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVL" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVN" role="1PaTwD">
<property role="3oM_SC" value="" />
</node>
Expand Down Expand Up @@ -1669,7 +1669,7 @@
</node>
</node>
<node concept="3SKdUt" id="4LsNulDhNDh" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWVS" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWVS" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWVU" role="1PaTwD">
<property role="3oM_SC" value="try" />
</node>
Expand Down Expand Up @@ -1728,7 +1728,7 @@
<node concept="3clFbJ" id="4LsNulDhNDA" role="3cqZAp">
<node concept="3clFbS" id="4LsNulDhNDB" role="3clFbx">
<node concept="3SKdUt" id="4LsNulDhNDC" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWW1" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWW1" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWW3" role="1PaTwD">
<property role="3oM_SC" value="target" />
</node>
Expand Down Expand Up @@ -1778,7 +1778,7 @@
</node>
<node concept="3clFbH" id="4LsNulDid8m" role="3cqZAp" />
<node concept="3SKdUt" id="4LsNulDif0u" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWWb" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWWb" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWWd" role="1PaTwD">
<property role="3oM_SC" value="remove!" />
</node>
Expand Down Expand Up @@ -2549,7 +2549,6 @@
<ref role="13i0hy" to="tpcu:52_Geb4QDV$" resolve="getScope" />
<node concept="3Tm1VV" id="344rOAFg7lD" role="1B3o_S" />
<node concept="3clFbS" id="344rOAFg7lM" role="3clF47">
<node concept="3clFbH" id="6vrrBYhhsYX" role="3cqZAp" />
<node concept="3clFbJ" id="344rOAFgh6X" role="3cqZAp">
<node concept="3clFbS" id="344rOAFgh6Z" role="3clFbx">
<node concept="3cpWs8" id="344rOAF7CAd" role="3cqZAp">
Expand Down Expand Up @@ -2608,7 +2607,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="344rOAF7grn" role="3cqZAp" />
<node concept="3cpWs8" id="344rOAFhFxx" role="3cqZAp">
<node concept="3cpWsn" id="344rOAFhFxv" role="3cpWs9">
<property role="3TUv4t" value="true" />
Expand Down Expand Up @@ -2700,6 +2698,9 @@
</node>
</node>
</node>
<node concept="2AHcQZ" id="7xTfi9I$bVA" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="1PxgMI" id="344rOAF7grU" role="37wK5m">
<node concept="2GrUjf" id="344rOAF7grV" role="1m5AlR">
Expand Down Expand Up @@ -2820,7 +2821,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="1WZFxKpVW2o" role="3cqZAp" />
<node concept="3clFbF" id="1WZFxKpVWzx" role="3cqZAp">
<node concept="2OqwBi" id="1WZFxKpVWzz" role="3clFbG">
<node concept="37vLTw" id="1WZFxKpVWz$" role="2Oq$k0">
Expand Down Expand Up @@ -2892,6 +2892,9 @@
</node>
</node>
</node>
<node concept="2AHcQZ" id="7xTfi9I$cok" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="1PxgMI" id="1WZFxKpVW$3" role="37wK5m">
<node concept="2GrUjf" id="1WZFxKpVW$4" role="1m5AlR">
Expand Down Expand Up @@ -3061,7 +3064,7 @@
</node>
<node concept="3clFbS" id="344rOAF7gsm" role="3clF47">
<node concept="3SKdUt" id="344rOAFims9" role="3cqZAp">
<node concept="1PaTwC" id="6U$LN6knWWe" role="3ndbpf">
<node concept="1PaTwC" id="6U$LN6knWWe" role="1aUNEU">
<node concept="3oM_SD" id="6U$LN6knWWg" role="1PaTwD">
<property role="3oM_SC" value="TODO" />
</node>
Expand Down Expand Up @@ -3129,6 +3132,9 @@
</node>
</node>
</node>
<node concept="2AHcQZ" id="7xTfi9I$cG7" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="1PxgMI" id="344rOAF7gs_" role="37wK5m">
<node concept="2GrUjf" id="344rOAF7gsA" role="1m5AlR">
Expand Down Expand Up @@ -3178,7 +3184,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="6Aq_gTyp4Kt" role="3cqZAp" />
<node concept="3cpWs6" id="344rOAFgLYc" role="3cqZAp">
<node concept="iy90A" id="344rOAFgOvn" role="3cqZAk" />
</node>
Expand Down
39 changes: 21 additions & 18 deletions languages/Component/models/constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<model ref="r:08fdc263-d8e2-431c-8fd1-bbf0fb653686(Component.constraints)">
<persistence version="9" />
<languages>
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports>
Expand Down Expand Up @@ -348,9 +349,6 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="4lyQvwNTnWv">
<ref role="1M2myG" to="l1zz:1u89nBaZcNr" resolve="System" />
</node>
<node concept="1M2fIO" id="kJuU8rAM0Y">
<property role="3GE5qa" value="Instances" />
<ref role="1M2myG" to="l1zz:5g8KHvCW0FH" resolve="ComponentInst" />
Expand Down Expand Up @@ -460,21 +458,6 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="344rOAF7g59">
<ref role="1M2myG" to="l1zz:1u89nBaZcNs" resolve="Connection" />
<node concept="1N5Pfh" id="344rOAF7gaQ" role="1Mr941">
<ref role="1N5Vy1" to="l1zz:1u89nBaZezs" resolve="source" />
<node concept="1dDu$B" id="344rOAFgR0f" role="1N6uqs">
<ref role="1dDu$A" to="l1zz:1u89nBaZcN_" resolve="OutputPort" />
</node>
</node>
<node concept="1N5Pfh" id="344rOAF7Ys8" role="1Mr941">
<ref role="1N5Vy1" to="l1zz:1u89nBaZezp" resolve="target" />
<node concept="1dDu$B" id="344rOAFinym" role="1N6uqs">
<ref role="1dDu$A" to="l1zz:1u89nBaZcNt" resolve="InputPort" />
</node>
</node>
</node>
<node concept="1M2fIO" id="6rijOoKyotn">
<property role="3GE5qa" value="Annotations.Comment" />
<ref role="1M2myG" to="l1zz:6rijOoKun7_" resolve="SingleLineComment" />
Expand Down Expand Up @@ -548,5 +531,25 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="64jCRrVjZGi">
<property role="3GE5qa" value="References" />
<ref role="1M2myG" to="l1zz:64jCRrVjJGi" resolve="SourceRef" />
<node concept="1N5Pfh" id="64jCRrVjZGj" role="1Mr941">
<ref role="1N5Vy1" to="l1zz:7xTfi9IJNIV" resolve="ref" />
<node concept="1dDu$B" id="64jCRrVjZIK" role="1N6uqs">
<ref role="1dDu$A" to="l1zz:1u89nBaZcN_" resolve="OutputPort" />
</node>
</node>
</node>
<node concept="1M2fIO" id="64jCRrVjZUU">
<property role="3GE5qa" value="References" />
<ref role="1M2myG" to="l1zz:64jCRrVjJGl" resolve="TargetRef" />
<node concept="1N5Pfh" id="64jCRrVjZUV" role="1Mr941">
<ref role="1N5Vy1" to="l1zz:7xTfi9IJNIX" resolve="ref" />
<node concept="1dDu$B" id="64jCRrVjZUZ" role="1N6uqs">
<ref role="1dDu$A" to="l1zz:1u89nBaZcNt" resolve="InputPort" />
</node>
</node>
</node>
</model>

Loading