Skip to content

Commit 7b51e77

Browse files
Pieter12345Pieter12345
committed
Consolidate multi-type lacking heuristics into helper methods
- Consolidate multi-type lacking heuristics into helper methods. - Call mentioned helper methods wherever multi-type TODOs are present.
1 parent 9e25408 commit 7b51e77

5 files changed

Lines changed: 62 additions & 67 deletions

File tree

‎src/main/java/com/laytonsmith/core/compiler/analysis/StaticAnalysis.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ public CClassType typecheck(ParseTree ast, Environment env, Set<ConfigCompileExc
452452
}
453453

454454
// Return procedure return type.
455-
// TODO - Get the most specific type when multiple declarations exist.
456-
return procReturnTypes.get(0);
455+
return CClassType.getMostSpecificType(procReturnTypes, env);
457456
} else {
458457
throw new Error("Unsupported " + CFunction.class.getSimpleName()
459458
+ " type in type checking for node with value: " + cFunc.val());
@@ -467,9 +466,14 @@ public CClassType typecheck(ParseTree ast, Environment env, Set<ConfigCompileExc
467466
"Variable cannot be resolved: " + ivar.getVariableName(), ivar.getTarget()));
468467
return CClassType.AUTO;
469468
} else {
470-
// TODO - Get the most specific type when multiple declarations exist.
471-
CClassType varType = decls.iterator().next().getType();
472-
return (varType.isVariadicType() ? CArray.TYPE : varType);
469+
470+
// Return the most specific type of all declarations.
471+
Set<CClassType> varTypes = new HashSet<>();
472+
for(Declaration decl : decls) {
473+
CClassType varType = decl.getType();
474+
varTypes.add(varType.isVariadicType() ? CArray.TYPE : varType);
475+
}
476+
return CClassType.getMostSpecificType(varTypes, env);
473477
}
474478
} else {
475479
// If this runs, then an IVariable reference was created without setting its Scope using setTermScope().

‎src/main/java/com/laytonsmith/core/constructs/CClassType.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.laytonsmith.core.objects.ObjectDefinitionTable;
2222
import com.laytonsmith.core.objects.UserObject;
2323
import java.util.Arrays;
24+
import java.util.Collection;
2425
import java.util.Comparator;
2526
import java.util.HashMap;
2627
import java.util.HashSet;
@@ -786,4 +787,48 @@ public boolean doesExtend(Environment env, CClassType superClass) {
786787
public static CClassType getFromGenericTypeName(String genericTypeName, Target t) {
787788
throw new UnsupportedOperationException("Not yet implemented");
788789
}
790+
791+
/**
792+
* Get the most specific type for a collection of types. This is the type for which holds that all types are
793+
* instance of this type. None (Java {@code null}) types are ignored.
794+
* When {@link CVoid#TYPE} is present in the types, it is returned.
795+
* Note that the intention of this method is to be replaced by a variant that returns a multi-type instead.
796+
* @param types - The types.
797+
* @param defaultType - The default type.
798+
* @param env - The environment.
799+
* @return The most specific type, or the provided default type if no such type exists.
800+
*/
801+
public static CClassType getMostSpecificType(
802+
Collection<CClassType> types, CClassType defaultType, Environment env) {
803+
// TODO - Change this method to return a multi-type based on the passed types when the type system allows this.
804+
search:
805+
for(CClassType type1 : types) {
806+
if(type1 != null) {
807+
if(type1.equals(CVoid.TYPE)) {
808+
return CVoid.TYPE;
809+
}
810+
for(CClassType type2 : types) {
811+
if(type2 != null && !InstanceofUtil.isInstanceof(type2, type1, env)) {
812+
continue search;
813+
}
814+
}
815+
return type1;
816+
}
817+
}
818+
return defaultType;
819+
}
820+
821+
/**
822+
* Get the most specific type for a collection of types. This is the type for which holds that all types are
823+
* instance of this type. None (Java {@code null}) types are ignored.
824+
* When {@link CVoid#TYPE} is present in the types, it is returned.
825+
* Note that the intention of this method is to be replaced by a variant that returns a multi-type instead.
826+
* @param types - The types.
827+
* @param env - The environment.
828+
* @return The most specific type, or {@link CClassType#AUTO} if no such type exists.
829+
*/
830+
public static CClassType getMostSpecificType(Collection<CClassType> types, Environment env) {
831+
// TODO - Change this method to return a multi-type based on the passed types when the type system allows this.
832+
return getMostSpecificType(types, CClassType.AUTO, env);
833+
}
789834
}

‎src/main/java/com/laytonsmith/core/functions/BasicLogic.java‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.laytonsmith.core.constructs.CString;
2828
import com.laytonsmith.core.constructs.CSymbol;
2929
import com.laytonsmith.core.constructs.CVoid;
30-
import com.laytonsmith.core.constructs.InstanceofUtil;
3130
import com.laytonsmith.core.constructs.Target;
3231
import com.laytonsmith.core.environments.Environment;
3332
import com.laytonsmith.core.environments.GlobalEnv;
@@ -1290,22 +1289,8 @@ public CClassType getReturnType(Target t, List<CClassType> argTypes,
12901289
// Get return type based on the function signatures. This generates all necessary compile errors.
12911290
CClassType retType = super.getReturnType(t, argTypes, argTargets, env, exceptions);
12921291

1293-
// Return an occurring argument type if all argument types extend that type.
1294-
// TODO - Make this return a multitype instead as soon as all typechecking code supports multitypes.
1295-
search:
1296-
for(CClassType type1 : argTypes) {
1297-
if(type1 != null) {
1298-
for(CClassType type2 : argTypes) {
1299-
if(type2 != null && !InstanceofUtil.isInstanceof(type2, type1, env)) {
1300-
continue search;
1301-
}
1302-
}
1303-
return type1;
1304-
}
1305-
}
1306-
1307-
// Return super result.
1308-
return retType;
1292+
// Return the most specific argument type.
1293+
return CClassType.getMostSpecificType(argTypes, retType, env);
13091294
}
13101295

13111296
@Override
@@ -1613,22 +1598,8 @@ public CClassType getReturnType(Target t, List<CClassType> argTypes,
16131598
// Get return type based on the function signatures. This generates all necessary compile errors.
16141599
CClassType retType = super.getReturnType(t, argTypes, argTargets, env, exceptions);
16151600

1616-
// Return an occurring argument type if all argument types extend that type.
1617-
// TODO - Make this return a multitype instead as soon as all typechecking code supports multitypes.
1618-
search:
1619-
for(CClassType type1 : argTypes) {
1620-
if(type1 != null) {
1621-
for(CClassType type2 : argTypes) {
1622-
if(type2 != null && !InstanceofUtil.isInstanceof(type2, type1, env)) {
1623-
continue search;
1624-
}
1625-
}
1626-
return type1;
1627-
}
1628-
}
1629-
1630-
// Return super result.
1631-
return retType;
1601+
// Return the most specific argument type.
1602+
return CClassType.getMostSpecificType(argTypes, retType, env);
16321603
}
16331604

16341605
@Override

‎src/main/java/com/laytonsmith/core/functions/ControlFlow.java‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -486,20 +486,8 @@ public CClassType getReturnType(Target t, List<CClassType> argTypes,
486486
return null;
487487
}
488488

489-
// Return an occurring return type if all return types extend that type.
490-
// TODO - Make this return a multitype instead as soon as all typechecking code supports multitypes.
491-
search:
492-
for(CClassType type1 : returnTypes) {
493-
if(type1 != null) {
494-
for(CClassType type2 : returnTypes) {
495-
if(type2 != null && !InstanceofUtil.isInstanceof(type2, type1, env)) {
496-
continue search;
497-
}
498-
}
499-
return type1;
500-
}
501-
}
502-
return CClassType.AUTO;
489+
// Return the most specific return type.
490+
return CClassType.getMostSpecificType(returnTypes, env);
503491
}
504492

505493
// Return super result.
@@ -826,20 +814,8 @@ public CClassType getReturnType(Target t, List<CClassType> argTypes,
826814
return null;
827815
}
828816

829-
// Return an occurring return type if all return types extend that type.
830-
// TODO - Make this return a multitype instead as soon as all typechecking code supports multitypes.
831-
search:
832-
for(CClassType type1 : returnTypes) {
833-
if(type1 != null) {
834-
for(CClassType type2 : returnTypes) {
835-
if(type2 != null && !InstanceofUtil.isInstanceof(type2, type1, env)) {
836-
continue search;
837-
}
838-
}
839-
return type1;
840-
}
841-
}
842-
return CClassType.AUTO;
817+
// Return the most specific return type.
818+
return CClassType.getMostSpecificType(returnTypes, env);
843819
}
844820

845821
// Return super result.

‎src/main/java/com/laytonsmith/core/functions/DataHandling.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,6 @@ public Scope linkScope(StaticAnalysis analysis, Scope parentScope, ParseTree ast
17821782
analysis.linkScope(paramScope, code, env, exceptions);
17831783

17841784
// Create proc declaration in a new scope.
1785-
// TODO - Include proc signature (argument types and number of arguments) in declaration.
17861785
Scope declScope = analysis.createNewScope(parentScope);
17871786
ProcDeclaration procDecl = new ProcDeclaration(procName, retType, params,
17881787
ast.getNodeModifiers(), ast.getTarget());

0 commit comments

Comments
 (0)