Skip to content

Support list initializers for 1D integer arrays. #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jopperm merged 4 commits into from
Mar 14, 2023
Merged

Support list initializers for 1D integer arrays. #81

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af6589a
Limited support for register field initializers.
jopperm Mar 7, 2023
22daf4d
Update summary of checks.
jopperm Mar 9, 2023
1f33239
Update com.minres.coredsl/src/com/minres/coredsl/analysis/CoreDslAnal…
jopperm Mar 14, 2023
9dc9fad
Nits.
jopperm Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion com.minres.coredsl/src/com/minres/coredsl/analysis/CoreDslAnalyzer.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,9 @@ class CoreDslAnalyzer {
/**
* 1. Const declarators must be initialized. <i>(UninitializedConstant)</i><br>
* 2. Alias declarators must fulfill additional requirements.<br>
* 3. If the declarator uses an expression initializer, the expression's type must be implicitly convertible to the declarator's type. <i>(InvalidAssignmentType)</i><br>
* 3a. If the declarator uses an expression initializer, the expression's type must be implicitly convertible to the declarator's type. <i>(InvalidAssignmentType)</i><br>
* 3b. If an array declarator uses a list initializer, the number of elements in the array type must match the number of elements in the initializer,
* and all elements must be implicitly convertible to array's element type. <i>(InvalidAssignmentType)</i><br>
* 4. ISA parameters must not be declared as arrays. <i>(InvalidIsaParameterDeclaration)</i><br>
* 5. Array dimension specifiers must be non-negative constant values. <i>(InvalidArraySize)</i><br>
* 6. [Warning] Array dimension specifiers should not be zero. <i>(InvalidArraySize)</i>
Expand Down Expand Up @@ -625,6 +627,27 @@ class CoreDslAnalyzer {
ctx.acceptError("Cannot implicitly convert " + valueType + " to " + type, declarator,
CoreDslPackage.Literals.DECLARATOR__TEQUALS, -1, IssueCodes.InvalidAssignmentType);
}
} else if(type.isArrayType) {
val listInitializer = initializer as ListInitializer;
val arrayType = type as ArrayType;
if (arrayType.count != listInitializer.initializers.size)
ctx.acceptError("List initializer size does not match array size", declarator,
CoreDslPackage.Literals.DECLARATOR__TEQUALS, -1, IssueCodes.InvalidAssignmentType);
for (subInitializer : listInitializer.initializers) {
if(subInitializer instanceof ExpressionInitializer) {
val valueType = analyzeExpression(ctx, subInitializer.value);
if(!CoreDslTypeProvider.canImplicitlyConvert(valueType, arrayType.elementType)) {
ctx.acceptError("Cannot implicitly convert " + valueType + " to " + arrayType.elementType, declarator,
CoreDslPackage.Literals.DECLARATOR__TEQUALS, -1, IssueCodes.InvalidAssignmentType);
}
if(isIsaStateElement) {
CoreDslConstantExpressionEvaluator.evaluate(ctx, subInitializer.value);
}
} else {
ctx.acceptError("Nested list initializers are unsupported", declarator,
CoreDslPackage.Literals.DECLARATOR__TEQUALS, -1, IssueCodes.UnsupportedLanguageFeature);
}
}
} else if(type.isStructType) {
// TODO list initializers
ctx.acceptError("List initializers are currently unsupported ", declarator,
Expand Down