Commit b6b30869 authored by Alexander Weigl's avatar Alexander Weigl
Browse files

fix loading problems

parent 2e6d3e4f
......@@ -212,19 +212,20 @@ public class KeyIO {
if (ctx.isEmpty()) parseFile();
loadDeclarations();
loadSndDegreeDeclarations();
activateLDT();
activateLDTs();
return loadTaclets();
}
private void activateLDT() {
public Loader activateLDTs() {
services.getTypeConverter().init();
return this;
}
public ProblemFinder loadCompleteProblem() throws IOException {
if (ctx.isEmpty()) parseFile();
loadDeclarations();
loadSndDegreeDeclarations();
activateLDTs();
loadTaclets();
return loadProblem();
}
......
......@@ -76,7 +76,10 @@ public class TestDeclParser {
private void evaluateDeclarations(String s) {
try {
KeyIO.Loader l = io.load(s);
l.parseFile().loadComplete();
l.parseFile()
.loadDeclarations()
.loadSndDegreeDeclarations()
.loadTaclets();
parsedSchemaVars = l.getSchemaNamespace();
} catch (Exception e) {
throw new RuntimeException("'" + s + "' was not parseable and evaluatable", e);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment