Speiger
/
Primitive-Collections
0
0
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

SharedConstants still making issues.

This commit is contained in:
Speiger 2021-06-22 19:40:48 +02:00
parent fd32f404c0
commit 500514fb20
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/builder/java/speiger/src/builder/GlobalVariables.java
View File

@ -256,6 +256,7 @@ public class GlobalVariables
{ {
flags.add("TYPE_"+type.getCapType()); flags.add("TYPE_"+type.getCapType());
flags.add("VALUE_"+valueType.getCapType()); flags.add("VALUE_"+valueType.getCapType());
// flags.add("UNSAVE_ENUM"); //if we want to use shared constants... Not compile save
if(type == valueType) flags.add("SAME_TYPE"); if(type == valueType) flags.add("SAME_TYPE");
if(type.hasFunction(valueType)) flags.add("JDK_FUNCTION"); if(type.hasFunction(valueType)) flags.add("JDK_FUNCTION");
if(!type.needsCustomJDKType()) flags.add("JDK_TYPE"); if(!type.needsCustomJDKType()) flags.add("JDK_TYPE");

6
src/builder/resources/speiger/assets/collections/templates/maps/impl/misc/EnumMap.template
View File

@ -16,7 +16,9 @@ import speiger.src.collections.objects.maps.abstracts.ABSTRACT_MAP;
import speiger.src.collections.objects.maps.interfaces.MAP; import speiger.src.collections.objects.maps.interfaces.MAP;
import speiger.src.collections.objects.sets.AbstractObjectSet; import speiger.src.collections.objects.sets.AbstractObjectSet;
import speiger.src.collections.objects.sets.ObjectSet; import speiger.src.collections.objects.sets.ObjectSet;
#if UNSAVE_ENUM
import sun.misc.SharedSecrets; import sun.misc.SharedSecrets;
#endif
/** /**
* A Type Specific EnumMap implementation that allows for Primitive Values. * A Type Specific EnumMap implementation that allows for Primitive Values.
@ -212,7 +214,11 @@ public class ENUM_MAP KEY_ENUM_VALUE_GENERIC_TYPE extends ABSTRACT_MAP KEY_VALUE
} }
protected boolean isSet(int index) { return (present[index >> 6] & (1L << index)) != 0; } protected boolean isSet(int index) { return (present[index >> 6] & (1L << index)) != 0; }
private static <K extends Enum<K>> K[] getKeyUniverse(Class<K> keyType) { private static <K extends Enum<K>> K[] getKeyUniverse(Class<K> keyType) {
#if UNSAVE_ENUM
return keyType.getEnumConstants();
#else
return SharedSecrets.getJavaLangAccess().getEnumConstantsShared(keyType); return SharedSecrets.getJavaLangAccess().getEnumConstantsShared(keyType);
#endif
} }
class EntrySet extends AbstractObjectSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> { class EntrySet extends AbstractObjectSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> {