Skip to content

Commit b3a4508

Browse files
Merge pull request #2826 from mbeddr/refactor/move-doc-qa
Move doc.expressions and doc.qa to proper places
2 parents 0dcaae2 + 7e8dce6 commit b3a4508

File tree

18 files changed

+46
-99
lines changed

18 files changed

+46
-99
lines changed

code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps

Lines changed: 44 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,11 +1146,6 @@
11461146
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
11471147
</node>
11481148
</node>
1149-
<node concept="1SiIV0" id="7udlxS$N$Jr" role="3bR37C">
1150-
<node concept="3bR9La" id="7udlxS$N$Js" role="1SiIV1">
1151-
<ref role="3bR37D" to="ffeo:4LDuh$Ud1Lx" resolve="jetbrains.mps.debugger.java.api" />
1152-
</node>
1153-
</node>
11541149
<node concept="1SiIV0" id="17FCEM7ip1J" role="3bR37C">
11551150
<node concept="3bR9La" id="17FCEM7ip1K" role="1SiIV1">
11561151
<ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
@@ -4724,7 +4719,7 @@
47244719
<property role="3qWCbO" value="icons/**, resources/**" />
47254720
</node>
47264721
<node concept="398BVA" id="3xFG3bj5clT" role="3LXTmr">
4727-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4722+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
47284723
<node concept="2Ry0Ak" id="3xFG3bj5clU" role="iGT6I">
47294724
<property role="2Ry0Am" value="languages" />
47304725
<node concept="2Ry0Ak" id="3xFG3bj5clV" role="2Ry0An">
@@ -4735,7 +4730,7 @@
47354730
</node>
47364731
</node>
47374732
<node concept="398BVA" id="3tiuL$x4gIa" role="3LF7KH">
4738-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4733+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
47394734
<node concept="2Ry0Ak" id="3tiuL$x4gIb" role="iGT6I">
47404735
<property role="2Ry0Am" value="languages" />
47414736
<node concept="2Ry0Ak" id="3tiuL$x4gIc" role="2Ry0An">
@@ -4778,23 +4773,23 @@
47784773
<property role="3ZfqAx" value="generator/template" />
47794774
<property role="1Hdu6h" value="true" />
47804775
<property role="1HemKv" value="true" />
4781-
<node concept="3LXTmp" id="7ZN_vIiSh$J" role="1HemKq">
4782-
<node concept="398BVA" id="7ZN_vIiSh$x" role="3LXTmr">
4783-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4784-
<node concept="2Ry0Ak" id="7ZN_vIiSh$y" role="iGT6I">
4776+
<node concept="3LXTmp" id="5FkZWZm6sHK" role="1HemKq">
4777+
<node concept="398BVA" id="5FkZWZm6sHz" role="3LXTmr">
4778+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
4779+
<node concept="2Ry0Ak" id="5FkZWZm6sH$" role="iGT6I">
47854780
<property role="2Ry0Am" value="languages" />
4786-
<node concept="2Ry0Ak" id="7ZN_vIiSh$z" role="2Ry0An">
4781+
<node concept="2Ry0Ak" id="5FkZWZm6sH_" role="2Ry0An">
47874782
<property role="2Ry0Am" value="com.mbeddr.doc.qa" />
4788-
<node concept="2Ry0Ak" id="7ZN_vIiSh$$" role="2Ry0An">
4783+
<node concept="2Ry0Ak" id="5FkZWZm6sHA" role="2Ry0An">
47894784
<property role="2Ry0Am" value="generator" />
4790-
<node concept="2Ry0Ak" id="7ZN_vIiSh$_" role="2Ry0An">
4785+
<node concept="2Ry0Ak" id="5FkZWZm6sHB" role="2Ry0An">
47914786
<property role="2Ry0Am" value="template" />
47924787
</node>
47934788
</node>
47944789
</node>
47954790
</node>
47964791
</node>
4797-
<node concept="3qWCbU" id="7ZN_vIiSh$K" role="3LXTna">
4792+
<node concept="3qWCbU" id="5FkZWZm6sHL" role="3LXTna">
47984793
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
47994794
</node>
48004795
</node>
@@ -4804,20 +4799,20 @@
48044799
<property role="3ZfqAx" value="languageModels" />
48054800
<property role="1Hdu6h" value="true" />
48064801
<property role="1HemKv" value="true" />
4807-
<node concept="3LXTmp" id="7ZN_vIiSh$v" role="1HemKq">
4808-
<node concept="398BVA" id="7ZN_vIiSh$j" role="3LXTmr">
4809-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4810-
<node concept="2Ry0Ak" id="7ZN_vIiSh$k" role="iGT6I">
4802+
<node concept="3LXTmp" id="5FkZWZm6sHx" role="1HemKq">
4803+
<node concept="398BVA" id="5FkZWZm6sHm" role="3LXTmr">
4804+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
4805+
<node concept="2Ry0Ak" id="5FkZWZm6sHn" role="iGT6I">
48114806
<property role="2Ry0Am" value="languages" />
4812-
<node concept="2Ry0Ak" id="7ZN_vIiSh$l" role="2Ry0An">
4807+
<node concept="2Ry0Ak" id="5FkZWZm6sHo" role="2Ry0An">
48134808
<property role="2Ry0Am" value="com.mbeddr.doc.qa" />
4814-
<node concept="2Ry0Ak" id="7ZN_vIiSh$m" role="2Ry0An">
4809+
<node concept="2Ry0Ak" id="5FkZWZm6sHp" role="2Ry0An">
48154810
<property role="2Ry0Am" value="languageModels" />
48164811
</node>
48174812
</node>
48184813
</node>
48194814
</node>
4820-
<node concept="3qWCbU" id="7ZN_vIiSh$w" role="3LXTna">
4815+
<node concept="3qWCbU" id="5FkZWZm6sHy" role="3LXTna">
48214816
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
48224817
</node>
48234818
</node>
@@ -9884,42 +9879,24 @@
98849879
<property role="3qWCbO" value="icons/**, resources/**" />
98859880
</node>
98869881
<node concept="398BVA" id="3xFG3bj5chc" role="3LXTmr">
9887-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
9888-
<node concept="2Ry0Ak" id="3xFG3bj5chd" role="iGT6I">
9889-
<property role="2Ry0Am" value="code" />
9890-
<node concept="2Ry0Ak" id="3xFG3bj5che" role="2Ry0An">
9891-
<property role="2Ry0Am" value="languages" />
9892-
<node concept="2Ry0Ak" id="3xFG3bj5chf" role="2Ry0An">
9893-
<property role="2Ry0Am" value="com.mbeddr.doc" />
9894-
<node concept="2Ry0Ak" id="3xFG3bj5chg" role="2Ry0An">
9895-
<property role="2Ry0Am" value="languages" />
9896-
<node concept="2Ry0Ak" id="3xFG3bj5chh" role="2Ry0An">
9897-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9898-
</node>
9899-
</node>
9900-
</node>
9882+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9883+
<node concept="2Ry0Ak" id="3xFG3bj5chg" role="iGT6I">
9884+
<property role="2Ry0Am" value="languages" />
9885+
<node concept="2Ry0Ak" id="3xFG3bj5chh" role="2Ry0An">
9886+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
99019887
</node>
99029888
</node>
99039889
</node>
99049890
</node>
99059891
</node>
99069892
<node concept="398BVA" id="7tNo_gxoK91" role="3LF7KH">
9907-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
9908-
<node concept="2Ry0Ak" id="7tNo_gxoK92" role="iGT6I">
9909-
<property role="2Ry0Am" value="code" />
9910-
<node concept="2Ry0Ak" id="7tNo_gxoK93" role="2Ry0An">
9911-
<property role="2Ry0Am" value="languages" />
9912-
<node concept="2Ry0Ak" id="7tNo_gxoK94" role="2Ry0An">
9913-
<property role="2Ry0Am" value="com.mbeddr.doc" />
9914-
<node concept="2Ry0Ak" id="7tNo_gxoK95" role="2Ry0An">
9915-
<property role="2Ry0Am" value="languages" />
9916-
<node concept="2Ry0Ak" id="7tNo_gxoK96" role="2Ry0An">
9917-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9918-
<node concept="2Ry0Ak" id="7e0YBDNi0dn" role="2Ry0An">
9919-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions.mpl" />
9920-
</node>
9921-
</node>
9922-
</node>
9893+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9894+
<node concept="2Ry0Ak" id="7tNo_gxoK95" role="iGT6I">
9895+
<property role="2Ry0Am" value="languages" />
9896+
<node concept="2Ry0Ak" id="7tNo_gxoK96" role="2Ry0An">
9897+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9898+
<node concept="2Ry0Ak" id="7e0YBDNi0dn" role="2Ry0An">
9899+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions.mpl" />
99239900
</node>
99249901
</node>
99259902
</node>
@@ -9951,23 +9928,23 @@
99519928
<property role="3ZfqAx" value="generator/template" />
99529929
<property role="1Hdu6h" value="true" />
99539930
<property role="1HemKv" value="true" />
9954-
<node concept="3LXTmp" id="7ZN_vIiShOM" role="1HemKq">
9955-
<node concept="398BVA" id="7ZN_vIiShO$" role="3LXTmr">
9956-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
9957-
<node concept="2Ry0Ak" id="7ZN_vIiShO_" role="iGT6I">
9931+
<node concept="3LXTmp" id="5FkZWZm6sUy" role="1HemKq">
9932+
<node concept="398BVA" id="5FkZWZm6sUl" role="3LXTmr">
9933+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9934+
<node concept="2Ry0Ak" id="5FkZWZm6sUm" role="iGT6I">
99589935
<property role="2Ry0Am" value="languages" />
9959-
<node concept="2Ry0Ak" id="7ZN_vIiShOA" role="2Ry0An">
9936+
<node concept="2Ry0Ak" id="5FkZWZm6sUn" role="2Ry0An">
99609937
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9961-
<node concept="2Ry0Ak" id="7ZN_vIiShOB" role="2Ry0An">
9938+
<node concept="2Ry0Ak" id="5FkZWZm6sUo" role="2Ry0An">
99629939
<property role="2Ry0Am" value="generator" />
9963-
<node concept="2Ry0Ak" id="7ZN_vIiShOC" role="2Ry0An">
9940+
<node concept="2Ry0Ak" id="5FkZWZm6sUp" role="2Ry0An">
99649941
<property role="2Ry0Am" value="template" />
99659942
</node>
99669943
</node>
99679944
</node>
99689945
</node>
99699946
</node>
9970-
<node concept="3qWCbU" id="7ZN_vIiShON" role="3LXTna">
9947+
<node concept="3qWCbU" id="5FkZWZm6sUz" role="3LXTna">
99719948
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
99729949
</node>
99739950
</node>
@@ -9992,20 +9969,20 @@
99929969
<property role="3ZfqAx" value="languageModels" />
99939970
<property role="1Hdu6h" value="true" />
99949971
<property role="1HemKv" value="true" />
9995-
<node concept="3LXTmp" id="7ZN_vIiShOy" role="1HemKq">
9996-
<node concept="398BVA" id="7ZN_vIiShOm" role="3LXTmr">
9997-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
9998-
<node concept="2Ry0Ak" id="7ZN_vIiShOn" role="iGT6I">
9972+
<node concept="3LXTmp" id="5FkZWZm6sUj" role="1HemKq">
9973+
<node concept="398BVA" id="5FkZWZm6sU8" role="3LXTmr">
9974+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9975+
<node concept="2Ry0Ak" id="5FkZWZm6sU9" role="iGT6I">
99999976
<property role="2Ry0Am" value="languages" />
10000-
<node concept="2Ry0Ak" id="7ZN_vIiShOo" role="2Ry0An">
9977+
<node concept="2Ry0Ak" id="5FkZWZm6sUa" role="2Ry0An">
100019978
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
10002-
<node concept="2Ry0Ak" id="7ZN_vIiShOp" role="2Ry0An">
9979+
<node concept="2Ry0Ak" id="5FkZWZm6sUb" role="2Ry0An">
100039980
<property role="2Ry0Am" value="languageModels" />
100049981
</node>
100059982
</node>
100069983
</node>
100079984
</node>
10008-
<node concept="3qWCbU" id="7ZN_vIiShOz" role="3LXTna">
9985+
<node concept="3qWCbU" id="5FkZWZm6sUk" role="3LXTna">
100099986
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
100109987
</node>
100119988
</node>
@@ -11252,21 +11229,6 @@
1125211229
</node>
1125311230
</node>
1125411231
</node>
11255-
<node concept="398rNT" id="3tiuL$x4rIQ" role="1l3spd">
11256-
<property role="TrG5h" value="mbeddr.doc" />
11257-
<node concept="398BVA" id="3tiuL$x4rIR" role="398pKh">
11258-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
11259-
<node concept="2Ry0Ak" id="3tiuL$x4rIS" role="iGT6I">
11260-
<property role="2Ry0Am" value="code" />
11261-
<node concept="2Ry0Ak" id="3tiuL$x4rIT" role="2Ry0An">
11262-
<property role="2Ry0Am" value="languages" />
11263-
<node concept="2Ry0Ak" id="3tiuL$x4rIU" role="2Ry0An">
11264-
<property role="2Ry0Am" value="com.mbeddr.doc" />
11265-
</node>
11266-
</node>
11267-
</node>
11268-
</node>
11269-
</node>
1127011232
<node concept="398rNT" id="7eF9rfAuAMr" role="1l3spd">
1127111233
<property role="TrG5h" value="mbeddr.ext" />
1127211234
<node concept="398BVA" id="7eF9rfAuAMs" role="398pKh">
@@ -11297,21 +11259,6 @@
1129711259
</node>
1129811260
</node>
1129911261
</node>
11300-
<node concept="398rNT" id="7eF9rfAuDUw" role="1l3spd">
11301-
<property role="TrG5h" value="mbeddr.analyses" />
11302-
<node concept="398BVA" id="7eF9rfAuDUx" role="398pKh">
11303-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
11304-
<node concept="2Ry0Ak" id="7eF9rfAuDUy" role="iGT6I">
11305-
<property role="2Ry0Am" value="code" />
11306-
<node concept="2Ry0Ak" id="7eF9rfAuDUz" role="2Ry0An">
11307-
<property role="2Ry0Am" value="languages" />
11308-
<node concept="2Ry0Ak" id="7eF9rfAuDU$" role="2Ry0An">
11309-
<property role="2Ry0Am" value="com.mbeddr.analyses" />
11310-
</node>
11311-
</node>
11312-
</node>
11313-
</node>
11314-
</node>
1131511262
<node concept="398rNT" id="4MR$$QmqomQ" role="1l3spd">
1131611263
<property role="TrG5h" value="artifacts.root" />
1131711264
</node>

code/languages/com.mbeddr.cc/.mps/modules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.fm/fm.mpl" folder="ple_var" />
2828
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.rt.comp/comp.mpl" folder="ple_var" />
2929
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.rt/rt.mpl" folder="ple_var" />
30+
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl" folder="doc" />
3031
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd" folder="requirements" />
3132
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd" folder="ple_var" />
3233
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd" folder="ple_var" />

code/languages/com.mbeddr.core/.mps/modules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.core.unittest/unittest.mpl" folder="core-extended" />
3131
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd" folder="core-extended.solutions" />
3232
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.core.util/util.mpl" folder="core-extended" />
33+
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl" folder="doc" />
3334
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd" folder="core" />
3435
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd" folder="core.solutions" />
3536
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd" folder="core.solutions" />

code/languages/com.mbeddr.doc/.mps/modules.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
<modulePath path="$PROJECT_DIR$/_spreferences/PlatformTemplates/module.msd" folder="_spreferences" />
77
<modulePath path="$PROJECT_DIR$/_spreferences/TypeSizeConfiguration/module.msd" folder="_spreferences" />
88
<modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.documentation/com.mbeddr.documentation.devkit" folder="" />
9-
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl" folder="lang" />
109
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl" folder="lang" />
1110
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl" folder="lang" />
1211
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl" folder="lang" />
1312
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl" folder="lang" />
1413
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl" folder="lang" />
1514
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl" folder="lang" />
16-
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl" folder="lang" />
1715
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl" folder="lang" />
1816
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc/doc.mpl" folder="lang" />
1917
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd" folder="lang" />

0 commit comments

Comments
 (0)