Add hex value parsing to set default

Author: Christian Toepfer

pyrobuf/parse_proto.py

@@ -33,6 +33,7 @@ class Parser(object):
         ('COMMA', r','),
         ('SKIP', r'\s'),
         ('SEMICOLON', r';'),
+        ('HEXVALUE', r'(0x[0-9A-Fa-f]+)'),
         ('NUMERIC', r'(-?[0-9]*\.?[0-9]+(?:[eE][-+]?[0-9]+)?)'),
         ('STRING', r'("(?:\\.|[^"\\])*"|\'(?:\\.|[^"\\])*\')'),
         ('BOOLEAN', r'(true|false)'),
@@ -546,8 +547,12 @@ def _parse_default(self, field, tokens):
             # This will get updated later
             field.default = token.full_name
             return
+        elif token.token_type == 'HEXVALUE':
+            assert field.type in self.scalars.difference({'bool', 'enum'}), \
+                "attempting to set hex value as default for non-numeric field on line {}: '{}'".format(
+                token.line + 1, self.lines[token.line])
         elif token.token_type == 'NUMERIC':
-            assert field.type in self.scalars, \
+            assert field.type in self.scalars.difference({'bool', 'enum'}), \
                 "attempting to set numeric as default for non-numeric field on line {}: '{}'".format(
                     token.line + 1, self.lines[token.line])
             if field.type not in self.floats:
@@ -907,6 +912,13 @@ def __init__(self, line, value):
             self.line = line
             self.value = float(value)
 
+    class HexValue(Token):
+        token_type = 'HEXVALUE'
+
+        def __init__(self, line, value):
+            self.line = line
+            self.value = int(value, 16)
+
     class String(Token):
         token_type = 'STRING'
 

setup.py

@@ -10,7 +10,7 @@
 import sys
 
 
-VERSION = "0.9.0.6"
+VERSION = "0.9.0.7"
 HERE = os.path.dirname(os.path.abspath(__file__))
 PYROBUF_DEFS_PXI = "pyrobuf_defs.pxi"
 PYROBUF_LIST_PXD = "pyrobuf_list.pxd"