Update exitPartialIdentifier rule

christoph2 · Apr 17, 2020 · 860a281 · 860a281
1 parent c6d6d55
commit 860a281
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/pya2l/a2l.g4 b/pya2l/a2l.g4
@@ -104,7 +104,7 @@ byteOrder:
 
 calibrationAccess:
      'CALIBRATION_ACCESS'
-    
+
     type_ =
     (
         'CALIBRATION' |
@@ -122,7 +122,7 @@ defaultValue:
 
 deposit:
      'DEPOSIT'
-    
+
     mode_ =
     (
         'ABSOLUTE' |
@@ -187,7 +187,7 @@ maxRefresh:
 
 monotony:
      'MONOTONY'
-    
+
     monotony_ =
     (
         'MON_DECREASE' |
@@ -358,7 +358,7 @@ characteristic:
     BEGIN 'CHARACTERISTIC'
     name = identifierValue
     longIdentifier = stringValue
-    
+
     type_ =
     (
         'ASCII' |
@@ -411,7 +411,7 @@ characteristic:
 
 axisDescr:
     BEGIN 'AXIS_DESCR'
-    
+
     attribute =
     (
         'CURVE_AXIS' |
@@ -517,7 +517,7 @@ compuMethod:
     BEGIN 'COMPU_METHOD'
     name = identifierValue
     longIdentifier = stringValue
-    
+
     conversionType =
     (
         'IDENTICAL' |
@@ -590,7 +590,7 @@ compuTab:
     BEGIN 'COMPU_TAB'
     name = identifierValue
     longIdentifier = stringValue
-    
+
     conversionType =
     (
         'TAB_INTP' |
@@ -617,7 +617,7 @@ compuVtab:
     BEGIN 'COMPU_VTAB'
     name = identifierValue
     longIdentifier = stringValue
-    
+
     conversionType =
         'TAB_VERB'
 
@@ -835,7 +835,7 @@ errorMask:
 
 layout:
      'LAYOUT'
-    
+
     indexMode =
     (
         'ROW_DIR' |
@@ -975,7 +975,7 @@ epk:
 
 memoryLayout:
     BEGIN 'MEMORY_LAYOUT'
-    
+
     prgType =
     (
         'PRG_CODE' |
@@ -1002,7 +1002,7 @@ memorySegment:
     BEGIN 'MEMORY_SEGMENT'
     name = identifierValue
     longIdentifier = stringValue
-    
+
     prgType =
     (
         'CALIBRATION_VARIABLES' |
@@ -1015,7 +1015,7 @@ memorySegment:
         'VARIABLES'
     )
 
-    
+
     memoryType =
     (
         'EEPROM' |
@@ -1026,7 +1026,7 @@ memorySegment:
         'REGISTER'
     )
 
-    
+
     attribute =
     (
         'INTERN' |
@@ -1289,7 +1289,7 @@ fncValues:
      'FNC_VALUES'
     position = integerValue
     datatype = dataType
-    
+
     indexMode =
     (
         'ALTERNATE_CURVES' |
@@ -1509,7 +1509,7 @@ unit:
     name = identifierValue
     longIdentifier = stringValue
     display = stringValue
-    
+
     type_ =
     (
         'DERIVED' |
@@ -1625,7 +1625,7 @@ varForbiddenComb:
 
 varNaming:
      'VAR_NAMING'
-    
+
     tag =
     (
         'NUMERIC' |
@@ -1656,7 +1656,7 @@ identifierValue:
     ;
 
 partialIdentifier:
-    i = IDENT (a = arraySpecifier)*
+    i = IDENT (a += arraySpecifier)*
     ;
 
 arraySpecifier:

diff --git a/pya2l/a2l_listener.py b/pya2l/a2l_listener.py
@@ -127,12 +127,11 @@ def exitIdentifierValue(self, ctx):
         ctx.value = text
 
     def exitPartialIdentifier(self, ctx):
-        text = ctx.i.text if ctx.i else None
-        arr = ctx.a.value if ctx.a else None
-        if arr is not None:
-            ctx.value = "{}[{}]".format(text, arr)
-        else:
-            ctx.value = text
+        text = ctx.i.text if ctx.i else ""
+        result = ""
+        for element in ctx.a:
+            result += "[{}]".format(element.value)
+        ctx.value = text + result
 
     def exitArraySpecifier(self, ctx):
         if ctx.i is not None: