mirror of
https://gitlab.com/camelot/kickc.git
synced 2024-12-21 14:30:21 +00:00
Merge branch 'error-handling' into 'master'
Catching a RunTimeException only when there is no UnknownFragmentException ... See merge request camelot/kickc!25
This commit is contained in:
commit
7098b28cb2
@ -840,7 +840,14 @@ public class Pass4CodeGeneration {
|
||||
if (assignment.getOperator() == null && assignment.getrValue1() == null && isRegisterCopy(lValue, assignment.getrValue2())) {
|
||||
//asm.addComment(lValue.toString(program) + " = " + assignment.getrValue2().toString(program) + " // register copy " + getRegister(lValue));
|
||||
} else {
|
||||
AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.assignment(assignment, program), program);
|
||||
// sven - catch this error decently, it sometimes throws an exception!
|
||||
try {
|
||||
AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.assignment(assignment, program), program);
|
||||
} catch( AsmFragmentTemplateSynthesizer.UnknownFragmentException e) {
|
||||
throw new AsmFragmentTemplateSynthesizer.UnknownFragmentException(e.getMessage());
|
||||
} catch( RuntimeException e) {
|
||||
throw new CompileError("Problem with source, runtime Exception: " + e.getMessage(), statement);
|
||||
}
|
||||
}
|
||||
} else if (statement instanceof StatementConditionalJump) {
|
||||
AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.conditionalJump((StatementConditionalJump) statement, block, program), program);
|
||||
|
Loading…
Reference in New Issue
Block a user