honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix comment parsing

This commit is contained in:
Grahame Grieve 2023-03-09 19:44:06 +11:00
parent 921219639b
commit ce246df4a0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java
View File

@ -146,6 +146,7 @@ public class FmlParser extends ParserBase {
throw lexer.error("Only unmapped mode PROVIDED is supported at this time"); throw lexer.error("Only unmapped mode PROVIDED is supported at this time");
} }
while (!lexer.hasToken("}")) { while (!lexer.hasToken("}")) {
String comments = lexer.hasComments() ? lexer.getAllComments() : null;
String srcs = readPrefix(prefixes, lexer); String srcs = readPrefix(prefixes, lexer);
lexer.token(":"); lexer.token(":");
SourceLocation scloc = lexer.getCurrentLocation(); SourceLocation scloc = lexer.getCurrentLocation();
@ -155,6 +156,11 @@ public class FmlParser extends ParserBase {
String tgts = readPrefix(prefixes, lexer); String tgts = readPrefix(prefixes, lexer);
Element g = getGroupE(map, srcs, tgts); Element g = getGroupE(map, srcs, tgts);
Element e = g.addElement("element"); Element e = g.addElement("element");
if (comments != null) {
for (String s : comments.split("\\r\\n")) {
e.getComments().add(s);
}
}
e.makeElement("code").markLocation(scloc).setValue(sc.startsWith("\"") ? lexer.processConstant(sc) : sc); e.makeElement("code").markLocation(scloc).setValue(sc.startsWith("\"") ? lexer.processConstant(sc) : sc);
Element tgt = e.addElement("target"); Element tgt = e.addElement("target");
tgt.makeElement("relationship").markLocation(relLoc).setValue(rel.toCode()); tgt.makeElement("relationship").markLocation(relLoc).setValue(rel.toCode());