fix: return inheritance support to ast processor

Author: ishche

server/common/src/main/java/org/eclipse/lsp/cobol/common/processor/ProcessingContext.java

@@ -33,7 +33,7 @@
 public class ProcessingContext {
     private final Map<
         ProcessingPhase,
-            Map<Class<? extends Node>, List<Processor<? extends Node>>>>
+            List<Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>>>>
             processors = new HashMap<>();
 
     final List<SyntaxError> errors;
@@ -57,15 +57,26 @@ public ProgramNode getCurrentProgramNode() {
      * @param processorDesc Processor descriptor.
      */
     public void register(ProcessorDescription processorDesc) {
-        if (Modifier.isAbstract(processorDesc.getNodeClass().getModifiers())) {
-            throw new RuntimeException("Can't register processor for node class: "
-                    + processorDesc.getNodeClass().getName() + ". Node class should be concrete.");
+        List<Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>>> ps = processors.computeIfAbsent(processorDesc.getPhase(), v -> new ArrayList<>());
+        for (Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>> pair : ps) {
+            if (pair.getKey().isAssignableFrom(processorDesc.getNodeClass())
+                    || processorDesc.getNodeClass().isAssignableFrom(pair.getKey())) {
+                if(pair.getValue().contains(processorDesc.processor)) {
+                    throw new RuntimeException("Processor " + processorDesc.getProcessor().getClass().getName()
+                            + " register twice: for classes " + pair.getKey().getName() + " and " + processorDesc.getNodeClass().getName()
+                            + " in " + processorDesc.getPhase() + " phase");
+                }
+            }
+            if (pair.getKey().equals(processorDesc.getNodeClass())) {
+                pair.getValue().add(processorDesc.processor);
+                return;
+            }
         }
-        processors
-                .computeIfAbsent(processorDesc.getPhase(), v -> new HashMap<>())
-                .computeIfAbsent(processorDesc.getNodeClass(), v -> new ArrayList<>())
-                .add(processorDesc.getProcessor());
+        ArrayList<Processor<? extends Node>> pList = new ArrayList<>();
+        pList.add(processorDesc.processor);
+        ps.add(new AbstractMap.SimpleEntry<>(processorDesc.getNodeClass(), pList));
     }
+
     /**
      * Register node type processor
      * @param phase processing phase

server/engine/src/main/java/org/eclipse/lsp/cobol/core/engine/processor/AstProcessor.java

@@ -26,7 +26,6 @@
 import org.eclipse.lsp.cobol.common.utils.ThreadInterruptionUtil;
 import org.eclipse.lsp.cobol.core.engine.analysis.AnalysisContext;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +67,7 @@ public List<SyntaxError> processSyntaxTree(AnalysisConfig analysisConfig, Proces
    * @param ctx processing context
    */
   public void process(ProcessingPhase phase, Node node, ProcessingContext ctx) {
-    Map<Class<? extends Node>, List<Processor<? extends Node>>> processors = ctx.getProcessors().get(phase);
+    List<Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>>> processors = ctx.getProcessors().get(phase);
     if (processors != null)
       process(processors, node, ctx);
   }
@@ -80,17 +79,22 @@ public void process(ProcessingPhase phase, Node node, ProcessingContext ctx) {
    * @param node a node to process
    * @param ctx processing context
    */
-  private void process(Map<Class<? extends Node>, List<Processor<? extends Node>>> processors,
-      Node node, ProcessingContext ctx) {
+  private void process(List<Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>>> processors,
+                       Node node, ProcessingContext ctx) {
     ThreadInterruptionUtil.checkThreadInterrupted();
     final Class<? extends Node> nodeClass = node.getClass();
     if (nodeClass == ProgramNode.class) {
       ctx.getCurrentProgramNodeStack().push((ProgramNode) node);
     }
     try {
-      for (Processor<? extends Node> processor : processors.getOrDefault(nodeClass, Collections.emptyList())) {
-        ((Processor<Node>) processor).accept(node, ctx);
+      for (Map.Entry<Class<? extends Node>, List<Processor<? extends Node>>> proc: processors) {
+        if (proc.getKey().isAssignableFrom(nodeClass)) {
+          for (Processor<? extends Node> processor : proc.getValue()) {
+            ((Processor<Node>) processor).accept(node, ctx);
+          }
+        }
       }
+
       for (Node n : node.getChildren()) {
         process(processors, n, ctx);
       }

server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/ibm/TransformTreeStage.java

@@ -295,28 +295,12 @@ private void registerProcessors(AnalysisConfig analysisConfig, ProcessingContext
     ctx.register(v, StandAloneDataItemNode.class, variableNameCheck);
     ctx.register(v, TableDataNameNode.class, variableNameCheck);
 
-    StatementValidate processor = new StatementValidate();
-    ctx.register(v, StatementNode.class, processor);
-    ctx.register(v, OpenStatementNode.class, processor);
-    ctx.register(v, SetToStatement.class, processor);
-    ctx.register(v, JsonParseNode.class, processor);
-    ctx.register(v, XMLParseNode.class, processor);
-    ctx.register(v, SetUpDownByStatement.class, processor);
-    ctx.register(v, SetToOnOffStatement.class, processor);
-    ctx.register(v, JsonGenerateNode.class, processor);
-    ctx.register(v, SetToBooleanStatement.class, processor);
-    ctx.register(v, FileOperationStatementNode.class, processor);
-
-    ElementaryNodeCheck elementaryNodeCheck = new ElementaryNodeCheck();
-    ctx.register(v, ElementaryItemNode.class, elementaryNodeCheck);
-    ctx.register(v, StandAloneDataItemNode.class, elementaryNodeCheck);
-    ctx.register(v, TableDataNameNode.class, elementaryNodeCheck);
+    ctx.register(v, StatementNode.class, new StatementValidate());
 
-    ctx.register(v, GroupItemNode.class, new GroupItemCheck());
-
-    ObsoleteNodeCheck obsoleteNodeCheck = new ObsoleteNodeCheck();
-    ctx.register(v, RemarksNode.class, obsoleteNodeCheck);
+    ctx.register(v, ElementaryNode.class, new ElementaryNodeCheck());
 
+    ctx.register(v, GroupItemNode.class, new GroupItemCheck());
+    ctx.register(v, RemarksNode.class, new ObsoleteNodeCheck());
     ctx.register(v, StandAloneDataItemNode.class, new StandAloneDataItemCheck());
     ctx.register(v, ProcedureDivisionNode.class, new FunctionReturningClauseCheck());
     ctx.register(v, ProgramEndNode.class, new ProgramEndCheck());