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

refactor and matcher

parent a8d6499c
Pipeline #12898 failed with stage
in 1 minute and 30 seconds
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.BorderPane;
/**
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import de.uka.ilkd.key.proof.Node;
import de.uka.ilkd.key.proof.Proof;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import com.google.common.eventbus.Subscribe;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
import de.uka.ilkd.key.logic.SequentFormula;
import edu.kit.formal.gui.controller.Events;
import edu.kit.formal.gui.model.Breakpoint;
import edu.kit.formal.gui.model.MainScriptIdentifier;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.ScriptLanguageLexer;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.proofscriptparser.lint.LintProblem;
import edu.kit.formal.proofscriptparser.lint.LinterStrategy;
import edu.kit.formal.psdb.gui.controller.Events;
import edu.kit.formal.psdb.gui.model.Breakpoint;
import edu.kit.formal.psdb.gui.model.MainScriptIdentifier;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.ScriptLanguageLexer;
import edu.kit.formal.psdb.parser.ast.*;
import edu.kit.formal.psdb.lint.LintProblem;
import edu.kit.formal.psdb.lint.LinterStrategy;
import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
import javafx.beans.binding.BooleanBinding;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import com.google.common.eventbus.Subscribe;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
import edu.kit.formal.gui.controller.Events;
import edu.kit.formal.gui.model.Breakpoint;
import edu.kit.formal.gui.model.MainScriptIdentifier;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.gui.controller.Events;
import edu.kit.formal.psdb.gui.model.Breakpoint;
import edu.kit.formal.psdb.gui.model.MainScriptIdentifier;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.value.ChangeListener;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import javafx.beans.property.StringProperty;
import javafx.collections.ObservableList;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import de.uka.ilkd.key.java.Services;
import de.uka.ilkd.key.logic.NamespaceSet;
......@@ -7,7 +7,7 @@ import de.uka.ilkd.key.pp.*;
import de.uka.ilkd.key.proof.Goal;
import de.uka.ilkd.key.proof.Node;
import de.uka.ilkd.key.settings.ProofIndependentSettings;
import edu.kit.formal.interpreter.KeYProofFacade;
import edu.kit.formal.psdb.interpreter.KeYProofFacade;
import javafx.beans.Observable;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.value.ObservableBooleanValue;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import de.uka.ilkd.key.control.ProofControl;
import de.uka.ilkd.key.gui.nodeviews.TacletMenu.TacletAppComparator;
......@@ -10,9 +10,9 @@ import de.uka.ilkd.key.pp.NotationInfo;
import de.uka.ilkd.key.pp.PosInSequent;
import de.uka.ilkd.key.proof.Goal;
import de.uka.ilkd.key.rule.*;
import edu.kit.formal.gui.controller.DebuggerMainWindowController;
import edu.kit.formal.gui.controller.Events;
import edu.kit.formal.interpreter.KeYProofFacade;
import edu.kit.formal.psdb.gui.controller.DebuggerMain;
import edu.kit.formal.psdb.gui.controller.Events;
import edu.kit.formal.psdb.interpreter.KeYProofFacade;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.ContextMenu;
......@@ -111,7 +111,7 @@ public class TacletContextMenu extends ContextMenu {
occ = pos.getPosInOccurrence();
//MediatorProofControl c = new MediatorProofControl(new DefaultAbstractMediatorUserInterfaceControlAdapter());
ProofControl c = DebuggerMainWindowController.FACADE.getEnvironment().getUi().getProofControl();
ProofControl c = DebuggerMain.FACADE.getEnvironment().getUi().getProofControl();
final ImmutableList<BuiltInRule> builtInRules = c.getBuiltInRule(goal, occ);
createTacletMenu(
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import de.uka.ilkd.key.logic.Term;
import de.uka.ilkd.key.logic.op.Equality;
......@@ -7,9 +7,9 @@ import de.uka.ilkd.key.logic.op.Junctor;
import de.uka.ilkd.key.logic.op.Operator;
import de.uka.ilkd.key.pp.ProgramPrinter;
import de.uka.ilkd.key.speclang.Contract;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.proofscriptparser.ScriptLanguageLexer;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.parser.ScriptLanguageLexer;
import javafx.beans.property.Property;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
......
package edu.kit.formal.gui.controls;
package edu.kit.formal.psdb.gui.controls;
import edu.kit.formal.gui.controller.DebuggerMainWindowController;
import edu.kit.formal.psdb.gui.controller.DebuggerMain;
import javafx.event.ActionEvent;
import javafx.scene.layout.AnchorPane;
......@@ -10,9 +10,9 @@ import java.io.File;
* Created by weigl on 7/7/17.
*/
public class WelcomePane extends AnchorPane {
private final DebuggerMainWindowController proofScriptDebugger;
private final DebuggerMain proofScriptDebugger;
public WelcomePane(DebuggerMainWindowController debugger) {
public WelcomePane(DebuggerMain debugger) {
this.proofScriptDebugger = debugger;
Utils.createWithFXML(this);
}
......
package edu.kit.formal.gui.model;
package edu.kit.formal.psdb.gui.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
......
package edu.kit.formal.gui.model;
package edu.kit.formal.psdb.gui.model;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import javafx.beans.property.*;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
......
package edu.kit.formal.gui.model;
package edu.kit.formal.psdb.gui.model;
import edu.kit.formal.gui.controls.ScriptArea;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.gui.controls.ScriptArea;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.RequiredArgsConstructor;
......@@ -12,7 +12,7 @@ import java.util.Optional;
/**
* This class holds information to identify the main script (entry point) in a
* set of {@link edu.kit.formal.proofscriptparser.ast.ProofScript}s.
* set of {@link edu.kit.formal.psdb.parser.ast.ProofScript}s.
*
* @author Alexander Weigl
*/
......
package edu.kit.formal.interpreter;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.Value;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.DefaultASTVisitor;
import edu.kit.formal.proofscriptparser.Visitor;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.proofscriptparser.types.SimpleType;
import edu.kit.formal.proofscriptparser.types.TermType;
import edu.kit.formal.proofscriptparser.types.TypeFacade;
package edu.kit.formal.psdb.interpreter;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.Value;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.DefaultASTVisitor;
import edu.kit.formal.psdb.parser.Visitor;
import edu.kit.formal.psdb.parser.ast.*;
import edu.kit.formal.psdb.parser.types.SimpleType;
import edu.kit.formal.psdb.parser.types.TermType;
import edu.kit.formal.psdb.parser.types.TypeFacade;
import lombok.Getter;
import lombok.Setter;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import de.uka.ilkd.key.api.KeYApi;
import de.uka.ilkd.key.api.ProjectedNode;
import de.uka.ilkd.key.api.ProofApi;
import de.uka.ilkd.key.api.ProofManagementApi;
import de.uka.ilkd.key.proof.io.ProblemLoaderException;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.proofscriptparser.DefaultASTVisitor;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.parser.DefaultASTVisitor;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import com.google.common.collect.BiMap;
......@@ -7,15 +7,15 @@ import de.uka.ilkd.key.api.ScriptApi;
import de.uka.ilkd.key.api.VariableAssignments;
import de.uka.ilkd.key.proof.Goal;
import de.uka.ilkd.key.proof.Proof;
import edu.kit.formal.interpreter.data.*;
import edu.kit.formal.interpreter.exceptions.InterpreterRuntimeException;
import edu.kit.formal.interpreter.exceptions.ScriptCommandNotApplicableException;
import edu.kit.formal.interpreter.funchdl.CommandLookup;
import edu.kit.formal.proofscriptparser.DefaultASTVisitor;
import edu.kit.formal.proofscriptparser.Visitor;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.proofscriptparser.types.SimpleType;
import edu.kit.formal.proofscriptparser.types.Type;
import edu.kit.formal.psdb.interpreter.data.*;
import edu.kit.formal.psdb.interpreter.exceptions.InterpreterRuntimeException;
import edu.kit.formal.psdb.interpreter.exceptions.ScriptCommandNotApplicableException;
import edu.kit.formal.psdb.interpreter.funchdl.CommandLookup;
import edu.kit.formal.psdb.parser.DefaultASTVisitor;
import edu.kit.formal.psdb.parser.Visitor;
import edu.kit.formal.psdb.parser.ast.*;
import edu.kit.formal.psdb.parser.types.SimpleType;
import edu.kit.formal.psdb.parser.types.Type;
import lombok.Getter;
import lombok.Setter;
import org.key_project.util.collection.ImmutableList;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import de.uka.ilkd.key.api.KeYApi;
import de.uka.ilkd.key.api.ProjectedNode;
......@@ -8,14 +8,14 @@ import de.uka.ilkd.key.control.KeYEnvironment;
import de.uka.ilkd.key.macros.ProofMacro;
import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
import de.uka.ilkd.key.proof.Proof;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.interpreter.funchdl.*;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.Visitor;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.interpreter.funchdl.*;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.Visitor;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import lombok.Getter;
import java.io.File;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import edu.kit.formal.gui.controller.PuppetMaster;
import edu.kit.formal.gui.controls.Utils;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.gui.controller.PuppetMaster;
import edu.kit.formal.psdb.gui.controls.Utils;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.concurrent.Service;
......@@ -73,8 +73,8 @@ public class InterpretingService extends Service<State<KeyData>> {
}
@Override
protected Task<edu.kit.formal.interpreter.data.State<KeyData>> createTask() {
return new Task<edu.kit.formal.interpreter.data.State<KeyData>>() {
protected Task<edu.kit.formal.psdb.interpreter.data.State<KeyData>> createTask() {
return new Task<edu.kit.formal.psdb.interpreter.data.State<KeyData>>() {
final Interpreter<KeyData> i = interpreter.get();
final ProofScript ast = mainScript.get();
......@@ -85,7 +85,7 @@ public class InterpretingService extends Service<State<KeyData>> {
* @throws Exception
*/
@Override
protected edu.kit.formal.interpreter.data.State<KeyData> call() throws Exception {
protected edu.kit.formal.psdb.interpreter.data.State<KeyData> call() throws Exception {
i.interpret(ast);
return i.peekState();
}
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import de.uka.ilkd.key.api.ScriptApi;
import de.uka.ilkd.key.api.VariableAssignments;
......@@ -12,15 +12,15 @@ import de.uka.ilkd.key.proof.init.Profile;
import de.uka.ilkd.key.rule.NoPosTacletApp;
import de.uka.ilkd.key.rule.Taclet;
import de.uka.ilkd.key.rule.TacletApp;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.Value;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.Signature;
import edu.kit.formal.proofscriptparser.ast.TermLiteral;
import edu.kit.formal.proofscriptparser.types.SimpleType;
import edu.kit.formal.proofscriptparser.ast.Variable;
import edu.kit.formal.proofscriptparser.types.Type;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.Value;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.Signature;
import edu.kit.formal.psdb.parser.ast.TermLiteral;
import edu.kit.formal.psdb.parser.types.SimpleType;
import edu.kit.formal.psdb.parser.ast.Variable;
import edu.kit.formal.psdb.parser.types.Type;
import org.key_project.util.collection.ImmutableList;
import java.util.ArrayList;
......
package edu.kit.formal.interpreter;
package edu.kit.formal.psdb.interpreter;
import de.uka.ilkd.key.api.KeYApi;
import de.uka.ilkd.key.api.ProofApi;
......@@ -9,9 +9,8 @@ import de.uka.ilkd.key.proof.Proof;
import de.uka.ilkd.key.proof.init.ProofInputException;
import de.uka.ilkd.key.proof.io.ProblemLoaderException;
import de.uka.ilkd.key.speclang.Contract;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import javafx.application.Platform;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.SimpleObjectProperty;
import javafx.concurrent.Task;
......
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