Conversation
|
This looks good, but now that I see the change, I don't think we want to expand the default values for struct array members. I added a comment to #925. I think we should just write out the default value of the struct, as the value is represented in FPP. If there's some reason that won't work in the GDS, we should try to address it on the GDS side. |
| val qualifiedName = dictionaryState.a.getQualifiedName(Symbol.Enum(t.node)).toString | ||
| s"${qualifiedName}.${v._1}".asJson // FQN of the enum constant | ||
| } | ||
| case Value.Struct(Value.AnonStruct(members), t) => members.map((key, value) => (key.toString -> valueAsJson(value))).asJson |
There was a problem hiding this comment.
As noted, the original code looks more correct here. The new code seems to be a special case to implement a difference between FPP semantics and GDS semantics. I'd rather keep those the same, if possible.
|
|
||
| res.asJson | ||
| } | ||
| val arrayRes = for(e <- elements) yield valueAsJson(e) |
There was a problem hiding this comment.
This looks like a code improvement (eliminating a special case). Can we keep this change and preserve the existing behavior?
| val arrayRes = for(e <- elements) yield valueAsJson(e) | ||
| arrayRes.asJson | ||
| } | ||
|
|
There was a problem hiding this comment.
As discussed in issue #925, after further discussion, I think we should revert this change. The current behavior is correct according to the way that FPP represents struct values with member arrays. However, @jwest115 can you make sure that the current F Prime JSON spec is consistent with the FPP model and the generated JSON here? This is a tricky case.
There was a problem hiding this comment.
Now I'm not so sure if we should revert. I think the root cause of the issue is that the dictionary JSON is underspecified here. I opened an issue on this: nasa/fprime#4787. There are at least two ways this could work:
-
When a struct member of type T has a size n, the value stored in the member must be a JSON array with n elements, each of type T. When there is no size, the value must be a single value of type T.
-
Regardless of whether the struct member has a size, the value stored in the member can be a single value or an array. If there is no size and an array of elements, the array size must be one. If there is a size and a single element, the single element is stored in every position in the array.
Probably we want option (1), but the JSON spec does not specify what behavior is intended. We should tighten up the JSON spec first, and then make the fpp-to-json output conform to it.
2 participants
Closes #925