infer enum types
This commit is contained in:
@@ -381,15 +381,10 @@ public class Parser
|
||||
}
|
||||
else if (TryExpectKeyword(Keyword.Enum))
|
||||
{
|
||||
var module = ExpectIdent();
|
||||
ExpectSymbol(Symbol.ColonColon);
|
||||
var enumName = ExpectIdent();
|
||||
ExpectSymbol(Symbol.ColonColon);
|
||||
var variantName = ExpectIdent();
|
||||
|
||||
var type = ParseType();
|
||||
var value = ParseExpression();
|
||||
|
||||
expr = new NodeExpressionEnumLiteral(TokensFrom(startIndex), module, enumName, variantName, value);
|
||||
expr = new NodeExpressionEnumLiteral(TokensFrom(startIndex), type, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -846,11 +841,9 @@ public class NodeExpressionStructLiteral(List<Token> tokens, NodeType? type, Lis
|
||||
}
|
||||
}
|
||||
|
||||
public class NodeExpressionEnumLiteral(List<Token> tokens, TokenIdent module, TokenIdent enumName, TokenIdent variantName, NodeExpression value) : NodeExpression(tokens)
|
||||
public class NodeExpressionEnumLiteral(List<Token> tokens, NodeType type, NodeExpression value) : NodeExpression(tokens)
|
||||
{
|
||||
public TokenIdent Module { get; } = module;
|
||||
public TokenIdent EnumName { get; } = enumName;
|
||||
public TokenIdent VariantName { get; } = variantName;
|
||||
public NodeType Type { get; } = type;
|
||||
public NodeExpression Value { get; } = value;
|
||||
}
|
||||
|
||||
|
||||
@@ -533,9 +533,21 @@ public class TypeChecker
|
||||
|
||||
private TypedNodeExpressionEnumLiteral CheckExpressionEnumLiteral(NodeExpressionEnumLiteral expression, NubType? expectedType)
|
||||
{
|
||||
// todo(nub31): Infer type of enum variant
|
||||
var type = NubTypeEnumVariant.Get(NubTypeEnum.Get(expression.Module.Ident, expression.EnumName.Ident), expression.VariantName.Ident);
|
||||
var value = CheckExpression(expression.Value, null);
|
||||
var type = ResolveType(expression.Type);
|
||||
if (type is not NubTypeEnumVariant variantType)
|
||||
throw BasicError("Expected enum variant type", expression.Type);
|
||||
|
||||
if (!moduleGraph.TryResolveType(variantType.EnumType.Module, variantType.EnumType.Name, variantType.EnumType.Module == currentModule, out var info))
|
||||
throw BasicError($"Type '{variantType.EnumType}' not found", expression.Type);
|
||||
|
||||
if (info is not Module.TypeInfoEnum enumInfo)
|
||||
throw BasicError($"Type '{variantType.EnumType}' is not an enum", expression.Type);
|
||||
|
||||
var variant = enumInfo.Variants.FirstOrDefault(x => x.Name == variantType.Variant);
|
||||
if (variant == null)
|
||||
throw BasicError($"Enum '{variantType.EnumType}' does not have a variant named '{variantType.Variant}'", expression.Type);
|
||||
|
||||
var value = CheckExpression(expression.Value, variant.Type);
|
||||
return new TypedNodeExpressionEnumLiteral(expression.Tokens, type, value);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user