Proposal:
Make the expression of an "optional" field optional.
When parsing an optional field the parser always saves the current position before starting to parse the field.
If when parsing the field no "AssertionException" is being caught, this information is just discarded. If however such an exception is caught, then the parser resets the position to the initial position and the next field can continue parsing from that location.
In addition to this, we add a new field type: "assertion" ... these can generally be seen similar to "const" fields. However in contrast to "const" fields these need to be saved as properties in the model. An assert field contains an expression field. If the value parsed matches this, the value is saved in the property. If however this value doesn't match the expected value, an "AssertionException" is thrown.
These changes are intended especially for protocols like BacNET and PROFINET where there are optional fields, based on their content.
Example:
['0x07' BACnetUnconfirmedServiceRequestWhoHas [optional BACnetComplexTagUnsignedInteger 'deviceInstanceRangeLowLimit' ['0', 'BACnetDataType.UNSIGNED_INTEGER' ]] [optional BACnetComplexTagUnsignedInteger 'deviceInstanceRangeHighLimit' 'deviceInstanceRangeLowLimit != null' ['1', 'BACnetDataType.UNSIGNED_INTEGER' ]] [optional BACnetComplexTagOctetString 'objectIdentifier' ['2', 'BACnetDataType.OCTET_STRING' ]] [optional BACnetComplexTagOctetString 'objectName' 'objectIdentifier == null' ['3', 'BACnetDataType.OCTET_STRING' ]] ] |
[discriminatedType 'BACnetComplexTag' [uint 4 'tagNumberArgument', BACnetDataType 'dataType']
[assert uint 4 'tagNumber' 'tagNumberArgument' ]
[const TagClass 'tagClass' 'TagClass.CONTEXT_SPECIFIC_TAGS' ]
[simple uint 3 'lengthValueType' ]
[optional uint 8 'extTagNumber' 'tagNumber == 15' ]
[virtual uint 8 'actualTagNumber' 'tagNumber < 15 ? tagNumber : extTagNumber' ]
[virtual bit 'isPrimitiveAndNotBoolean' '!(lengthValueType == 6) && tagNumber != 1' ]
[optional uint 8 'extLength' 'isPrimitiveAndNotBoolean && lengthValueType == 5' ]
[optional uint 16 'extExtLength' 'isPrimitiveAndNotBoolean && lengthValueType == 5 && extLength == 254' ]
[optional uint 32 'extExtExtLength' 'isPrimitiveAndNotBoolean && lengthValueType == 5 && extLength == 255' ]
[virtual uint 32 'actualLength' 'lengthValueType == 5 && extLength == 255 ? extExtExtLength : (lengthValueType == 5 && extLength == 254 ? extExtLength : (lengthValueType == 5 ? extLength : (isPrimitiveAndNotBoolean ? lengthValueType : 0)))']
[typeSwitch 'dataType'
['NULL' BACnetComplexTagNull
]
['BOOLEAN' BACnetComplexTagBoolean
]
['UNSIGNED_INTEGER' BACnetComplexTagUnsignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
[array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
]
['SIGNED_INTEGER' BACnetComplexTagSignedInteger [uint 3 'lengthValueType', uint 8 'extLength']
[array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
]
['REAL' BACnetComplexTagReal [uint 3 'lengthValueType', uint 8 'extLength']
[simple float 8.23 'value']
]
['DOUBLE' BACnetComplexTagDouble [uint 3 'lengthValueType', uint 8 'extLength']
[simple float 11.52 'value']
]
['OCTET_STRING' BACnetComplexTagOctetString [uint 32 'actualLength']
// TODO: The reader expects int but uint32 get's mapped to long so even uint32 would easily overflow...
[virtual uint 16 'actualLengthInBit' 'actualLength * 8']
[simple string 'actualLengthInBit' 'ASCII' 'theString']
]
['CHARACTER_STRING' BACnetComplexTagCharacterString
]
['BIT_STRING' BACnetComplexTagBitString [uint 3 'lengthValueType', uint 8 'extLength']
[simple uint 8 'unusedBits']
[array int 8 'data' length '(lengthValueType == 5) ? (extLength - 1) : (lengthValueType - 1)']
]
['ENUMERATED' BACnetComplexTagEnumerated [uint 3 'lengthValueType', uint 8 'extLength']
[array int 8 'data' length '(lengthValueType == 5) ? extLength : lengthValueType']
]
['DATE' BACnetComplexTagDate
]
['TIME' BACnetComplexTagTime
]
['BACNET_OBJECT_IDENTIFIER' BACnetComplexTagObjectIdentifier
]
]
] |
Especially in parts of the PROFINET protocol, the endianess needs to change througout the protocol stack. So our current approach with one fixed endianess doesn't work well in this case. I've tried using manual fields, but the result was everything but ideal.
In general I've encountered multiple situations:
In order to address this we discussed 3 options:
All options have their advantage/disadvantage.
Adding a flag to the field would simply require us to come up with a sensible notation, which I haven't currently found anything I would feel comfortable with.
With adding a flag to a type: This seems simple, but how would we control this from the usage?
In all cases we would simply make the "endianess" setting in the ReadBuffer and WriteBuffer writable. So we can simply read the endianess settings a buffer currently has and we can change this. This would not require us to copy and duplicate the datastructures and waste memory. Reading BE or LE has absolutely no impact on how the read/write-position is updated ... it simply controlls if the read values are returned in an inverted byte order. So it should not have any memory or performance impact, even if we keept toggling endianess after every field we read.
I would propose implementing two of these aboe scenarios:
Now to my reasoning:
Usually, it will not only be one field that needs to be switched, so adding a flag to the fields would require duplicating a lot of the flagging-code to the mspec documents. Using a block of equally endianed fields simplifies things. And in addition to that it explicitly focusses on the detail of setting the endianess, which should simplify implementing this in the code-generation ... as a endianessSwitch simply gets converted into an allmost constant try-finally block.
Not allowing dynamic switching in types and simply forcing this to be constant solves the problem of how the system tells the parser which endianess to use.
So taking into account the 3 scenarios above. This would then be solved the following way:
Set the UDP or the PROFINET IO CM Block type definitions to "BE".
Use a endinanessSwitch.
If the type definition doesn't have any BE/LE flags, it simply uses the endianess of the parent.
We can support all three cases:
[batchSetAttribute endianess='integerEncoding == IntegerEncoding.BIG_ENDIAN'
[simple sometype field1...]
[simple sometype field2...]
[simple sometype field3...]
[simple sometype field4...]
][simple sometype field1... endianess='integerEncoding == IntegerEncoding.BIG_ENDIAN']Defining it this way it would be future-proof, robust and re-useable for other attributes. Additionally I would (a discussed ages ago) define a top-level element for endianess in the mspec to make it part of the definition.
It seems that we should name the attribute "byte order" instead of "endianess".
Right now all simple types (except bit) have a fixed lenght. The string type was changed to support expressions.
This sort of makes things a bit inconsistent, because a fixed length string field would require providing the constant lenght in an expression.
It would be good if a fixed length would use the usual length and if a dynamic length would use either a different name "vstring" (just a thought) or if it could use both notations.
Also could we use the attribute concept sebastian for the endianess for the encoding. So the default would be UTF-8, but it could be changed with "encoding='UTF-16'".
Especially for Java the templates have been becoming more and more complex. Especially when we would be adding all of the "byte order setting" this would become quite unmaintainable.
The idea was to create a set of static functions, that can be imported with static imports, that handle the logic for the different types of fields have.
Every field method would have the individual read/write operation as first argument, followed by all the mandatory pieces of information.
Optional attributes would be passed with var-arg parameters at the end.
// Simple Types
int apple = simpleFieldWrapper(() -> readBuffer.readUnsignedByte("IntegerEncoding", 4), WithByteOrder(ByteOrder.LITTLE_ENDIAN));
// Complex Type
Banana banana = simpleFieldWrapper(() -> readBuffer.readUnsignedByte("IntegerEncoding", 4), WithByteOrder(ByteOrder.LITTLE_ENDIAN), WithContext("banana"));
// Optional Fields
Banana banana = optionalFieldWrapper(() -> readBuffer.readUnsignedByte("IntegerEncoding", 4), (apple > 10), WithByteOrder(ByteOrder.LITTLE_ENDIAN), WithContext("banana"));
// Const Fields
int coolConst = constFieldWrapper(() -> readBuffer.readUnsignedByte("IntegerEncoding", 4), 0x04, WithByteOrder(ByteOrder.LITTLE_ENDIAN));
...
|