honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-08 05:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mend

Browse Source
This commit is contained in:
Oliver Egger 2020-08-25 23:34:33 +02:00
parent f0667ed3e2
commit 8f302e0063
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java
View File

@ -914,6 +914,9 @@ public class StructureMapUtilities {
String comment = null; String comment = null;
if (lexer.hasComment()) { if (lexer.hasComment()) {
comment = getMultiLineComments(lexer); comment = getMultiLineComments(lexer);
if (lexer.done()) {
return ;
}
} }
lexer.token("group"); lexer.token("group");
StructureMapGroupComponent group = result.addGroup(); StructureMapGroupComponent group = result.addGroup();
@ -1010,7 +1013,6 @@ public class StructureMapUtilities {
private void parseRule(StructureMap map, List<StructureMapGroupRuleComponent> list, FHIRLexer lexer, boolean newFmt) throws FHIRException { private void parseRule(StructureMap map, List<StructureMapGroupRuleComponent> list, FHIRLexer lexer, boolean newFmt) throws FHIRException {
StructureMapGroupRuleComponent rule = new StructureMapGroupRuleComponent(); StructureMapGroupRuleComponent rule = new StructureMapGroupRuleComponent();
list.add(rule);
if (!newFmt) { if (!newFmt) {
rule.setName(lexer.takeDottedToken()); rule.setName(lexer.takeDottedToken());
lexer.token(":"); lexer.token(":");
@ -1018,8 +1020,12 @@ public class StructureMapUtilities {
} else { } else {
if (lexer.hasComment()) { if (lexer.hasComment()) {
rule.setDocumentation(this.getMultiLineComments(lexer)); rule.setDocumentation(this.getMultiLineComments(lexer));
if (lexer.hasToken("}")) {
return ; // catched a comment at the end
} }
} }
}
list.add(rule);
boolean done = false; boolean done = false;
while (!done) { while (!done) {
parseSource(rule, lexer); parseSource(rule, lexer);