#451 The parser now supports COMP-9 (Cobrix extension).

Author: yruslan

cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/ParserVisitor.scala

@@ -21,7 +21,7 @@ import java.nio.charset.Charset
 import org.antlr.v4.runtime.{ParserRuleContext, RuleContext}
 import za.co.absa.cobrix.cobol.parser.CopybookParser
 import za.co.absa.cobrix.cobol.parser.CopybookParser.CopybookAST
-import za.co.absa.cobrix.cobol.parser.ast.datatype.{AlphaNumeric, COMP1, COMP2, COMP3, COMP4, COMP5, CobolType, Decimal, Integral, Usage}
+import za.co.absa.cobrix.cobol.parser.ast.datatype.{AlphaNumeric, COMP1, COMP2, COMP3, COMP4, COMP5, COMP9, CobolType, Decimal, Integral, Usage}
 import za.co.absa.cobrix.cobol.parser.ast.{Group, Primitive}
 import za.co.absa.cobrix.cobol.parser.common.Constants
 import za.co.absa.cobrix.cobol.parser.decoders.DecoderSelector
@@ -124,6 +124,7 @@ class ParserVisitor(enc: Encoding,
       case "COMP-3" | "COMPUTATIONAL-3" | "PACKED-DECIMAL" => Some(COMP3())
       case "COMP-4" | "COMPUTATIONAL-4" => Some(COMP4())
       case "COMP-5" | "COMPUTATIONAL-5" => Some(COMP5())
+      case "COMP-9" | "COMPUTATIONAL-9" => Some(COMP9())
       case "DISPLAY" => None
       case "BINARY" => Some(COMP4())
       case _ => throw new RuntimeException("Unknown Usage literal " + text)

cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/copybookLexer.g4

@@ -38,13 +38,15 @@ COMP_2 : C O M P MINUSCHAR '2';
 COMP_3 : C O M P MINUSCHAR '3';
 COMP_4 : C O M P MINUSCHAR '4';
 COMP_5 : C O M P MINUSCHAR '5';
+COMP_9 : C O M P MINUSCHAR '9';
 COMPUTATIONAL : C O M P U T A T I O N A L;
 COMPUTATIONAL_0 : C O M P U T A T I O N A L MINUSCHAR '0';
 COMPUTATIONAL_1 : C O M P U T A T I O N A L MINUSCHAR '1';
 COMPUTATIONAL_2 : C O M P U T A T I O N A L MINUSCHAR '2';
 COMPUTATIONAL_3 : C O M P U T A T I O N A L MINUSCHAR '3';
 COMPUTATIONAL_4 : C O M P U T A T I O N A L MINUSCHAR '4';
 COMPUTATIONAL_5 : C O M P U T A T I O N A L MINUSCHAR '5';
+COMPUTATIONAL_9 : C O M P U T A T I O N A L MINUSCHAR '9';
 COPY : C O P Y;
 DEPENDING : D E P E N D I N G;
 DESCENDING: D E S C E N D I N G;

cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/copybookLexer.java

@@ -109,8 +109,8 @@ renames:
 
 usageLiteral:
     (
-      COMPUTATIONAL_0 | COMPUTATIONAL_1 | COMPUTATIONAL_2 | COMPUTATIONAL_3 | COMPUTATIONAL_4 | COMPUTATIONAL_5 | COMPUTATIONAL
-    | COMP_0 | COMP_1 | COMP_2 | COMP_3 | COMP_4 | COMP_5 | COMP
+      COMPUTATIONAL_0 | COMPUTATIONAL_1 | COMPUTATIONAL_2 | COMPUTATIONAL_3 | COMPUTATIONAL_4 | COMPUTATIONAL_5 | COMPUTATIONAL_9 | COMPUTATIONAL
+    | COMP_0 | COMP_1 | COMP_2 | COMP_3 | COMP_4 | COMP_5 | COMP_9 | COMP
     | DISPLAY
     | BINARY
     | PACKED_DECIMAL
@@ -119,8 +119,8 @@ usageLiteral:
 
 groupUsageLiteral:
     (
-      COMPUTATIONAL_0 | COMPUTATIONAL_3 | COMPUTATIONAL_4 | COMPUTATIONAL_5 | COMPUTATIONAL
-    | COMP_0 | COMP_3 | COMP_4 | COMP_5 | COMP
+      COMPUTATIONAL_0 | COMPUTATIONAL_3 | COMPUTATIONAL_4 | COMPUTATIONAL_5 | COMPUTATIONAL_9 | COMPUTATIONAL
+    | COMP_0 | COMP_3 | COMP_4 | COMP_5 | COMP_9 | COMP
     | DISPLAY
     | BINARY
     | PACKED_DECIMAL

cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/copybookParser.g4

@@ -1,4 +1,4 @@
-#! /usr/bin/bash
+#!/bin/bash
 
 # Copyright 2018 ABSA Group Limited
 #

cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/copybookParser.java

@@ -33,15 +33,15 @@ class Test16BinaryLittleEndian extends WordSpec with SparkTestBase with BinaryFi
     16, 0, 0, 0,
     32, 0,
     // Record 1
-    0, 1, 0, 0,
+    0, 0, 1, 0,
     0, 2
   )
 
   "COMP-9" should {
     val copybook1 =
       """         01  R.
-           05  N1    PIC 9(8)  COMP-5.
-           05  N2    PIC 9(3)  COMP-5.
+           05  N1    PIC 9(8)  COMP-9.
+           05  N2    PIC 9(3)  COMP-9.
     """
 
     "be interpreted as little-endian binary" when {
@@ -66,14 +66,14 @@ class Test16BinaryLittleEndian extends WordSpec with SparkTestBase with BinaryFi
           assertEqualsMultiline(actualSchema, expectedSchema)
         }
 
-        "data should match" ignore {
+        "data should match" in {
           val expectedData =
             """[ {
               |  "N1" : 16,
               |  "N2" : 32
               |}, {
-              |  "N1" : 32768,
-              |  "N2" : 65536
+              |  "N1" : 65536,
+              |  "N2" : 512
               |} ]""".stripMargin
 
           assertEqualsMultiline(actualData, expectedData)