From 628872ef8184f77529838d9e9b1d800fbf65d756 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Fri, 20 May 2022 13:20:07 +0200 Subject: [PATCH] fetch derived categories in chained store --- CodeStore/src/main/java/prompto/code/MutableCodeStore.java | 6 ++++++ Core/src/main/java/prompto/type/IEnumeratedType.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CodeStore/src/main/java/prompto/code/MutableCodeStore.java b/CodeStore/src/main/java/prompto/code/MutableCodeStore.java index 5d386db9..55ad941f 100644 --- a/CodeStore/src/main/java/prompto/code/MutableCodeStore.java +++ b/CodeStore/src/main/java/prompto/code/MutableCodeStore.java @@ -417,6 +417,12 @@ private IQueryBuilder filterOnModules(IQueryBuilder builder, boolean filterOnMod @Override public Collection fetchDerivedCategoryDeclarations(Identifier id) { + Stream stream1 = super.fetchDerivedCategoryDeclarations(id).stream(); + Stream stream2 = doFetchDerivedCategoryDeclarations(id).stream(); + return Stream.concat(stream1, stream2).collect(Collectors.toList()); + } + + Collection doFetchDerivedCategoryDeclarations(Identifier id) { IQueryBuilder builder = store.newQueryBuilder() .verify(AttributeInfo.CATEGORY, MatchOp.HAS, "CategoryDeclaration") .verify(AttributeInfo.DERIVED_FROM, MatchOp.HAS, id.toString()) diff --git a/Core/src/main/java/prompto/type/IEnumeratedType.java b/Core/src/main/java/prompto/type/IEnumeratedType.java index 7c6d2f6d..a95237a5 100644 --- a/Core/src/main/java/prompto/type/IEnumeratedType.java +++ b/Core/src/main/java/prompto/type/IEnumeratedType.java @@ -1,5 +1,7 @@ package prompto.type; -public interface IEnumeratedType { +import prompto.grammar.Identifier; +public interface IEnumeratedType { + Identifier getTypeNameId(); }