Skip to content

Commit

Permalink
Merge pull request #972 from IETS3/merge/mps20223
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20223 into master
  • Loading branch information
@arimer
arimer authored Jun 7, 2024
2 parents 6a5d01b + a0d042a commit bc0aabd
Show file tree
Hide file tree
Showing 14 changed files with 501 additions and 2,050 deletions.
10 changes: 5 additions & 5 deletions code/languages/org.iets3.opensource/.mps/libraries.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<value>
<Library>
<option name="name" value="mbeddr.plattform" />
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/com.mbeddr.platform" />
</Library>
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
</Library>
</value>
</entry>
<entry key="org.mpsqa.allInOne">
<entry key='org.mpsqa.allInOne'>
<value>
<Library>
<option name="name" value="org.mpsqa.allInOne" />
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/org.mpsqa.allInOne" />
<option name='name' value='org.mpsqa.allInOne' />
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/org.mpsqa.allInOne' />
</Library>
</value>
</entry>
Expand Down
1 change: 0 additions & 1 deletion code/languages/org.iets3.opensource/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
<modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
<modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />
<modulePath path="$PROJECT_DIR$/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
Expand Down
68 changes: 17 additions & 51 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
<child id="1188208488637" name="annotation" index="2AJF6D" />
</concept>
<concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
Expand Down Expand Up @@ -178,7 +178,7 @@
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
Expand Down Expand Up @@ -244,7 +244,7 @@
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
<child id="1081516765348" name="expression" index="3fr31v" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand Down Expand Up @@ -273,7 +273,7 @@
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
Expand Down Expand Up @@ -460,7 +460,7 @@
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
Expand Down Expand Up @@ -14105,16 +14105,12 @@
</node>
<node concept="3Tm1VV" id="2O$zpZk7gkh" role="1B3o_S" />
</node>
<node concept="3HP615" id="34s7_UnUH2A">
<node concept="vrV6u" id="3HxoqR_T8F2">
<property role="TrG5h" value="typesystemCustomization" />
<property role="3GE5qa" value="typesystem" />
<property role="TrG5h" value="TypesystemCustomizer" />
<node concept="3clFb_" id="34s7_UnUH4e" role="jymVt">
<property role="TrG5h" value="checkDuplicateValuesInEnums" />
<node concept="10P_77" id="34s7_UnUH4f" role="3clF45" />
<node concept="3Tm1VV" id="34s7_UnUH4g" role="1B3o_S" />
<node concept="3clFbS" id="34s7_UnUH4h" role="3clF47" />
<node concept="3uibUv" id="3HxoqR_WS1J" role="luc8K">
<ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
</node>
<node concept="3Tm1VV" id="34s7_UnUH2B" role="1B3o_S" />
</node>
<node concept="312cEu" id="34s7_UnROPW">
<property role="3GE5qa" value="typesystem" />
Expand Down Expand Up @@ -14168,12 +14164,16 @@
<ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
</node>
</node>
<node concept="vrV6u" id="3HxoqR_T8F2">
<property role="TrG5h" value="typesystemCustomization" />
<node concept="3HP615" id="34s7_UnUH2A">
<property role="3GE5qa" value="typesystem" />
<node concept="3uibUv" id="3HxoqR_WS1J" role="luc8K">
<ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
<property role="TrG5h" value="TypesystemCustomizer" />
<node concept="3clFb_" id="34s7_UnUH4e" role="jymVt">
<property role="TrG5h" value="checkDuplicateValuesInEnums" />
<node concept="10P_77" id="34s7_UnUH4f" role="3clF45" />
<node concept="3Tm1VV" id="34s7_UnUH4g" role="1B3o_S" />
<node concept="3clFbS" id="34s7_UnUH4h" role="3clF47" />
</node>
<node concept="3Tm1VV" id="34s7_UnUH2B" role="1B3o_S" />
</node>
<node concept="1lYeZD" id="x6l$aoyUxg">
<property role="TrG5h" value="DefaultIdentifierConfiguratorExtension" />
Expand Down Expand Up @@ -14406,39 +14406,5 @@
<node concept="2tJIrI" id="1_yOWEXeo3y" role="jymVt" />
<node concept="3Tm1VV" id="3OrGkZCn9ZR" role="1B3o_S" />
</node>
<node concept="1lYeZD" id="6UwMN4NTt5T">
<property role="3GE5qa" value="primitiveTypes" />
<property role="TrG5h" value="DefaultNixHandlerExtension" />
<ref role="1lYe$Y" node="26cjRACVLVs" resolve="nixHandler" />
<node concept="3Tm1VV" id="6UwMN4NTt5U" role="1B3o_S" />
<node concept="2tJIrI" id="6UwMN4NTt5V" role="jymVt" />
<node concept="3tTeZs" id="6UwMN4NTt5W" role="jymVt">
<property role="3tTeZt" value="activate" />
<ref role="3tTeZr" to="90d:3zLwYDe0CPy" resolve="activate" />
</node>
<node concept="3tTeZs" id="6UwMN4NTt5X" role="jymVt">
<property role="3tTeZt" value="deactivate" />
<ref role="3tTeZr" to="90d:3zLwYDe0BDO" resolve="deactivate" />
</node>
<node concept="2tJIrI" id="6UwMN4NTt5Y" role="jymVt" />
<node concept="q3mfD" id="6UwMN4NTt5Z" role="jymVt">
<property role="TrG5h" value="get" />
<ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
<node concept="3Tm1VV" id="6UwMN4NTt61" role="1B3o_S" />
<node concept="3clFbS" id="6UwMN4NTt63" role="3clF47">
<node concept="3cpWs6" id="6UwMN4NTwWM" role="3cqZAp">
<node concept="2ShNRf" id="6UwMN4NTwZb" role="3cqZAk">
<node concept="HV5vD" id="6UwMN4NTUCx" role="2ShVmc">
<ref role="HV5vE" node="26cjRACVR5c" resolve="DefaultNixHandler" />
</node>
</node>
</node>
</node>
<node concept="q3mfm" id="6UwMN4NTt64" role="3clF45">
<ref role="q3mfh" to="90d:3zLwYDe0sv$" />
<ref role="1QQUv3" node="6UwMN4NTt5Z" resolve="get" />
</node>
</node>
</node>
</model>

Loading

0 comments on commit bc0aabd

Please sign in to comment.