Add retain to type export #109
Conversation
| @@ -377,20 +379,35 @@ abstract class ForteFBTemplate<T extends FBType> extends ForteLibraryElementTemp | |||
|
|
|||
| def protected generateSetInitialValuesDeclaration(Iterable<VarDeclaration> variables) ''' | |||
| «IF !variables.empty» | |||
| void setInitialValues() override; | |||
| void setInitialValues(bool retain) override; | |||
There was a problem hiding this comment.
Why do we need a new boolean parameter here? Is there a case where we do not want to retain variables marked as RETAIN?
There was a problem hiding this comment.
Yes we need the boolean argument. But it should be called cold. To indicate the right meaning of this variable.
| if (!retain) { | ||
| «generateVariables(variables.filter[it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE) !== null && it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE).equals(RetainTag.RETAIN.string)])» | ||
| } | ||
| «generateVariables(variables.filter[it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE) === null || !it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE).equals(RetainTag.RETAIN.string)])» |
There was a problem hiding this comment.
I would suggest moving the filter argument into a separate method.
| «generateVariables(variables.filter[it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE) === null || !it.getAttributeValue(LibraryElementTags.RETAIN_ATTRIBUTE).equals(RetainTag.RETAIN.string)])» | ||
| ''' | ||
|
|
||
| def private generateVariables(Iterable<VarDeclaration> variables)''' |
There was a problem hiding this comment.
Please give this method a more descriptive name, such as generateVariableDefaultAssignments.
| «ENDIF» | ||
| ''' | ||
|
|
||
| def protected generateSetInitialValuesDefinition(Iterable<VarDeclaration> variables) ''' | ||
| «IF !variables.empty» | ||
| void «className»::setInitialValues(bool retain) { | ||
| void «className»::setInitialValues(bool cold) { |
There was a problem hiding this comment.
I missed that yesterday but can you please move the cold) { part into the if and else, and in the else only add ){
Because if there are no retain variables the cold param is not needed.
And as we are at it: In 4diac FORTE we have the coding guideline that function parameters stat with pa. So please change cold to paCold.
as discussed the setInitialValues() will only effect the values of variables during a warm restart. therefore it should only contain variables not tagged with RETAIN
...ordiac.ide.export.forte_ng/src/org/eclipse/fordiac/ide/export/forte_ng/ForteFBTemplate.xtend
Show resolved
Hide resolved
| «ENDIF» | ||
| ''' | ||
|
|
||
|
|
||
| //todo escape new line character |
| def protected generateSetInitialValuesDefinition(Iterable<VarDeclaration> variables) ''' | ||
| «IF(containsNonRetainedVariable(variables))» | ||
| void «className»::setInitialValues() { | ||
| «generateVariableDefaultAssignment(variables.filter[!isRetainedVariable(it)])» | ||
| } | ||
| «ENDIF» | ||
|
|
There was a problem hiding this comment.
Please move the empty line inside the ENDIF (where it was initially), so that it is only added when a setInitialValues is present.
No description provided.