From e21142f7469a1622b9602a9c015667c4972c511a Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Sun, 2 Mar 2014 14:50:58 +0400 Subject: [PATCH] Simplified PrimitiveType.get_normalized_definition() --- pyuavcan/pyuavcan/dsdl/parser.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pyuavcan/pyuavcan/dsdl/parser.py b/pyuavcan/pyuavcan/dsdl/parser.py index 5fe5f12031..058ffc0029 100644 --- a/pyuavcan/pyuavcan/dsdl/parser.py +++ b/pyuavcan/pyuavcan/dsdl/parser.py @@ -48,16 +48,12 @@ class PrimitiveType(Type): def get_normalized_definition(self): cast_mode = 'saturated' if self.cast_mode == PrimitiveType.CAST_MODE_SATURATED else 'truncated' - if self.kind == PrimitiveType.KIND_BOOLEAN: - primary_type = 'bool' - elif self.kind == PrimitiveType.KIND_UNSIGNED_INT: - primary_type = 'uint' + str(self.bit_len) - elif self.kind == PrimitiveType.KIND_SIGNED_INT: - primary_type = 'int' + str(self.bit_len) - elif self.kind == PrimitiveType.KIND_FLOAT: - primary_type = 'float' + str(self.bit_len) - else: - raise DsdlException('Primitive type of unknown kind', self.kind) + primary_type = { + PrimitiveType.KIND_BOOLEAN: 'bool', + PrimitiveType.KIND_UNSIGNED_INT: 'uint' + str(self.bit_len), + PrimitiveType.KIND_SIGNED_INT: 'int' + str(self.bit_len), + PrimitiveType.KIND_FLOAT: 'float' + str(self.bit_len) + }[self.kind] return cast_mode + ' ' + primary_type def validate_value_range(self, value):