From ce246df4a0eb388cb46d657b4af92b43b78b0263 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 9 Mar 2023 19:44:06 +1100 Subject: [PATCH] fix comment parsing --- .../main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java index c423d8ee7..fafe9e13b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java @@ -146,6 +146,7 @@ public class FmlParser extends ParserBase { throw lexer.error("Only unmapped mode PROVIDED is supported at this time"); } while (!lexer.hasToken("}")) { + String comments = lexer.hasComments() ? lexer.getAllComments() : null; String srcs = readPrefix(prefixes, lexer); lexer.token(":"); SourceLocation scloc = lexer.getCurrentLocation(); @@ -155,6 +156,11 @@ public class FmlParser extends ParserBase { String tgts = readPrefix(prefixes, lexer); Element g = getGroupE(map, srcs, tgts); 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); Element tgt = e.addElement("target"); tgt.makeElement("relationship").markLocation(relLoc).setValue(rel.toCode());