Add missing hex value

christoph2 · Jan 23, 2019 · 5d777f9 · 5d777f9
1 parent da61b3e
commit 5d777f9
Show file tree

Hide file tree

Showing 6 changed files with 2,523 additions and 4,669 deletions.
diff --git a/pydbc/ldf.g4 b/pydbc/ldf.g4
@@ -393,8 +393,10 @@ signal_representation_entry:
 **  Lexer.
 **
 */
+
 intValue:
     i = INT
+    | h = HEX
     ;
 
 floatValue:
@@ -439,6 +441,13 @@ INT:
     SIGN? '0'..'9'+
     ;
 
+HEX:
+    '0'('x' | 'X') HEX_DIGIT+
+    ;
+
+fragment
+HEX_DIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;
+
 fragment
 ESC_SEQ:
       '\\' (

diff --git a/pydbc/ldfListener.py b/pydbc/ldfListener.py
@@ -308,8 +308,8 @@ def exitPhysical_range(self, ctx):
         maxValue = ctx.maxValue.value
         #scale = ctx.scale.value if ctx.scale else None
         #offset = ctx.offset.value
-        scale = ctx.scale
-        offset = ctx.offset
+        scale = ctx.s.value
+        offset = ctx.o.value
         ctx.value = dict(min = minValue, max = maxValue, scale = scale, offset = offset)
 
     def exitBcd_value(self, ctx):

diff --git a/pydbc/ncf.g4 b/pydbc/ncf.g4
@@ -302,8 +302,10 @@ free_text_definition:
     '}'
     ;
 
+
+
 intValue:
-      i = INT
+    i = INT
     | h = HEX
     ;
 
@@ -344,6 +346,7 @@ FLOAT:
     )
     ;
 
+
 INT:
     SIGN? '0'..'9'+
     ;