Improved filter for SymbolTable.dataDefinitionByName

smeup · Jan 23, 2025 · bc69628 · bc69628
1 parent eb3ce4b
commit bc69628
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/SymbolTable.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/interpreter/SymbolTable.kt
@@ -44,7 +44,12 @@ class SymbolTable : ISymbolTable {
          */
         return names[dataName.uppercase()]
             ?: names
-                .filter { name -> name.value.type is DataStructureType && !(name.value.type as AbstractDataStructureType).isQualified }
+                .asSequence()
+                .filter { name ->
+                    name.value.type is DataStructureType &&
+                    !(name.value.type as AbstractDataStructureType).isQualified &&
+                    name.value is DataDefinition
+                }
                 .map { it.value }
                 .flatMap { dataStructure -> (dataStructure as DataDefinition).fields }
                 .firstOrNull { field -> field.name.equals(dataName, ignoreCase = true) }