Skip to content

GitLab

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
Show whitespace changes
Inline Side-by-side
src/main/java/edu/kit/formal/interpreter/funchdl/BuiltinCommands.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/BuiltinCommands.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.interpreter.data.Value;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.proofscriptparser.ast.Variable;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.interpreter.data.Value;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import edu.kit.formal.psdb.parser.ast.Variable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......
src/main/java/edu/kit/formal/interpreter/funchdl/CommandCall.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandCall.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.Interpreter;
/**
* @author Alexander Weigl
......
src/main/java/edu/kit/formal/interpreter/funchdl/CommandHandler.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandHandler.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.CallStatement;
/**
* @author Alexander Weigl
......
src/main/java/edu/kit/formal/interpreter/funchdl/CommandLookup.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandLookup.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.CallStatement;
/**
* @author Alexander Weigl
......
src/main/java/edu/kit/formal/interpreter/funchdl/DefaultLookup.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/DefaultLookup.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.interpreter.exceptions.NoCallHandlerException;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.interpreter.exceptions.NoCallHandlerException;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import lombok.Getter;
import java.util.ArrayList;
......
src/main/java/edu/kit/formal/interpreter/funchdl/MacroCommandHandler.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/MacroCommandHandler.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import de.uka.ilkd.key.macros.ProofMacro;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.Value;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.proofscriptparser.types.SimpleType;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.Value;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.*;
import edu.kit.formal.psdb.parser.types.SimpleType;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......
src/main/java/edu/kit/formal/interpreter/funchdl/ProofScriptCommandBuilder.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/ProofScriptCommandBuilder.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
import de.uka.ilkd.key.macros.scripts.EngineState;
import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
import de.uka.ilkd.key.proof.Goal;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.key_project.util.collection.ImmutableList;
......
src/main/java/edu/kit/formal/interpreter/funchdl/ProofScriptHandler.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/ProofScriptHandler.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......
src/main/java/edu/kit/formal/interpreter/funchdl/RuleCommandHandler.java → src/main/java/edu/kit/formal/psdb/interpreter/funchdl/RuleCommandHandler.java
View file @ f3c061d8
package edu.kit.formal.interpreter.funchdl;
package edu.kit.formal.psdb.interpreter.funchdl;
import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
......@@ -7,13 +7,13 @@ import de.uka.ilkd.key.macros.scripts.RuleCommand;
import de.uka.ilkd.key.macros.scripts.ScriptException;
import de.uka.ilkd.key.proof.Goal;
import de.uka.ilkd.key.rule.Rule;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.interpreter.data.VariableAssignment;
import edu.kit.formal.interpreter.exceptions.ScriptCommandNotApplicableException;
import edu.kit.formal.proofscriptparser.ast.CallStatement;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.interpreter.data.VariableAssignment;
import edu.kit.formal.psdb.interpreter.exceptions.ScriptCommandNotApplicableException;
import edu.kit.formal.psdb.parser.ast.CallStatement;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.key_project.util.collection.ImmutableList;
......
src/main/java/edu/kit/formal/interpreter/graphs/ControlFlowNode.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/ControlFlowNode.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import java.util.LinkedList;
import java.util.List;
......
src/main/java/edu/kit/formal/interpreter/graphs/ControlFlowVisitor.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/ControlFlowVisitor.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import com.google.common.graph.EndpointPair;
import com.google.common.graph.MutableValueGraph;
import com.google.common.graph.ValueGraphBuilder;
import edu.kit.formal.interpreter.funchdl.CommandLookup;
import edu.kit.formal.interpreter.funchdl.ProofScriptHandler;
import edu.kit.formal.proofscriptparser.DefaultASTVisitor;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.psdb.interpreter.funchdl.CommandLookup;
import edu.kit.formal.psdb.interpreter.funchdl.ProofScriptHandler;
import edu.kit.formal.psdb.parser.DefaultASTVisitor;
import edu.kit.formal.psdb.parser.ast.*;
import java.util.*;
......
src/main/java/edu/kit/formal/interpreter/graphs/EdgeTypes.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/EdgeTypes.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
/**
* Edge Type a state graph and control flow graph may have
......
src/main/java/edu/kit/formal/interpreter/graphs/GraphChangedListener.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/GraphChangedListener.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import edu.kit.formal.interpreter.NodeAddedEvent;
import edu.kit.formal.psdb.interpreter.NodeAddedEvent;
/**
* Listener for Change events in the state graph
......
src/main/java/edu/kit/formal/interpreter/graphs/PTreeNode.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/PTreeNode.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import java.util.LinkedList;
......
src/main/java/edu/kit/formal/interpreter/graphs/ProofTreeController.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/ProofTreeController.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import com.google.common.eventbus.Subscribe;
import edu.kit.formal.gui.controller.Events;
import edu.kit.formal.gui.controller.PuppetMaster;
import edu.kit.formal.gui.controls.DebuggerStatusBar;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.InterpretingService;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
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.controller.PuppetMaster;
import edu.kit.formal.psdb.gui.controls.DebuggerStatusBar;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.InterpretingService;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import javafx.application.Platform;
import javafx.beans.property.*;
import javafx.collections.FXCollections;
......
src/main/java/edu/kit/formal/interpreter/graphs/StateGraphWrapper.java → src/main/java/edu/kit/formal/psdb/interpreter/graphs/StateGraphWrapper.java
View file @ f3c061d8
package edu.kit.formal.interpreter.graphs;
package edu.kit.formal.psdb.interpreter.graphs;
import com.google.common.graph.MutableValueGraph;
import com.google.common.graph.ValueGraphBuilder;
import edu.kit.formal.interpreter.Interpreter;
import edu.kit.formal.interpreter.NodeAddedEvent;
import edu.kit.formal.interpreter.data.GoalNode;
import edu.kit.formal.interpreter.data.KeyData;
import edu.kit.formal.interpreter.data.State;
import edu.kit.formal.interpreter.exceptions.StateGraphException;
import edu.kit.formal.proofscriptparser.DefaultASTVisitor;
import edu.kit.formal.proofscriptparser.Visitor;
import edu.kit.formal.proofscriptparser.ast.*;
import edu.kit.formal.psdb.interpreter.Interpreter;
import edu.kit.formal.psdb.interpreter.NodeAddedEvent;
import edu.kit.formal.psdb.interpreter.data.GoalNode;
import edu.kit.formal.psdb.interpreter.data.KeyData;
import edu.kit.formal.psdb.interpreter.data.State;
import edu.kit.formal.psdb.interpreter.exceptions.StateGraphException;
import edu.kit.formal.psdb.parser.DefaultASTVisitor;
import edu.kit.formal.psdb.parser.Visitor;
import edu.kit.formal.psdb.parser.ast.*;
import javafx.application.Platform;
import javafx.beans.property.SimpleObjectProperty;
import lombok.Getter;
......
src/main/java/edu/kit/formal/proofscriptparser/lint/IssuesRepository.java → src/main/java/edu/kit/formal/psdb/lint/IssuesRepository.java
View file @ f3c061d8
package edu.kit.formal.proofscriptparser.lint;
package edu.kit.formal.psdb.lint;
import edu.kit.formal.proofscriptparser.lint.checkers.IssuesId;
import edu.kit.formal.psdb.lint.checkers.IssuesId;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
......
src/main/java/edu/kit/formal/proofscriptparser/lint/LintProblem.java → src/main/java/edu/kit/formal/psdb/lint/LintProblem.java
View file @ f3c061d8
package edu.kit.formal.proofscriptparser.lint;
package edu.kit.formal.psdb.lint;
import com.github.mustachejava.DefaultMustacheFactory;
import com.github.mustachejava.Mustache;
import com.github.mustachejava.reflect.ReflectionObjectHandler;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import lombok.Data;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......
src/main/java/edu/kit/formal/proofscriptparser/lint/LintRule.java → src/main/java/edu/kit/formal/psdb/lint/LintRule.java
View file @ f3c061d8
package edu.kit.formal.proofscriptparser.lint;
package edu.kit.formal.psdb.lint;
import edu.kit.formal.proofscriptparser.ast.ASTNode;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.parser.ast.ASTNode;
import java.util.List;
......
src/main/java/edu/kit/formal/proofscriptparser/lint/Linter.java → src/main/java/edu/kit/formal/psdb/lint/Linter.java
View file @ f3c061d8
package edu.kit.formal.proofscriptparser.lint;
package edu.kit.formal.psdb.lint;
import edu.kit.formal.proofscriptparser.Facade;
import edu.kit.formal.proofscriptparser.ast.ProofScript;
import edu.kit.formal.psdb.parser.Facade;
import edu.kit.formal.psdb.parser.ast.ProofScript;
import org.antlr.v4.runtime.CharStreams;
import java.io.*;
......
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

Imprint