6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-02-07 20:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Fixed a few error messages

Browse Source
This commit is contained in:
jespergravgaard 2020-01-01 18:47:33 +01:00
parent 7b81b51bc0
commit 8ae248b1c2
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dk/camelot64/kickc/Compiler.java
View File

@ -199,6 +199,7 @@ public class Compiler {
new Pass1EarlyConstantIdentification(program).execute();
new PassNAssertConstantModification(program).execute();
new PassNAssertTypeDeref(program).check();
if(getLog().isVerbosePass1CreateSsa()) {
getLog().append("CONTROL FLOW GRAPH BEFORE INLINING");
@ -258,6 +259,7 @@ public class Compiler {
private void pass2AssertSSA() {
List<Pass2SsaAssertion> assertions = new ArrayList<>();
//assertions.add(new Pass2AssertNoLValueObjectEquality(program));
assertions.add(new PassNAssertTypeDeref(program));
assertions.add(new Pass2AssertTypeMatch(program));
assertions.add(new Pass2AssertSymbols(program));
assertions.add(new Pass2AssertBlocks(program));

34
src/main/java/dk/camelot64/kickc/passes/PassNAssertTypeDeref.java Normal file
View File

@ -0,0 +1,34 @@
package dk.camelot64.kickc.passes;
import dk.camelot64.kickc.model.CompileError;
import dk.camelot64.kickc.model.Program;
import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
import dk.camelot64.kickc.model.types.SymbolType;
import dk.camelot64.kickc.model.types.SymbolTypeInference;
import dk.camelot64.kickc.model.types.SymbolTypePointer;
import dk.camelot64.kickc.model.values.PointerDereference;
import dk.camelot64.kickc.model.values.RValue;
/**
* Asserts that all dereferenced values are pointers.
*/
public class PassNAssertTypeDeref extends Pass2SsaAssertion {
public PassNAssertTypeDeref(Program program) {
super(program);
}
@Override
public void check() throws AssertionFailed {
ProgramValueIterator.execute(getProgram(), (programValue, currentStmt, stmtIt, currentBlock) -> {
if(programValue.get() instanceof PointerDereference) {
RValue pointer = ((PointerDereference) programValue.get()).getPointer();
SymbolType pointertype = SymbolTypeInference.inferType(getProgram().getScope(), pointer);
if(!SymbolType.VAR.equals(pointertype) && !(pointertype instanceof SymbolTypePointer))
throw new CompileError("Error! Dereferencing a non-pointer type "+pointertype.getTypeName(), currentStmt);
}
});
}
}

5
src/test/java/dk/camelot64/kickc/test/TestPrograms.java
View File

@ -432,8 +432,7 @@ public class TestPrograms {
@Test
public void testFunctionAsArray() throws IOException, URISyntaxException {
compileAndCompare("function-as-array", log().verboseParse().verboseCreateSsa());
assertError("function-as-array", "Cannot infer pointer element type from type: void()");
assertError("function-as-array", "Error! Dereferencing a non-pointer type void()");
}
@Test
@ -503,7 +502,7 @@ public class TestPrograms {
@Test
public void testCastError() throws IOException, URISyntaxException {
assertError("cast-error", "cannot be assigned from");
assertError("cast-error", "Error! Dereferencing a non-pointer type number");
}
@Test