From 2add3d7829095d371b05f67f5ca38ee2198dd32a Mon Sep 17 00:00:00 2001 From: Carlos Rueda Date: Tue, 2 Mar 2021 12:45:19 -0800 Subject: [PATCH] 71 is a regression caused by commits post eccee9a16 --- changelog.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/changelog.md b/changelog.md index d92595c..69a364e 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,48 @@ - noting very slow `> test` completion, reported as 15-21secs by sbt on my mac (after a full compile). Similar test with commit eccee9a16 (prior to graph stuff) takes 4-6 secs. Of course there's maybe a couple of new tests, but the difference is very significant. + + - The issue here is that the model is built incorrectly: + + > runMain tscfg.ModelBuilder src/main/tscfg/example/issue71.spec.conf + ... + ModelBuilderResult: + { + example: { + a: optional STRING default='Shared' + b: [ STRING ] + c: [ STRING ] + } + } + + Note, all the `@define`s are lost! + + - Trying the same with that previous commit eccee9a16 creates the model as expected: + + > runMain tscfg.ModelBuilder src/main/tscfg/example/issue71.spec.conf + ModelBuilderResult: + { + #@define + Shared: { + c: STRING + d: { + e: INTEGER + } + } + #@define + Shared2: { + dd: STRING + dddd: { + eeee: INTEGER + } + } + example: { + a: ObjectRefType(namespace='', simpleName='Shared') + b: [ ObjectRefType(namespace='', simpleName='Shared') ] + c: [ ObjectRefType(namespace='', simpleName='Shared2') ] + } + } + 2020-12 - 0.9.982