Implement FieldsInfo.fieldIndex() with FieldInfo.fieldIndex()

1 files changed, 3 insertions, 6 deletions

diff --git a/src/main/java/org/shedlang/compiler/types/FieldsInfo.java b/src/main/java/org/shedlang/compiler/types/FieldsInfo.java
index 18e2653e..3bd20890 100644
--- a/src/main/java/org/shedlang/compiler/types/FieldsInfo.java
+++ b/src/main/java/org/shedlang/compiler/types/FieldsInfo.java
@@ -32,13 +32,10 @@ public record FieldsInfo<T extends Type>(POrderedMap<String, FieldInfo<T>> field
     }
 
     public int fieldIndex(String fieldName) {
-        var fieldIndex = fields.keys().indexOf(fieldName);
+        var field = fields.get(fieldName)
+            .orElseThrow(() -> new NoSuchFieldInternalError(fieldName));
 
-        if (fieldIndex == -1) {
-            throw new NoSuchFieldInternalError(fieldName);
-        } else {
-            return fieldIndex;
-        }
+        return field.fieldIndex();
     }
 
     public Optional<T> fieldType(String fieldName) {