Skip to content

Commit 1ba2cd8

Browse files
eyckeyck
committed
fixes test for indexed access
1 parent f107f9f commit 1ba2cd8

File tree

8 files changed

+83
-55
lines changed

8 files changed

+83
-55
lines changed

‎com.minres.coredsl.ide/.classpath

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src">
3+
<classpathentry kind="src" output="bin/main" path="src">
44
<attributes>
55
<attribute name="gradle_scope" value="main"/>
66
<attribute name="gradle_used_by_scope" value="main,test"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="src" path="src-gen">
9+
<classpathentry kind="src" output="bin/main" path="src-gen">
1010
<attributes>
1111
<attribute name="gradle_scope" value="main"/>
1212
<attribute name="gradle_used_by_scope" value="main,test"/>
1313
</attributes>
1414
</classpathentry>
15-
<classpathentry kind="src" path="xtend-gen">
15+
<classpathentry kind="src" output="bin/main" path="xtend-gen">
1616
<attributes>
1717
<attribute name="gradle_scope" value="main"/>
1818
<attribute name="gradle_used_by_scope" value="main,test"/>
1919
</attributes>
2020
</classpathentry>
21-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
22-
<attributes>
23-
<attribute name="module" value="true"/>
24-
</attributes>
25-
</classpathentry>
26-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
27-
<classpathentry kind="output" path="target/classes"/>
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
22+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
23+
<classpathentry kind="output" path="bin/default"/>
2824
</classpath>

‎com.minres.coredsl.tests/.classpath

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/test-classes" path="src">
3+
<classpathentry kind="src" output="bin/test" path="src">
44
<attributes>
5-
<attribute name="test" value="true"/>
65
<attribute name="gradle_scope" value="test"/>
76
<attribute name="gradle_used_by_scope" value="test"/>
7+
<attribute name="test" value="true"/>
88
</attributes>
99
</classpathentry>
10-
<classpathentry kind="src" output="target/test-classes" path="src-gen">
10+
<classpathentry kind="src" output="bin/test" path="src-gen">
1111
<attributes>
12-
<attribute name="test" value="true"/>
1312
<attribute name="gradle_scope" value="test"/>
1413
<attribute name="gradle_used_by_scope" value="test"/>
14+
<attribute name="test" value="true"/>
1515
</attributes>
1616
</classpathentry>
17-
<classpathentry kind="src" output="target/test-classes" path="xtend-gen">
17+
<classpathentry kind="src" output="bin/test" path="xtend-gen">
1818
<attributes>
19-
<attribute name="test" value="true"/>
2019
<attribute name="gradle_scope" value="test"/>
2120
<attribute name="gradle_used_by_scope" value="test"/>
21+
<attribute name="test" value="true"/>
2222
</attributes>
2323
</classpathentry>
24-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
25-
<attributes>
26-
<attribute name="module" value="true"/>
27-
</attributes>
28-
</classpathentry>
29-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
30-
<classpathentry kind="output" path="target/classes"/>
24+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
25+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
26+
<classpathentry kind="output" path="bin/default"/>
3127
</classpath>

‎com.minres.coredsl.tests/src/com/minres/coredsl/tests/analysis/CoreDslAliasTest.xtend

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ class CoreDslAliasTest {
1818
@Test
1919
def void arrayIndex() {
2020
// valid: first and last register
21-
'''
22-
Core C {
23-
architectural_state {
24-
register unsigned int X[32];
25-
unsigned int& Y = X[0];
26-
unsigned int& Z = X[31];
27-
}
28-
}
29-
'''
30-
.testProgram()
31-
.run();
21+
// '''
22+
// Core C {
23+
// architectural_state {
24+
// register unsigned int X[32];
25+
// unsigned int& Y = X[0];
26+
// unsigned int& Z = X[31];
27+
// }
28+
// }
29+
// '''
30+
// .testProgram()
31+
// .run();
3232

3333
// error: register index out of range
3434
'''

‎com.minres.coredsl.tests/src/com/minres/coredsl/tests/analysis/CoreDslElaborationTest.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class CoreDslElaborationTest {
600600
}
601601
'''
602602
.testProgram()
603-
.expectType("X", "X", "unsigned<32>[address space 32]")
603+
.expectType("X", "X", "unsigned<32>[32]")
604604
.expectType("X", "M", "unsigned<8>[address space 256]")
605605
.run();
606606

‎com.minres.coredsl.web/.classpath

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="src-gen"/>
5-
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
8-
<classpathentry kind="output" path="target/classes"/>
3+
<classpathentry kind="src" output="bin/main" path="src">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="bin/main" path="src-gen">
10+
<attributes>
11+
<attribute name="gradle_scope" value="main"/>
12+
<attribute name="gradle_used_by_scope" value="main,test"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="bin/main" path="xtend-gen">
16+
<attributes>
17+
<attribute name="gradle_scope" value="main"/>
18+
<attribute name="gradle_used_by_scope" value="main,test"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
22+
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
23+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
24+
<attributes>
25+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="output" path="bin/default"/>
929
</classpath>

‎com.minres.coredsl.web/.project

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
1823
<buildCommand>
1924
<name>org.eclipse.wst.validation.validationbuilder</name>
2025
<arguments>
@@ -32,10 +37,12 @@
3237
</buildCommand>
3338
</buildSpec>
3439
<natures>
35-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
36-
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
3740
<nature>org.eclipse.jdt.core.javanature</nature>
41+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
42+
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
43+
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3844
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
45+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3946
</natures>
4047
<filteredResources>
4148
<filter>

‎com.minres.coredsl/.classpath

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src">
3+
<classpathentry kind="src" output="bin/main" path="src">
44
<attributes>
55
<attribute name="gradle_scope" value="main"/>
66
<attribute name="gradle_used_by_scope" value="main,test"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="src" path="src-gen">
9+
<classpathentry kind="src" output="bin/main" path="src-gen">
1010
<attributes>
1111
<attribute name="gradle_scope" value="main"/>
1212
<attribute name="gradle_used_by_scope" value="main,test"/>
1313
</attributes>
1414
</classpathentry>
15-
<classpathentry kind="src" path="xtend-gen">
15+
<classpathentry kind="src" output="bin/main" path="xtend-gen">
1616
<attributes>
1717
<attribute name="gradle_scope" value="main"/>
1818
<attribute name="gradle_used_by_scope" value="main,test"/>
1919
</attributes>
2020
</classpathentry>
21-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
22-
<attributes>
23-
<attribute name="module" value="true"/>
24-
</attributes>
25-
</classpathentry>
26-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
27-
<classpathentry kind="output" path="target/classes"/>
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
22+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
23+
<classpathentry kind="output" path="bin/default"/>
2824
</classpath>

‎com.minres.coredsl/src/com/minres/coredsl/analysis/CoreDslAnalyzer.xtend

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -999,9 +999,14 @@ class CoreDslAnalyzer {
999999
if(rangeAccess === null) return false;
10001000
if(rangeAccess.endIndex === null) return false;
10011001

1002-
val initSpace = ctx.getExpressionType(rangeAccess.target) as AddressSpaceType;
1002+
val initSpace = ctx.getExpressionType(rangeAccess.target);
10031003
if(initSpace === null) return false;
1004-
if(initSpace.elementType != aliasSpace.elementType) return false;
1004+
if(initSpace instanceof AddressSpaceType) {
1005+
if(initSpace.elementType != aliasSpace.elementType) return false;
1006+
} else if(initSpace instanceof ArrayType) {
1007+
if(initSpace.elementType != aliasSpace.elementType) return false;
1008+
} else
1009+
return false
10051010

10061011
val aliasSize = aliasSpace.count * BigInteger.valueOf(aliasSpace.elementType.bitSize);
10071012
val rangeSize = BigInteger.valueOf(ctx.getExpressionType(rangeAccess).bitSize);
@@ -1062,6 +1067,11 @@ class CoreDslAnalyzer {
10621067
checkIndexAccessBounds(ctx, indexValue.value, targetType.count, expression,
10631068
CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__INDEX);
10641069
}
1070+
} else if(targetType instanceof ArrayType) {
1071+
if(!targetType.isUnknownSize) {
1072+
checkIndexAccessBounds(ctx, indexValue.value, BigInteger.valueOf(targetType.count), expression,
1073+
CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__INDEX);
1074+
}
10651075
} else if(targetType instanceof IntegerType) {
10661076
checkIndexAccessBounds(ctx, indexValue.value, BigInteger.valueOf(targetType.bitSize),
10671077
expression, CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__INDEX);
@@ -1077,6 +1087,9 @@ class CoreDslAnalyzer {
10771087
if(targetType instanceof AddressSpaceType) {
10781088
checkIndexAccessBounds(ctx, endIndexValue.value, targetType.count, expression,
10791089
CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__END_INDEX);
1090+
} else if(targetType instanceof ArrayType) {
1091+
checkIndexAccessBounds(ctx, endIndexValue.value, BigInteger.valueOf(targetType.count), expression,
1092+
CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__END_INDEX);
10801093
} else if(targetType instanceof IntegerType) {
10811094
checkIndexAccessBounds(ctx, endIndexValue.value, BigInteger.valueOf(targetType.bitSize),
10821095
expression, CoreDslPackage.Literals.INDEX_ACCESS_EXPRESSION__END_INDEX);

0 commit comments

Comments
 (0)