Skip to content

Fixed XSD Choice Field resresentation in BNF #31

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

Merged
ARaack merged 37 commits into from
Jan 22, 2026
Merged

Fixed XSD Choice Field resresentation in BNF #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7872736
fix of xsd generation and handling of choice in group mapped to BNF
ARaack Oct 30, 2025
6f1c11b
switching off log level
ARaack Oct 30, 2025
55354a0
updated sandbox example for smartreference
ARaack Oct 30, 2025
e2fe963
fixed interface nameing compare issue
ARaack Oct 31, 2025
265a3db
run migration
ARaack Nov 3, 2025
26bec9c
fixed import of temporary instance
ARaack Nov 3, 2025
2563ea1
updated template generation from bnf to split into multilanguages in …
ARaack Nov 10, 2025
c539c29
sandbox update
ARaack Nov 10, 2025
32bb4cc
updated dependencies
ARaack Nov 10, 2025
4160e0d
sandbox update
ARaack Nov 10, 2025
9c243d2
refactor generator language creation by node size instead of concept …
ARaack Nov 10, 2025
be89898
added new bnf annotation attribute for mark xml generation as node at…
ARaack Nov 11, 2025
95dd17c
added new bnf annotation attribute for mark xml generation as node at…
ARaack Nov 12, 2025
a85efbb
introduced skip lists on name bases
ARaack Nov 12, 2025
d044225
changed generator skip from bnf reference value instead of target value
ARaack Nov 12, 2025
ae8105e
changed generator skip from bnf reference value instead of target value
ARaack Nov 14, 2025
fb47110
new additional configuration for Build Editor introduced
ARaack Nov 17, 2025
96691df
optimized generation BNF from XSD Definitions
ARaack Nov 17, 2025
0832c11
dependency fix
ARaack Nov 17, 2025
af72b66
removed type check for concept property cause name should be enough c…
ARaack Nov 18, 2025
9ab2d1c
fixed IF-Null check for Property Nodes
ARaack Nov 19, 2025
75d7c81
fixed generator and refactored it for template generation
ARaack Nov 21, 2025
d3d3098
fixed Loop Macro
ARaack Nov 21, 2025
ba2eea8
added condition for loop macro in case of interface declaration
ARaack Nov 24, 2025
d497bc1
increased build package version
ARaack Nov 24, 2025
8ebd38e
Fix of Enum creation with check of existing declarations
ARaack Nov 25, 2025
b9d135c
fixed enum postfix name cause type is not availabel in check on the t…
ARaack Nov 28, 2025
caf1f91
fixed breake point in inner loop
ARaack Nov 28, 2025
f70bd5b
optimized normalize names by concept search
ARaack Dec 5, 2025
31997da
optimized normalize names by concept search
ARaack Dec 5, 2025
757b723
fixed name reference in case of optional name available for xsd imports
ARaack Dec 8, 2025
89eef32
Added Annotations to external Concept Reference in BNFTerm
ARaack Dec 10, 2025
2af7f6a
Removed Indent for AsValue in generator template
ARaack Dec 10, 2025
8914cdc
update build version
ARaack Dec 15, 2025
ddf97a9
changed linked horizontel collection to only value declarations
ARaack Dec 16, 2025
bbfca07
fixed showIf concdition for references
ARaack Dec 22, 2025
92173ab
code cleanup, removed dead code or commented out part.s
ARaack Jan 22, 2026
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
}

group = "de.pes.MetaBNF"
version = "2024.1.18"
version = "2024.1.20"
description = "MetaBNF provides MPS-based languages for working with Backus-Naur Form (BNF). It enables users to define, edit, and analyze BNF grammars directly in JetBrains MPS, facilitating language design, parsing, and formal grammar processing."

val projectName = "MetaBNF"
Expand Down
13 changes: 0 additions & 13 deletions code/languages/de.pes.metabnf.base/de.pes.metabnf.base.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
<dependency reexport="false">4755f87e-2a4b-42d9-9618-31bc36f204af(de.pes.metabnf.utils)</dependency>
<dependency reexport="false">926d63aa-027c-47a4-939e-98f42e63df1a(de.pes.metabnf.basic)</dependency>
</dependencies>
<languageVersions>
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
Expand Down Expand Up @@ -119,24 +118,12 @@
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
<module reference="fcef6129-077e-482d-b29d-d74df3291d94(de.pes.metabnf.base)" version="0" />
<module reference="926d63aa-027c-47a4-939e-98f42e63df1a(de.pes.metabnf.basic)" version="0" />
<module reference="4755f87e-2a4b-42d9-9618-31bc36f204af(de.pes.metabnf.utils)" version="0" />
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
Expand Down
8 changes: 4 additions & 4 deletions code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<node concept="2OqwBi" id="5SQJARQ4boZ" role="2Oq$k0">
<node concept="13iPFW" id="5SQJARQ4bbP" role="2Oq$k0" />
<node concept="3TrEf2" id="5SQJARQ4bSd" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" />
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" resolve="ref" />
</node>
</node>
<node concept="2qgKlT" id="5SQJARQ4cEI" role="2OqNvi">
Expand Down Expand Up @@ -262,7 +262,7 @@
<node concept="2OqwBi" id="5SQJARSEMb8" role="3cqZAk">
<node concept="13iPFW" id="5SQJARSELYZ" role="2Oq$k0" />
<node concept="3TrEf2" id="5SQJARSEMBS" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" />
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" resolve="ref" />
</node>
</node>
</node>
Expand Down Expand Up @@ -331,7 +331,7 @@
<node concept="2pJPED" id="5SQJARSw0HN" role="2pJPEn">
<ref role="2pJxaS" to="tpc2:66t_lskdtZC" resolve="EditorComponentDeclarationReference" />
<node concept="2pIpSj" id="5SQJARSw18d" role="2pJxcM">
<ref role="2pIpSl" to="tpc2:66t_lskdu99" />
<ref role="2pIpSl" to="tpc2:66t_lskdu99" resolve="editorComponent" />
<node concept="36biLy" id="5SQJARSw1bV" role="28nt2d">
<node concept="37vLTw" id="5SQJARSw1ck" role="36biLW">
<ref role="3cqZAo" node="5SQJARSw06S" resolve="node" />
Expand Down Expand Up @@ -371,7 +371,7 @@
<node concept="2OqwBi" id="1UvZxkXSr3X" role="2Oq$k0">
<node concept="13iPFW" id="1UvZxkXSr3Y" role="2Oq$k0" />
<node concept="3TrEf2" id="1UvZxkXSr3Z" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" />
<ref role="3Tt5mk" to="yot6:5SQJARPL5HE" resolve="ref" />
</node>
</node>
<node concept="2qgKlT" id="1UvZxkXSr40" role="2OqNvi">
Expand Down
33 changes: 16 additions & 17 deletions code/languages/de.pes.metabnf.base/models/de.pes.metabnf.base.editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
<import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
<import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
<import index="1mfk" ref="r:f5e14f50-251c-4224-a7ce-b27c5c69c7d8(de.pes.metabnf.basic.editor)" />
</imports>
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
Expand Down Expand Up @@ -571,7 +570,7 @@
<ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
</node>
<node concept="3F1sOY" id="hF4wv7s" role="3EZMnx">
<ref role="1NtTu8" to="yot6:hd2AuTj" />
<ref role="1NtTu8" to="yot6:hd2AuTj" resolve="filter" />
</node>
<node concept="2iRfu4" id="i2IxuQ9" role="2iSdaV" />
</node>
Expand All @@ -581,7 +580,7 @@
<ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
</node>
<node concept="3F1sOY" id="hF4wxIl" role="3EZMnx">
<ref role="1NtTu8" to="yot6:gAczzzC" />
<ref role="1NtTu8" to="yot6:gAczzzC" resolve="cellLayout" />
</node>
<node concept="VPM3Z" id="hF4wxIn" role="3F10Kt">
<property role="VOm3f" value="false" />
Expand Down Expand Up @@ -621,7 +620,7 @@
<node concept="2OqwBi" id="3ZqNA5AjMid" role="2Oq$k0">
<node concept="pncrf" id="3ZqNA5AjMic" role="2Oq$k0" />
<node concept="3TrEf2" id="3ZqNA5AjMih" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:3ZqNA5Aj2vB" />
<ref role="3Tt5mk" to="yot6:3ZqNA5Aj2vB" resolve="usesFoldingCondition" />
</node>
</node>
<node concept="3w_OXm" id="3ZqNA5AjMim" role="2OqNvi" />
Expand All @@ -630,7 +629,7 @@
</node>
</node>
<node concept="3F1sOY" id="3ZqNA5AjMio" role="1QoVPY">
<ref role="1NtTu8" to="yot6:5fDszETGVtQ" />
<ref role="1NtTu8" to="yot6:5fDszETGVtQ" resolve="foldedCellModel" />
</node>
<node concept="VPXOz" id="3ZqNA5AjMia" role="3F10Kt">
<property role="VOm3f" value="true" />
Expand Down Expand Up @@ -678,7 +677,7 @@
<node concept="2OqwBi" id="Ny5pAsxJJk" role="3uHU7B">
<node concept="pncrf" id="Ny5pAsxJJj" role="2Oq$k0" />
<node concept="3TrEf2" id="Ny5pAsxJQs" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" />
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" resolve="separatorTextQuery" />
</node>
</node>
</node>
Expand Down Expand Up @@ -737,7 +736,7 @@
<node concept="2OqwBi" id="3EUGuXc4PaE" role="2Oq$k0">
<node concept="3GMtW1" id="3EUGuXc4PaD" role="2Oq$k0" />
<node concept="3TrEf2" id="3EUGuXc4PaI" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" />
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" resolve="separatorTextQuery" />
</node>
</node>
<node concept="2oxUTD" id="3EUGuXc4PaN" role="2OqNvi">
Expand Down Expand Up @@ -771,7 +770,7 @@
<node concept="2iRfu4" id="i2IxuT4" role="2iSdaV" />
<node concept="3F1sOY" id="Ny5pAsxJQD" role="3EZMnx">
<property role="2ru_X1" value="true" />
<ref role="1NtTu8" to="yot6:Ny5pAsx39_" />
<ref role="1NtTu8" to="yot6:Ny5pAsx39_" resolve="separatorTextQuery" />
<ref role="1ERwB7" to="tpc5:7r9L9Fo9LsW" resolve="CellModel_RefNodeList_RemoveSeparatorQuery_Actions" />
<node concept="OXEIz" id="3EUGuXc80Kh" role="P5bDN">
<node concept="1ou48o" id="3EUGuXc80Ki" role="OY2wv">
Expand Down Expand Up @@ -820,7 +819,7 @@
<node concept="2OqwBi" id="3EUGuXc83Jd" role="2Oq$k0">
<node concept="3GMtW1" id="3EUGuXc83Jc" role="2Oq$k0" />
<node concept="3TrEf2" id="3EUGuXc83Jh" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" />
<ref role="3Tt5mk" to="yot6:Ny5pAsx39_" resolve="separatorTextQuery" />
</node>
</node>
<node concept="3YRAZt" id="3EUGuXc83Jm" role="2OqNvi" />
Expand Down Expand Up @@ -885,7 +884,7 @@
<node concept="3F1sOY" id="hWtqYt9" role="3EZMnx">
<property role="1$x2rV" value="default" />
<property role="39s7Ar" value="false" />
<ref role="1NtTu8" to="yot6:hWsWeqI" />
<ref role="1NtTu8" to="yot6:hWsWeqI" resolve="separatorStyle" />
<node concept="VPXOz" id="hWtsp9o" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
Expand All @@ -912,7 +911,7 @@
</node>
<node concept="3F1sOY" id="hF4w_SC" role="3EZMnx">
<property role="1$x2rV" value="&lt;no factory&gt;" />
<ref role="1NtTu8" to="yot6:h84_6ER" />
<ref role="1NtTu8" to="yot6:h84_6ER" resolve="nodeFactory" />
</node>
<node concept="VPM3Z" id="hF4w_SD" role="3F10Kt">
<property role="VOm3f" value="false" />
Expand All @@ -929,7 +928,7 @@
</node>
<node concept="1iCGBv" id="hF4w_SJ" role="3EZMnx">
<property role="1$x2rV" value="&lt;default&gt;" />
<ref role="1NtTu8" to="yot6:h4APPx9" />
<ref role="1NtTu8" to="yot6:h4APPx9" resolve="elementActionMap" />
<node concept="1sVBvm" id="hF4w_SK" role="1sWHZn">
<node concept="3F0A7n" id="hF4w_SL" role="2wV5jI">
<property role="1Intyy" value="true" />
Expand All @@ -952,7 +951,7 @@
</node>
<node concept="3F1sOY" id="hF4w_SS" role="3EZMnx">
<property role="1$x2rV" value="&lt;default&gt;" />
<ref role="1NtTu8" to="yot6:gXk68OO" />
<ref role="1NtTu8" to="yot6:gXk68OO" resolve="elementMenuDescriptor" />
<node concept="VPXOz" id="hFayl71" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
Expand All @@ -978,7 +977,7 @@
</node>
<node concept="3F1sOY" id="6k6gsLy9nOE" role="3EZMnx">
<ref role="1ERwB7" to="tpc5:6k6gsLy9Jgf" resolve="CellModel_RefNodeList_AddHint_Actions" />
<ref role="1NtTu8" to="yot6:6k6gsLy95p6" />
<ref role="1NtTu8" to="yot6:6k6gsLy95p6" resolve="addHints" />
</node>
<node concept="2iRfu4" id="6k6gsLy9nOF" role="2iSdaV" />
</node>
Expand All @@ -995,7 +994,7 @@
</node>
<node concept="3F1sOY" id="6k6gsLy9nOK" role="3EZMnx">
<ref role="1ERwB7" to="tpc5:6k6gsLy9tOQ" resolve="CellModel_RefNodeList_RemoveHint_Actions" />
<ref role="1NtTu8" to="yot6:6k6gsLy95p7" />
<ref role="1NtTu8" to="yot6:6k6gsLy95p7" resolve="removeHints" />
</node>
<node concept="2iRfu4" id="6k6gsLy9nOL" role="2iSdaV" />
</node>
Expand Down Expand Up @@ -1038,7 +1037,7 @@
<node concept="2OqwBi" id="5SQJARUxraE" role="2Oq$k0">
<node concept="7Obwk" id="5SQJARUxqV_" role="2Oq$k0" />
<node concept="3TrEf2" id="5SQJARUxrV0" role="2OqNvi">
<ref role="3Tt5mk" to="yot6:3ZqNA5Aj2vB" />
<ref role="3Tt5mk" to="yot6:3ZqNA5Aj2vB" resolve="usesFoldingCondition" />
</node>
</node>
<node concept="2DeJnY" id="5SQJARUxtCw" role="2OqNvi" />
Expand Down Expand Up @@ -1144,7 +1143,7 @@
</node>
<node concept="PKFIW" id="7FZiyulhhKI">
<property role="TrG5h" value="DummyForGrammarCells" />
<ref role="1XX52x" to="tpck:gw2VY9q" />
<ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="3F0ifn" id="7FZiyulhhKJ" role="2wV5jI">
<property role="3F0ifm" value="Workaround to fix contributions to BaseConcept generated by grammarCells." />
</node>
Expand Down
Loading