fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 08:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

DSDL parser: Support for ASCII character literals

Browse Source
This commit is contained in:
Pavel Kirienko
2014-06-15 22:25:46 +04:00
parent 2337a5d547
commit 163c3e0791
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyuavcan/pyuavcan/dsdl/parser.py
+12 -7
View File
@@ -308,14 +308,19 @@ class Parser:
enforce(attrtype.category == attrtype.CATEGORY_PRIMITIVE, 'Invalid type for constant')
init_expression = ''.join(init_expression.split()) # Remove spaces
value = evaluate_expression(init_expression)
if not isinstance(value, (float, int, bool)):
if isinstance(value, str) and len(value) == 1: # ASCII character
value = ord(value)
elif isinstance(value, (float, int, bool)): # Numeric literal
value = {
attrtype.KIND_UNSIGNED_INT : int,
attrtype.KIND_SIGNED_INT : int,
attrtype.KIND_BOOLEAN : int, # Not bool because we need to check range
attrtype.KIND_FLOAT : float
}[attrtype.kind](value)
else:
error('Invalid type of constant initialization expression [%s]', type(value).__name__)
value = {
attrtype.KIND_UNSIGNED_INT : int,
attrtype.KIND_SIGNED_INT : int,
attrtype.KIND_BOOLEAN : int, # Not bool because we need to check range
attrtype.KIND_FLOAT : float
}[attrtype.kind](value)
self.log.debug('Constant initialization expression evaluated as: [%s] --> %s', init_expression, repr(value))
attrtype.validate_value_range(value)
return Constant(attrtype, name, init_expression, value)