Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
ProofScriptParser
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
24
Issues
24
List
Boards
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sarah.grebing
ProofScriptParser
Commits
f3c061d8
Commit
f3c061d8
authored
Aug 17, 2017
by
Alexander Weigl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor and matcher
parent
a8d6499c
Pipeline
#12898
failed with stage
in 1 minute and 30 seconds
Changes
211
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
211 changed files
with
1003 additions
and
1166 deletions
+1003
-1166
pom.xml
pom.xml
+2
-2
src/main/antlr4/edu/kit/formal/psdb/parser/ScriptLanguage.g4
src/main/antlr4/edu/kit/formal/psdb/parser/ScriptLanguage.g4
+0
-0
src/main/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
...in/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
+39
-0
src/main/antlr4/edu/kit/formal/termmatcher/MatchPattern.g4
src/main/antlr4/edu/kit/formal/termmatcher/MatchPattern.g4
+0
-30
src/main/java/edu/kit/formal/proofscriptparser/lint/checkers/IssuesId.java
.../kit/formal/proofscriptparser/lint/checkers/IssuesId.java
+0
-15
src/main/java/edu/kit/formal/proofscriptparser/lint/checkers/NegatedMatchWithUsing.java
...roofscriptparser/lint/checkers/NegatedMatchWithUsing.java
+0
-31
src/main/java/edu/kit/formal/psdb/gui/ProofScriptDebugger.java
...ain/java/edu/kit/formal/psdb/gui/ProofScriptDebugger.java
+3
-4
src/main/java/edu/kit/formal/psdb/gui/controller/ContractChooser.java
...a/edu/kit/formal/psdb/gui/controller/ContractChooser.java
+1
-3
src/main/java/edu/kit/formal/psdb/gui/controller/DebuggerMain.java
...java/edu/kit/formal/psdb/gui/controller/DebuggerMain.java
+15
-15
src/main/java/edu/kit/formal/psdb/gui/controller/Events.java
src/main/java/edu/kit/formal/psdb/gui/controller/Events.java
+3
-3
src/main/java/edu/kit/formal/psdb/gui/controller/PuppetMaster.java
...java/edu/kit/formal/psdb/gui/controller/PuppetMaster.java
+10
-10
src/main/java/edu/kit/formal/psdb/gui/controls/ANTLR4LexerHighlighter.java
.../kit/formal/psdb/gui/controls/ANTLR4LexerHighlighter.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/BaseCodeArea.java
...n/java/edu/kit/formal/psdb/gui/controls/BaseCodeArea.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/CustomTabPaneSkin.java
...a/edu/kit/formal/psdb/gui/controls/CustomTabPaneSkin.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/DebuggerStatusBar.java
...a/edu/kit/formal/psdb/gui/controls/DebuggerStatusBar.java
+40
-56
src/main/java/edu/kit/formal/psdb/gui/controls/GoalOptionsMenu.java
...ava/edu/kit/formal/psdb/gui/controls/GoalOptionsMenu.java
+2
-2
src/main/java/edu/kit/formal/psdb/gui/controls/InspectionView.java
...java/edu/kit/formal/psdb/gui/controls/InspectionView.java
+4
-4
src/main/java/edu/kit/formal/psdb/gui/controls/InspectionViewsController.java
...t/formal/psdb/gui/controls/InspectionViewsController.java
+2
-2
src/main/java/edu/kit/formal/psdb/gui/controls/JavaArea.java
src/main/java/edu/kit/formal/psdb/gui/controls/JavaArea.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/LineMapping.java
...in/java/edu/kit/formal/psdb/gui/controls/LineMapping.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/PlaceHolderTab.java
...java/edu/kit/formal/psdb/gui/controls/PlaceHolderTab.java
+1
-4
src/main/java/edu/kit/formal/psdb/gui/controls/ProofTree.java
...main/java/edu/kit/formal/psdb/gui/controls/ProofTree.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/ScriptArea.java
...ain/java/edu/kit/formal/psdb/gui/controls/ScriptArea.java
+9
-9
src/main/java/edu/kit/formal/psdb/gui/controls/ScriptController.java
...va/edu/kit/formal/psdb/gui/controls/ScriptController.java
+7
-7
src/main/java/edu/kit/formal/psdb/gui/controls/SectionPane.java
...in/java/edu/kit/formal/psdb/gui/controls/SectionPane.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/controls/SequentView.java
...in/java/edu/kit/formal/psdb/gui/controls/SequentView.java
+2
-2
src/main/java/edu/kit/formal/psdb/gui/controls/TacletContextMenu.java
...a/edu/kit/formal/psdb/gui/controls/TacletContextMenu.java
+5
-5
src/main/java/edu/kit/formal/psdb/gui/controls/Utils.java
src/main/java/edu/kit/formal/psdb/gui/controls/Utils.java
+4
-4
src/main/java/edu/kit/formal/psdb/gui/controls/WelcomePane.java
...in/java/edu/kit/formal/psdb/gui/controls/WelcomePane.java
+4
-4
src/main/java/edu/kit/formal/psdb/gui/model/Breakpoint.java
src/main/java/edu/kit/formal/psdb/gui/model/Breakpoint.java
+1
-1
src/main/java/edu/kit/formal/psdb/gui/model/InspectionModel.java
...n/java/edu/kit/formal/psdb/gui/model/InspectionModel.java
+4
-4
src/main/java/edu/kit/formal/psdb/gui/model/MainScriptIdentifier.java
...a/edu/kit/formal/psdb/gui/model/MainScriptIdentifier.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/Evaluator.java
src/main/java/edu/kit/formal/psdb/interpreter/Evaluator.java
+11
-11
src/main/java/edu/kit/formal/psdb/interpreter/Execute.java
src/main/java/edu/kit/formal/psdb/interpreter/Execute.java
+5
-5
src/main/java/edu/kit/formal/psdb/interpreter/HistoryListener.java
...java/edu/kit/formal/psdb/interpreter/HistoryListener.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/Interpreter.java
...ain/java/edu/kit/formal/psdb/interpreter/Interpreter.java
+10
-10
src/main/java/edu/kit/formal/psdb/interpreter/InterpreterBuilder.java
...a/edu/kit/formal/psdb/interpreter/InterpreterBuilder.java
+9
-9
src/main/java/edu/kit/formal/psdb/interpreter/InterpretingService.java
.../edu/kit/formal/psdb/interpreter/InterpretingService.java
+9
-9
src/main/java/edu/kit/formal/psdb/interpreter/KeYMatcher.java
...main/java/edu/kit/formal/psdb/interpreter/KeYMatcher.java
+10
-10
src/main/java/edu/kit/formal/psdb/interpreter/KeYProofFacade.java
.../java/edu/kit/formal/psdb/interpreter/KeYProofFacade.java
+3
-4
src/main/java/edu/kit/formal/psdb/interpreter/MatchEvaluator.java
.../java/edu/kit/formal/psdb/interpreter/MatchEvaluator.java
+10
-10
src/main/java/edu/kit/formal/psdb/interpreter/MatcherApi.java
...main/java/edu/kit/formal/psdb/interpreter/MatcherApi.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/NodeAddedEvent.java
.../java/edu/kit/formal/psdb/interpreter/NodeAddedEvent.java
+2
-2
src/main/java/edu/kit/formal/psdb/interpreter/ScopeLogger.java
...ain/java/edu/kit/formal/psdb/interpreter/ScopeLogger.java
+3
-3
src/main/java/edu/kit/formal/psdb/interpreter/ScopeObservable.java
...java/edu/kit/formal/psdb/interpreter/ScopeObservable.java
+3
-3
src/main/java/edu/kit/formal/psdb/interpreter/data/GoalNode.java
...n/java/edu/kit/formal/psdb/interpreter/data/GoalNode.java
+3
-4
src/main/java/edu/kit/formal/psdb/interpreter/data/KeyData.java
...in/java/edu/kit/formal/psdb/interpreter/data/KeyData.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/data/KeyScriptSequent.java
...du/kit/formal/psdb/interpreter/data/KeyScriptSequent.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/data/State.java
...main/java/edu/kit/formal/psdb/interpreter/data/State.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/data/Value.java
...main/java/edu/kit/formal/psdb/interpreter/data/Value.java
+5
-5
src/main/java/edu/kit/formal/psdb/interpreter/data/VariableAssignment.java
.../kit/formal/psdb/interpreter/data/VariableAssignment.java
+4
-5
src/main/java/edu/kit/formal/psdb/interpreter/dbg/Blocker.java
...ain/java/edu/kit/formal/psdb/interpreter/dbg/Blocker.java
+3
-3
src/main/java/edu/kit/formal/psdb/interpreter/dbg/Debugger.java
...in/java/edu/kit/formal/psdb/interpreter/dbg/Debugger.java
+16
-16
src/main/java/edu/kit/formal/psdb/interpreter/dbg/PseudoMatcher.java
...va/edu/kit/formal/psdb/interpreter/dbg/PseudoMatcher.java
+8
-9
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/InterpreterRuntimeException.java
...b/interpreter/exceptions/InterpreterRuntimeException.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/NoCallHandlerException.java
...l/psdb/interpreter/exceptions/NoCallHandlerException.java
+2
-2
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/ScriptCommandNotApplicableException.java
...reter/exceptions/ScriptCommandNotApplicableException.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/StateGraphException.java
...rmal/psdb/interpreter/exceptions/StateGraphException.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/VariableNotDeclaredException.java
.../interpreter/exceptions/VariableNotDeclaredException.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/exceptions/VariableNotDefinedException.java
...b/interpreter/exceptions/VariableNotDefinedException.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/BuiltinCommands.java
.../kit/formal/psdb/interpreter/funchdl/BuiltinCommands.java
+8
-8
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandCall.java
.../edu/kit/formal/psdb/interpreter/funchdl/CommandCall.java
+2
-2
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandHandler.java
...u/kit/formal/psdb/interpreter/funchdl/CommandHandler.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/CommandLookup.java
...du/kit/formal/psdb/interpreter/funchdl/CommandLookup.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/DefaultLookup.java
...du/kit/formal/psdb/interpreter/funchdl/DefaultLookup.java
+5
-5
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/MacroCommandHandler.java
.../formal/psdb/interpreter/funchdl/MacroCommandHandler.java
+6
-6
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/ProofScriptCommandBuilder.java
...l/psdb/interpreter/funchdl/ProofScriptCommandBuilder.java
+7
-7
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/ProofScriptHandler.java
...t/formal/psdb/interpreter/funchdl/ProofScriptHandler.java
+6
-6
src/main/java/edu/kit/formal/psdb/interpreter/funchdl/RuleCommandHandler.java
...t/formal/psdb/interpreter/funchdl/RuleCommandHandler.java
+8
-8
src/main/java/edu/kit/formal/psdb/interpreter/graphs/ControlFlowNode.java
...u/kit/formal/psdb/interpreter/graphs/ControlFlowNode.java
+2
-2
src/main/java/edu/kit/formal/psdb/interpreter/graphs/ControlFlowVisitor.java
...it/formal/psdb/interpreter/graphs/ControlFlowVisitor.java
+5
-5
src/main/java/edu/kit/formal/psdb/interpreter/graphs/EdgeTypes.java
...ava/edu/kit/formal/psdb/interpreter/graphs/EdgeTypes.java
+1
-1
src/main/java/edu/kit/formal/psdb/interpreter/graphs/GraphChangedListener.java
.../formal/psdb/interpreter/graphs/GraphChangedListener.java
+2
-2
src/main/java/edu/kit/formal/psdb/interpreter/graphs/PTreeNode.java
...ava/edu/kit/formal/psdb/interpreter/graphs/PTreeNode.java
+4
-4
src/main/java/edu/kit/formal/psdb/interpreter/graphs/ProofTreeController.java
...t/formal/psdb/interpreter/graphs/ProofTreeController.java
+11
-11
src/main/java/edu/kit/formal/psdb/interpreter/graphs/StateGraphWrapper.java
...kit/formal/psdb/interpreter/graphs/StateGraphWrapper.java
+10
-10
src/main/java/edu/kit/formal/psdb/lint/IssuesRepository.java
src/main/java/edu/kit/formal/psdb/lint/IssuesRepository.java
+2
-2
src/main/java/edu/kit/formal/psdb/lint/LintProblem.java
src/main/java/edu/kit/formal/psdb/lint/LintProblem.java
+2
-2
src/main/java/edu/kit/formal/psdb/lint/LintRule.java
src/main/java/edu/kit/formal/psdb/lint/LintRule.java
+2
-3
src/main/java/edu/kit/formal/psdb/lint/Linter.java
src/main/java/edu/kit/formal/psdb/lint/Linter.java
+3
-3
src/main/java/edu/kit/formal/psdb/lint/LinterStrategy.java
src/main/java/edu/kit/formal/psdb/lint/LinterStrategy.java
+2
-7
src/main/java/edu/kit/formal/psdb/lint/checkers/AbstractLintRule.java
...a/edu/kit/formal/psdb/lint/checkers/AbstractLintRule.java
+3
-3
src/main/java/edu/kit/formal/psdb/lint/checkers/EmptyBlocks.java
...n/java/edu/kit/formal/psdb/lint/checkers/EmptyBlocks.java
+4
-4
src/main/java/edu/kit/formal/psdb/lint/checkers/EqualScriptNames.java
...a/edu/kit/formal/psdb/lint/checkers/EqualScriptNames.java
+7
-7
src/main/java/edu/kit/formal/psdb/lint/checkers/Searcher.java
...main/java/edu/kit/formal/psdb/lint/checkers/Searcher.java
+5
-8
src/main/java/edu/kit/formal/psdb/lint/checkers/SearcherFactory.java
...va/edu/kit/formal/psdb/lint/checkers/SearcherFactory.java
+1
-3
src/main/java/edu/kit/formal/psdb/lint/checkers/SuccessiveGoalSelector.java
...kit/formal/psdb/lint/checkers/SuccessiveGoalSelector.java
+7
-7
src/main/java/edu/kit/formal/psdb/lint/checkers/VariableDeclarationCheck.java
...t/formal/psdb/lint/checkers/VariableDeclarationCheck.java
+7
-8
src/main/java/edu/kit/formal/psdb/lint/package-info.java
src/main/java/edu/kit/formal/psdb/lint/package-info.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ASTChanger.java
src/main/java/edu/kit/formal/psdb/parser/ASTChanger.java
+3
-4
src/main/java/edu/kit/formal/psdb/parser/ASTTraversal.java
src/main/java/edu/kit/formal/psdb/parser/ASTTraversal.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/DefaultASTVisitor.java
...in/java/edu/kit/formal/psdb/parser/DefaultASTVisitor.java
+2
-2
src/main/java/edu/kit/formal/psdb/parser/Facade.java
src/main/java/edu/kit/formal/psdb/parser/Facade.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/NotWelldefinedException.java
...a/edu/kit/formal/psdb/parser/NotWelldefinedException.java
+2
-2
src/main/java/edu/kit/formal/psdb/parser/PrettyPrinter.java
src/main/java/edu/kit/formal/psdb/parser/PrettyPrinter.java
+3
-4
src/main/java/edu/kit/formal/psdb/parser/TransformAst.java
src/main/java/edu/kit/formal/psdb/parser/TransformAst.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/Visitable.java
src/main/java/edu/kit/formal/psdb/parser/Visitable.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/Visitor.java
src/main/java/edu/kit/formal/psdb/parser/Visitor.java
+2
-2
src/main/java/edu/kit/formal/psdb/parser/ast/ASTNode.java
src/main/java/edu/kit/formal/psdb/parser/ast/ASTNode.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/AssignmentStatement.java
...a/edu/kit/formal/psdb/parser/ast/AssignmentStatement.java
+4
-5
src/main/java/edu/kit/formal/psdb/parser/ast/BinaryExpression.java
...java/edu/kit/formal/psdb/parser/ast/BinaryExpression.java
+4
-5
src/main/java/edu/kit/formal/psdb/parser/ast/BooleanLiteral.java
...n/java/edu/kit/formal/psdb/parser/ast/BooleanLiteral.java
+4
-4
src/main/java/edu/kit/formal/psdb/parser/ast/CallStatement.java
...in/java/edu/kit/formal/psdb/parser/ast/CallStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/CaseStatement.java
...in/java/edu/kit/formal/psdb/parser/ast/CaseStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/CasesStatement.java
...n/java/edu/kit/formal/psdb/parser/ast/CasesStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/Copyable.java
src/main/java/edu/kit/formal/psdb/parser/ast/Copyable.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ast/Expression.java
src/main/java/edu/kit/formal/psdb/parser/ast/Expression.java
+3
-4
src/main/java/edu/kit/formal/psdb/parser/ast/ForeachStatement.java
...java/edu/kit/formal/psdb/parser/ast/ForeachStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/GoalSelector.java
...ain/java/edu/kit/formal/psdb/parser/ast/GoalSelector.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ast/IntegerLiteral.java
...n/java/edu/kit/formal/psdb/parser/ast/IntegerLiteral.java
+5
-5
src/main/java/edu/kit/formal/psdb/parser/ast/IsClosableCase.java
...n/java/edu/kit/formal/psdb/parser/ast/IsClosableCase.java
+2
-2
src/main/java/edu/kit/formal/psdb/parser/ast/Literal.java
src/main/java/edu/kit/formal/psdb/parser/ast/Literal.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ast/MatchExpression.java
.../java/edu/kit/formal/psdb/parser/ast/MatchExpression.java
+7
-7
src/main/java/edu/kit/formal/psdb/parser/ast/Operator.java
src/main/java/edu/kit/formal/psdb/parser/ast/Operator.java
+6
-8
src/main/java/edu/kit/formal/psdb/parser/ast/Parameters.java
src/main/java/edu/kit/formal/psdb/parser/ast/Parameters.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/Position.java
src/main/java/edu/kit/formal/psdb/parser/ast/Position.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ast/ProofScript.java
...main/java/edu/kit/formal/psdb/parser/ast/ProofScript.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/RepeatStatement.java
.../java/edu/kit/formal/psdb/parser/ast/RepeatStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/Signature.java
src/main/java/edu/kit/formal/psdb/parser/ast/Signature.java
+4
-5
src/main/java/edu/kit/formal/psdb/parser/ast/SimpleCaseStatement.java
...a/edu/kit/formal/psdb/parser/ast/SimpleCaseStatement.java
+2
-2
src/main/java/edu/kit/formal/psdb/parser/ast/Statement.java
src/main/java/edu/kit/formal/psdb/parser/ast/Statement.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/ast/Statements.java
src/main/java/edu/kit/formal/psdb/parser/ast/Statements.java
+4
-4
src/main/java/edu/kit/formal/psdb/parser/ast/StringLiteral.java
...in/java/edu/kit/formal/psdb/parser/ast/StringLiteral.java
+5
-5
src/main/java/edu/kit/formal/psdb/parser/ast/SubstituteExpression.java
.../edu/kit/formal/psdb/parser/ast/SubstituteExpression.java
+6
-6
src/main/java/edu/kit/formal/psdb/parser/ast/TermLiteral.java
...main/java/edu/kit/formal/psdb/parser/ast/TermLiteral.java
+5
-6
src/main/java/edu/kit/formal/psdb/parser/ast/TheOnlyStatement.java
...java/edu/kit/formal/psdb/parser/ast/TheOnlyStatement.java
+3
-3
src/main/java/edu/kit/formal/psdb/parser/ast/UnaryExpression.java
.../java/edu/kit/formal/psdb/parser/ast/UnaryExpression.java
+4
-5
src/main/java/edu/kit/formal/psdb/parser/ast/Variable.java
src/main/java/edu/kit/formal/psdb/parser/ast/Variable.java
+4
-5
src/main/java/edu/kit/formal/psdb/parser/ast/package-info.java
...ain/java/edu/kit/formal/psdb/parser/ast/package-info.java
+4
-4
src/main/java/edu/kit/formal/psdb/parser/package-info.java
src/main/java/edu/kit/formal/psdb/parser/package-info.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/types/SimpleType.java
...ain/java/edu/kit/formal/psdb/parser/types/SimpleType.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/types/TermType.java
src/main/java/edu/kit/formal/psdb/parser/types/TermType.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/types/Type.java
src/main/java/edu/kit/formal/psdb/parser/types/Type.java
+1
-1
src/main/java/edu/kit/formal/psdb/parser/types/TypeFacade.java
...ain/java/edu/kit/formal/psdb/parser/types/TypeFacade.java
+1
-1
src/main/java/edu/kit/formal/psdb/termmatcher/MatchPatternDualVisitor.java
.../kit/formal/psdb/termmatcher/MatchPatternDualVisitor.java
+63
-0
src/main/java/edu/kit/formal/psdb/termmatcher/MatcherFacade.java
...n/java/edu/kit/formal/psdb/termmatcher/MatcherFacade.java
+28
-0
src/main/java/edu/kit/formal/psdb/termmatcher/MatcherImpl.java
...ain/java/edu/kit/formal/psdb/termmatcher/MatcherImpl.java
+146
-0
src/main/resources/META-INF/services/edu.kit.formal.proofscriptparser.lint.LintRule
...F/services/edu.kit.formal.proofscriptparser.lint.LintRule
+0
-5
src/main/resources/META-INF/services/edu.kit.formal.psdb.lint.LintRule
...urces/META-INF/services/edu.kit.formal.psdb.lint.LintRule
+5
-0
src/main/resources/edu/kit/formal/gui/debugger-ui.less
src/main/resources/edu/kit/formal/gui/debugger-ui.less
+0
-297
src/main/resources/edu/kit/formal/psdb/gui/controller/DebuggerMain.fxml
...rces/edu/kit/formal/psdb/gui/controller/DebuggerMain.fxml
+2
-2
src/main/resources/edu/kit/formal/psdb/gui/controls/BreakpointDialog.fxml
...es/edu/kit/formal/psdb/gui/controls/BreakpointDialog.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/GoalOptionsMenu.fxml
...ces/edu/kit/formal/psdb/gui/controls/GoalOptionsMenu.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/InspectionView.fxml
...rces/edu/kit/formal/psdb/gui/controls/InspectionView.fxml
+1
-1
src/main/resources/edu/kit/formal/psdb/gui/controls/InspectionViewTabPane.fxml
...u/kit/formal/psdb/gui/controls/InspectionViewTabPane.fxml
+1
-1
src/main/resources/edu/kit/formal/psdb/gui/controls/ListGoalView.fxml
...ources/edu/kit/formal/psdb/gui/controls/ListGoalView.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/PlaceHolderTab.fxml
...rces/edu/kit/formal/psdb/gui/controls/PlaceHolderTab.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/ProofTree.fxml
...resources/edu/kit/formal/psdb/gui/controls/ProofTree.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/ScriptAreaContextMenu.fxml
...u/kit/formal/psdb/gui/controls/ScriptAreaContextMenu.fxml
+2
-2
src/main/resources/edu/kit/formal/psdb/gui/controls/ScriptTabPane.fxml
...urces/edu/kit/formal/psdb/gui/controls/ScriptTabPane.fxml
+1
-1
src/main/resources/edu/kit/formal/psdb/gui/controls/SectionPane.fxml
...sources/edu/kit/formal/psdb/gui/controls/SectionPane.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/controls/TacletContextMenu.fxml
...s/edu/kit/formal/psdb/gui/controls/TacletContextMenu.fxml
+2
-2
src/main/resources/edu/kit/formal/psdb/gui/controls/WelcomePane.fxml
...sources/edu/kit/formal/psdb/gui/controls/WelcomePane.fxml
+0
-0
src/main/resources/edu/kit/formal/psdb/gui/intro.html
src/main/resources/edu/kit/formal/psdb/gui/intro.html
+0
-0
src/main/resources/edu/kit/formal/psdb/lint/lint-issues-en.xml
...ain/resources/edu/kit/formal/psdb/lint/lint-issues-en.xml
+0
-0
src/test/java/edu/kit/formal/proofscriptparser/EvalTest.java
src/test/java/edu/kit/formal/proofscriptparser/EvalTest.java
+0
-85
src/test/java/edu/kit/formal/proofscriptparser/lint/LinterTest.java
...ava/edu/kit/formal/proofscriptparser/lint/LinterTest.java
+0
-49
src/test/java/edu/kit/formal/psdb/interpreter/ControlFlowVisitorTest.java
...u/kit/formal/psdb/interpreter/ControlFlowVisitorTest.java
+7
-7
src/test/java/edu/kit/formal/psdb/interpreter/EvaluatorTest.java
...t/java/edu/kit/formal/psdb/interpreter/EvaluatorTest.java
+7
-7
src/test/java/edu/kit/formal/psdb/interpreter/ExecuteTest.java
...est/java/edu/kit/formal/psdb/interpreter/ExecuteTest.java
+3
-3
src/test/java/edu/kit/formal/psdb/interpreter/InterpreterTest.java
...java/edu/kit/formal/psdb/interpreter/InterpreterTest.java
+13
-13
src/test/java/edu/kit/formal/psdb/interpreter/KeYInterpreterTest.java
...a/edu/kit/formal/psdb/interpreter/KeYInterpreterTest.java
+5
-5
src/test/java/edu/kit/formal/psdb/interpreter/KeyMatcherDerivableTest.java
.../kit/formal/psdb/interpreter/KeyMatcherDerivableTest.java
+4
-4
src/test/java/edu/kit/formal/psdb/interpreter/MatchEvaluatorTest.java
...a/edu/kit/formal/psdb/interpreter/MatchEvaluatorTest.java
+8
-8
src/test/java/edu/kit/formal/psdb/interpreter/VariableAssignmentTest.java
...u/kit/formal/psdb/interpreter/VariableAssignmentTest.java
+4
-4
src/test/java/edu/kit/formal/psdb/lint/LintProblemTest.java
src/test/java/edu/kit/formal/psdb/lint/LintProblemTest.java
+1
-1
src/test/java/edu/kit/formal/psdb/parser/ASTTest.java
src/test/java/edu/kit/formal/psdb/parser/ASTTest.java
+2
-2
src/test/java/edu/kit/formal/psdb/parser/BadExpressionTest.java
...st/java/edu/kit/formal/psdb/parser/BadExpressionTest.java
+1
-1
src/test/java/edu/kit/formal/psdb/parser/BadlyTypedExpression.java
...java/edu/kit/formal/psdb/parser/BadlyTypedExpression.java
+2
-2
src/test/java/edu/kit/formal/psdb/parser/EqualsTest.java
src/test/java/edu/kit/formal/psdb/parser/EqualsTest.java
+4
-4
src/test/java/edu/kit/formal/psdb/parser/GoodExpressionTest.java
...t/java/edu/kit/formal/psdb/parser/GoodExpressionTest.java
+5
-5
src/test/java/edu/kit/formal/psdb/parser/ScriptTest.java
src/test/java/edu/kit/formal/psdb/parser/ScriptTest.java
+2
-3
src/test/java/edu/kit/formal/psdb/parser/TestHelper.java
src/test/java/edu/kit/formal/psdb/parser/TestHelper.java
+2
-2
src/test/java/edu/kit/formal/psdb/termmatcher/MatcherFacadeTest.java
...va/edu/kit/formal/psdb/termmatcher/MatcherFacadeTest.java
+82
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/auto.kps
...s/edu/kit/formal/psdb/interpreter/contraposition/auto.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/contraposition.key
...formal/psdb/interpreter/contraposition/contraposition.key
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/isClosable.kps
...kit/formal/psdb/interpreter/contraposition/isClosable.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/recursion.kps
.../kit/formal/psdb/interpreter/contraposition/recursion.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/test.kps
...s/edu/kit/formal/psdb/interpreter/contraposition/test.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/testIsClosable.kps
...formal/psdb/interpreter/contraposition/testIsClosable.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/w_branching.kps
...it/formal/psdb/interpreter/contraposition/w_branching.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/contraposition/wo_branching.kps
...t/formal/psdb/interpreter/contraposition/wo_branching.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/dbg.kps
src/test/resources/edu/kit/formal/psdb/interpreter/dbg.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/includetest.kps
...resources/edu/kit/formal/psdb/interpreter/includetest.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/javaExample/Test.java
...ces/edu/kit/formal/psdb/interpreter/javaExample/Test.java
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/javaExample/TwoWaySwap.java
...u/kit/formal/psdb/interpreter/javaExample/TwoWaySwap.java
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/javaExample/test.kps
...rces/edu/kit/formal/psdb/interpreter/javaExample/test.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/javaExample/testIsClosable.kps
...it/formal/psdb/interpreter/javaExample/testIsClosable.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/lib/test.kps
...st/resources/edu/kit/formal/psdb/interpreter/lib/test.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/paperExample/Simple.java
.../edu/kit/formal/psdb/interpreter/paperExample/Simple.java
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/paperExample/script.kps
...s/edu/kit/formal/psdb/interpreter/paperExample/script.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/paperExample/test.kps
...ces/edu/kit/formal/psdb/interpreter/paperExample/test.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/paperExample/test2.kps
...es/edu/kit/formal/psdb/interpreter/paperExample/test2.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/simple1.txt
...est/resources/edu/kit/formal/psdb/interpreter/simple1.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/interpreter/testSimple2.txt
...resources/edu/kit/formal/psdb/interpreter/testSimple2.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/lint/lint1.kps
src/test/resources/edu/kit/formal/psdb/lint/lint1.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/lint/lint2.kps
src/test/resources/edu/kit/formal/psdb/lint/lint2.kps
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/badexpr.txt
src/test/resources/edu/kit/formal/psdb/parser/badexpr.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/badlytypedexpr.txt
...t/resources/edu/kit/formal/psdb/parser/badlytypedexpr.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/derivable_test_1.key
...resources/edu/kit/formal/psdb/parser/derivable_test_1.key
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/eval.txt
src/test/resources/edu/kit/formal/psdb/parser/eval.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/goodexpr.txt
src/test/resources/edu/kit/formal/psdb/parser/goodexpr.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/allstmts.txt
...resources/edu/kit/formal/psdb/parser/scripts/allstmts.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/assignment.txt
...sources/edu/kit/formal/psdb/parser/scripts/assignment.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/cases.txt
...st/resources/edu/kit/formal/psdb/parser/scripts/cases.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/emptyscript.txt
...ources/edu/kit/formal/psdb/parser/scripts/emptyscript.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/fullcases.txt
...esources/edu/kit/formal/psdb/parser/scripts/fullcases.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/justarithmetic.txt
...ces/edu/kit/formal/psdb/parser/scripts/justarithmetic.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/parser/scripts/repeat.txt
...t/resources/edu/kit/formal/psdb/parser/scripts/repeat.txt
+0
-0
src/test/resources/edu/kit/formal/psdb/termmatcher/goodmatches.txt
...resources/edu/kit/formal/psdb/termmatcher/goodmatches.txt
+2
-0
src/test/resources/edu/kit/formal/psdb/termmatcher/test.key
src/test/resources/edu/kit/formal/psdb/termmatcher/test.key
+34
-0
No files found.
pom.xml
View file @
f3c061d8
...
...
@@ -129,7 +129,7 @@
</executions>
<configuration>
<!-- The package of your generated sources -->
<packageName>
edu.kit.formal.p
roofscriptparser
.lint
</packageName>
<packageName>
edu.kit.formal.p
sdb
.lint
</packageName>
</configuration>
</plugin>
...
...
@@ -207,7 +207,7 @@
<transformer
implementation=
"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"
>
<mainClass>
edu.kit.formal.gui.ProofScriptDebugger
edu.kit.formal.
psdb.
gui.ProofScriptDebugger
</mainClass>
</transformer>
</transformers>
...
...
src/main/antlr4/edu/kit/formal/p
roofscript
parser/ScriptLanguage.g4
→
src/main/antlr4/edu/kit/formal/p
sdb/
parser/ScriptLanguage.g4
View file @
f3c061d8
File moved
src/main/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
0 → 100644
View file @
f3c061d8
grammar MatchPattern;
/* Examples for testing
f(x)
f(x,y,g(y))
X
?Y
_
...
f(... ?X ...)
f(..., ?X)
f(..., ...?X...)
f(..., ... g(x) ...)
f(_, x, _, y, ... y ...)
*/
termPattern :
DONTCARE #dontCare
//| STARDONTCARE #starDontCare
| SID #schemaVar
| STARDONTCARE termPattern STARDONTCARE #anywhere
| func=ID ( '(' termPattern (',' termPattern)* ')')? #function
;
/*
f(x), f(x,y,g(y)), X, ?Y, _, ..., f(... ?X ...), f(..., ?X), f(..., ...?X...), f(..., ... g(x) ...), f(_, x, _, y, ... y ...)
*/
semiSeqPattern : termPattern (',' termPattern)*;
sequentPattern : semiSeqPattern? ARROW semiSeqPattern?;
ARROW : '⇒' | '==>';
DONTCARE: '?' | '_' | '█';
STARDONTCARE: '...' | '…';
DIGITS : DIGIT+ ;
fragment DIGIT : [0-9] ;
SID: '?' [_a-zA-Z0-9\\]+ ;
ID : [a-zA-Z\\_] ([_a-zA-Z0-9\\])* ;
COMMENT: '//' ~[\n\r]* -> channel(HIDDEN);
WS: [\n\f\r\t ] -> channel(HIDDEN);
\ No newline at end of file
src/main/antlr4/edu/kit/formal/termmatcher/MatchPattern.g4
deleted
100644 → 0
View file @
a8d6499c
grammar MatchPattern;
schemaTerm :
'_'
|'...'
| schemaVar
| logicalVar
| functionSymbol ('('schemaTerm (',' schemaTerm)? ')')?
;
termHelper :
schemaTerm
| functionSymbol '('termHelper (',' termHelper)? ')'
;
functionSymbol :
ID+
;
schemaVar:
'?'ID+
;
logicalVar:
ID+
;
DIGITS : DIGIT+ ;
fragment DIGIT : [0-9] ;
ID : [a-zA-Z] ([_a-zA-Z0-9] | '.' | '\\' | '[]' | '-')* ;
\ No newline at end of file
src/main/java/edu/kit/formal/proofscriptparser/lint/checkers/IssuesId.java
deleted
100644 → 0
View file @
a8d6499c
package
edu
.
kit
.
formal
.
proofscriptparser
.
lint
.
checkers
;
/**
* Should correspond to <code>issues-list-en.xml</code>
*
* @author Alexander Weigl
* @version 1 (23.05.17)
*/
public
enum
IssuesId
{
EMPTY_BLOCKS
,
EQUAL_SCRIPT_NAMES
,
NEGATED_MATCH_WITH_USING
,
SUCC_SAME_BLOCK
,
FOREACH_AFTER_THEONLY
,
REDECLARE_VARIABLE
,
REDECLARE_VARIABLE_TYPE_MISMATCH
,
VARIABLE_NOT_DECLARED
,
VARIABLE_NOT_USED
,
THEONLY_AFTER_FOREACH
}
src/main/java/edu/kit/formal/proofscriptparser/lint/checkers/NegatedMatchWithUsing.java
deleted
100644 → 0
View file @
a8d6499c
package
edu
.
kit
.
formal
.
proofscriptparser
.
lint
.
checkers
;
import
edu.kit.formal.proofscriptparser.ast.MatchExpression
;
import
edu.kit.formal.proofscriptparser.ast.UnaryExpression
;
import
edu.kit.formal.proofscriptparser.lint.Issue
;
import
edu.kit.formal.proofscriptparser.lint.IssuesRepository
;
/**
* @author Alexander Weigl
* @version 1 (23.05.17)
*/
public
class
NegatedMatchWithUsing
extends
AbstractLintRule
{
private
static
Issue
ISSUE
=
IssuesRepository
.
getIssue
(
IssuesId
.
NEGATED_MATCH_WITH_USING
);
public
NegatedMatchWithUsing
()
{
super
(
NMWUSearcher:
:
new
);
}
static
class
NMWUSearcher
extends
Searcher
{
@Override
public
Void
visit
(
UnaryExpression
ue
)
{
if
(
ue
.
getExpression
()
instanceof
MatchExpression
)
{
MatchExpression
me
=
(
MatchExpression
)
ue
.
getExpression
();
if
(
me
.
getSignature
()
!=
null
&&
me
.
getSignature
().
size
()
>
0
)
{
problem
(
ISSUE
,
ue
,
me
);
}
}
return
super
.
visit
(
ue
);
}
}
}
src/main/java/edu/kit/formal/gui/ProofScriptDebugger.java
→
src/main/java/edu/kit/formal/
psdb/
gui/ProofScriptDebugger.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
;
package
edu
.
kit
.
formal
.
psdb
.
gui
;
/**
* Main Entry for Debugger GUI
...
...
@@ -17,7 +17,6 @@ import org.apache.logging.log4j.LogManager;
import
org.apache.logging.log4j.Logger
;
import
org.dockfx.DockNode
;
import
java.io.IOException
;
import
java.util.Locale
;
public
class
ProofScriptDebugger
extends
Application
{
...
...
@@ -36,9 +35,9 @@ public class ProofScriptDebugger extends Application {
Locale
.
setDefault
(
Locale
.
ENGLISH
);
try
{
FXMLLoader
fxmlLoader
=
new
FXMLLoader
(
getClass
().
getResource
(
"/DebuggerMain.fxml"
));
FXMLLoader
fxmlLoader
=
new
FXMLLoader
(
getClass
().
getResource
(
"/
edu/kit/formal/psdb/gui/controller/
DebuggerMain.fxml"
));
Parent
root
=
fxmlLoader
.
load
();
//DebuggerMain
WindowController controller = fxmlLoader.<DebuggerMainWindowController
>getController();
//DebuggerMain
controller = fxmlLoader.<DebuggerMain
>getController();
Scene
scene
=
new
Scene
(
root
);
primaryStage
.
setOnCloseRequest
(
event
->
Platform
.
exit
());
scene
.
getStylesheets
().
addAll
(
...
...
src/main/java/edu/kit/formal/gui/controller/ContractChooser.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controller/ContractChooser.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controller
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controller
;
import
de.uka.ilkd.key.java.Services
;
import
de.uka.ilkd.key.speclang.Contract
;
import
javafx.beans.property.ObjectProperty
;
import
javafx.beans.property.SimpleListProperty
;
import
javafx.collections.ObservableList
;
import
javafx.event.EventHandler
;
import
javafx.scene.control.*
;
import
javafx.scene.layout.VBox
;
import
javafx.stage.Modality
;
import
lombok.Getter
;
import
java.awt.event.KeyEvent
;
import
java.util.List
;
/**
...
...
src/main/java/edu/kit/formal/
gui/controller/DebuggerMainWindowController
.java
→
src/main/java/edu/kit/formal/
psdb/gui/controller/DebuggerMain
.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controller
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controller
;
import
de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon
;
import
de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView
;
import
de.uka.ilkd.key.api.ProofApi
;
import
de.uka.ilkd.key.proof.init.ProofInputException
;
import
de.uka.ilkd.key.speclang.Contract
;
import
edu.kit.formal.gui.ProofScriptDebugger
;
import
edu.kit.formal.gui.controls.*
;
import
edu.kit.formal.gui.model.InspectionModel
;
import
edu.kit.formal.interpreter.Interpreter
;
import
edu.kit.formal.interpreter.InterpreterBuilder
;
import
edu.kit.formal.interpreter.KeYProofFacade
;
import
edu.kit.formal.interpreter.data.KeyData
;
import
edu.kit.formal.interpreter.graphs.PTreeNode
;
import
edu.kit.formal.interpreter.graphs.ProofTreeController
;
import
edu.kit.formal.p
roofscript
parser.ast.ProofScript
;
import
edu.kit.formal.
psdb.
gui.ProofScriptDebugger
;
import
edu.kit.formal.
psdb.
gui.controls.*
;
import
edu.kit.formal.
psdb.
gui.model.InspectionModel
;
import
edu.kit.formal.
psdb.
interpreter.Interpreter
;
import
edu.kit.formal.
psdb.
interpreter.InterpreterBuilder
;
import
edu.kit.formal.
psdb.
interpreter.KeYProofFacade
;
import
edu.kit.formal.
psdb.
interpreter.data.KeyData
;
import
edu.kit.formal.
psdb.
interpreter.graphs.PTreeNode
;
import
edu.kit.formal.
psdb.
interpreter.graphs.ProofTreeController
;
import
edu.kit.formal.p
sdb.
parser.ast.ProofScript
;
import
javafx.beans.property.*
;
import
javafx.beans.value.ChangeListener
;
import
javafx.beans.value.ObservableBooleanValue
;
...
...
@@ -52,9 +52,9 @@ import java.util.concurrent.Executors;
* @author S.Grebing
* @author Alexander Weigl
*/
public
class
DebuggerMain
WindowController
implements
Initializable
{
public
class
DebuggerMain
implements
Initializable
{
public
static
final
KeYProofFacade
FACADE
=
new
KeYProofFacade
();
protected
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
DebuggerMain
WindowController
.
class
);
protected
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
DebuggerMain
.
class
);
public
final
ContractLoaderService
contractLoaderService
=
new
ContractLoaderService
();
private
final
ProofTreeController
proofTreeController
=
new
ProofTreeController
();
private
final
InspectionViewsController
inspectionViewsController
=
new
InspectionViewsController
();
...
...
@@ -494,12 +494,12 @@ public class DebuggerMainWindowController implements Initializable {
}
public
void
stepOver
(
ActionEvent
actionEvent
)
{
LOGGER
.
debug
(
"DebuggerMain
WindowController
.stepOver"
);
LOGGER
.
debug
(
"DebuggerMain.stepOver"
);
PTreeNode
newState
=
proofTreeController
.
stepOver
();
}
public
void
stepBack
(
ActionEvent
actionEvent
)
{
LOGGER
.
debug
(
"DebuggerMain
WindowController
.stepBack"
);
LOGGER
.
debug
(
"DebuggerMain.stepBack"
);
PTreeNode
newState
=
proofTreeController
.
stepBack
();
}
...
...
src/main/java/edu/kit/formal/gui/controller/Events.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controller/Events.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controller
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controller
;
import
com.google.common.eventbus.EventBus
;
import
de.uka.ilkd.key.logic.PosInOccurrence
;
import
de.uka.ilkd.key.rule.TacletApp
;
import
edu.kit.formal.gui.controls.ScriptArea
;
import
edu.kit.formal.p
roofscript
parser.ast.CallStatement
;
import
edu.kit.formal.
psdb.
gui.controls.ScriptArea
;
import
edu.kit.formal.p
sdb.
parser.ast.CallStatement
;
import
lombok.Data
;
import
lombok.RequiredArgsConstructor
;
...
...
src/main/java/edu/kit/formal/gui/controller/PuppetMaster.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controller/PuppetMaster.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controller
;
import
edu.kit.formal.interpreter.HistoryListener
;
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.p
roofscript
parser.DefaultASTVisitor
;
import
edu.kit.formal.p
roofscript
parser.Visitor
;
import
edu.kit.formal.p
roofscript
parser.ast.*
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controller
;
import
edu.kit.formal.
psdb.
interpreter.HistoryListener
;
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.p
sdb.
parser.DefaultASTVisitor
;
import
edu.kit.formal.p
sdb.
parser.Visitor
;
import
edu.kit.formal.p
sdb.
parser.ast.*
;
import
javafx.application.Platform
;
import
javafx.beans.property.SimpleObjectProperty
;
...
...
src/main/java/edu/kit/formal/gui/controls/ANTLR4LexerHighlighter.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/ANTLR4LexerHighlighter.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
org.antlr.v4.runtime.Lexer
;
import
org.antlr.v4.runtime.Token
;
...
...
src/main/java/edu/kit/formal/gui/controls/BaseCodeArea.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/BaseCodeArea.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
javafx.beans.property.BooleanProperty
;
import
javafx.beans.property.MapProperty
;
...
...
src/main/java/edu/kit/formal/gui/controls/CustomTabPaneSkin.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/CustomTabPaneSkin.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
com.sun.javafx.scene.control.skin.TabPaneSkin
;
import
javafx.scene.Node
;
...
...
src/main/java/edu/kit/formal/gui/controls/DebuggerStatusBar.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/DebuggerStatusBar.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
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.MainScriptIdentifier
;
import
javafx.beans.property.*
;
import
javafx.beans.value.ObservableStringValue
;
import
javafx.collections.FXCollections
;
import
javafx.collections.ObservableList
;
import
javafx.event.ActionEvent
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
edu.kit.formal.psdb.gui.controller.Events
;
import
edu.kit.formal.psdb.gui.model.MainScriptIdentifier
;
import
javafx.beans.property.ObjectProperty
;
import
javafx.beans.property.SimpleObjectProperty
;
import
javafx.event.EventHandler
;
import
javafx.scene.control.*
;
import
javafx.scene.input.MouseButton
;
import
javafx.scene.control.Control
;
import
javafx.scene.control.Label
;
import
javafx.scene.control.ProgressIndicator
;
import
javafx.scene.input.MouseEvent
;
import
javafx.scene.layout.BorderPane
;
import
javafx.stage.Modality
;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.core.Appender
;
import
org.apache.logging.log4j.core.LogEvent
;
import
org.apache.logging.log4j.core.appender.AbstractAppender
;
import
org.apache.logging.log4j.core.layout.PatternLayout
;
import
org.controlsfx.control.StatusBar
;
import
java.util.Date
;
import
java.util.LinkedList
;
/**
* Created by weigl on 09.06.2017.
* Created on 09.06.2017
*
* @author Alexander Weigl
*/
public
class
DebuggerStatusBar
extends
StatusBar
{
private
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
DebuggerStatusBar
.
class
);
private
final
Appender
loggerHandler
=
createAppender
();
private
final
ContextMenu
contextMenu
=
createContextMenu
();
//private final Dialog<Void> loggerDialog = createDialog();
//private final ContextMenu contextMenu = createContextMenu();
//private final Appender loggerHandler = createAppender();
//private LogCatchHandlerFX logCatchHandler = new LogCatchHandlerFX();
private
ObjectProperty
<
MainScriptIdentifier
>
mainScriptIdentifier
=
new
SimpleObjectProperty
<>();
private
Label
lblCurrentNodes
=
new
Label
(
"#nodes: %s"
);
private
Label
lblMainscript
=
new
Label
();
private
ProgressIndicator
progressIndicator
=
new
ProgressIndicator
();
private
LogCatchHandlerFX
logCatchHandler
=
new
LogCatchHandlerFX
();
private
final
Dialog
<
Void
>
loggerDialog
=
createDialog
();
private
EventHandler
<
MouseEvent
>
toolTipHandler
=
event
->
{
publishMessage
(((
Control
)
event
.
getTarget
()).
getTooltip
().
getText
());
};
public
DebuggerStatusBar
()
{
listenOnField
(
"psdbg"
);
//
listenOnField("psdbg");
getRightItems
().
addAll
(
lblMainscript
,
...
...
@@ -53,11 +42,11 @@ public class DebuggerStatusBar extends StatusBar {
progressIndicator
);
setOnMouseClicked
(
event
->
{
/*
setOnMouseClicked(event -> {
if (event.getButton() == MouseButton.SECONDARY) {
contextMenu.show(this, event.getScreenX(), event.getScreenY());
}
});
});
*/
mainScriptIdentifier
.
addListener
((
ov
,
o
,
n
)
->
{
...
...
@@ -84,9 +73,9 @@ public class DebuggerStatusBar extends StatusBar {
Events
.
fire
(
new
Events
.
FocusScriptArea
(
area
));
}
});
}
/*
private Appender createAppender() {
PatternLayout layout = PatternLayout.createDefaultLayout();
return new AbstractAppender("", null, layout) {
...
...
@@ -95,7 +84,7 @@ public class DebuggerStatusBar extends StatusBar {
publishMessage(event.getMessage().getFormattedMessage());
}
};
}
}
*/
public
void
publishMessage
(
String
format
,
Object
...
args
)
{
String
msg
=
String
.
format
(
format
,
args
);
...
...
@@ -106,22 +95,24 @@ public class DebuggerStatusBar extends StatusBar {
return
toolTipHandler
;
}
/*
public void listenOnField(ObservableStringValue value) {
value.addListener((observable, oldValue, newValue) -> {
publishMessage(newValue);
});
}
}
*/
/*
public void listenOnField(Logger logger) {
org.apache.logging.log4j.core.Logger plogger = ((org.apache.logging.log4j.core.Logger) logger); // Bypassing the public API
plogger.addAppender(loggerHandler);
plogger.addAppender(logCatchHandler);
logger.info("Listener added");
}
}
*/
public
void
listenOnField
(
String
loggerCategory
)
{
/*
public void listenOnField(String loggerCategory) {
listenOnField(LogManager.getLogger(loggerCategory));
}
}
*/
public
void
indicateProgress
()
{
progressIndicator
.
setProgress
(-
1
);
...
...
@@ -131,14 +122,14 @@ public class DebuggerStatusBar extends StatusBar {
progressIndicator
.
setProgress
(
100
);
}
public
ContextMenu
createContextMenu
()
{
/*
public ContextMenu createContextMenu() {
ContextMenu cm = new ContextMenu();
Menu viewOptions = new Menu("View Options");
MenuItem showLog = new MenuItem("Show Log", new MaterialDesignIconView(MaterialDesignIcon.FORMAT_LIST_BULLETED));
showLog.setOnAction(this::showLog);
cm.getItems().addAll(viewOptions, showLog);
return cm;
}
}
*/
public
MainScriptIdentifier
getMainScriptIdentifier
()
{
return
mainScriptIdentifier
.
get
();
...
...
@@ -151,12 +142,14 @@ public class DebuggerStatusBar extends StatusBar {
public
ObjectProperty
<
MainScriptIdentifier
>
mainScriptIdentifierProperty
()
{
return
mainScriptIdentifier
;
}
}
/*
private void showLog(ActionEvent actionEvent) {
loggerDialog.show();
}
}
*/
public
Dialog
<
Void
>
createDialog
()
{
/*
public Dialog<Void> createDialog() {
final TableView<LogEvent> recordView = new TableView<>(logCatchHandler.recordsProperty());
recordView.setEditable(false);
recordView.setSortPolicy(param -> false);
...
...
@@ -180,30 +173,21 @@ public class DebuggerStatusBar extends StatusBar {
messageColumn.setCellValueFactory(
param -> {
return new SimpleStringProperty(param.getValue().getMessage().getFormattedMessage());
/*String s = formatter.formatMessage(param.getValue());
if (param.getValue().getThrown() != null) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
pw.println();
param.getValue().getThrown().printStackTrace(pw);
pw.close();
s += "\n" + sw.toString();
}
return new SimpleStringProperty(s);*/
}
}
);
Dialog
<
Void
>
dialog
=
new
Dialog
<>();
Dialog<Void> dialog=
new Dialog<>();
dialog.setResizable(true);
dialog.initModality(Modality.NONE);
dialog.setHeaderText("Logger Records");
DialogPane
dpane
=
dialog
.
getDialogPane
();
DialogPane dpane
=
dialog.getDialogPane();
dpane.setContent(new BorderPane(recordView));
dpane.getButtonTypes().setAll(ButtonType.CLOSE);
return dialog;
}
}*/
/*
public static class LogCatchHandlerFX extends AbstractAppender {
private ListProperty<LogEvent> records = new SimpleListProperty<>(FXCollections.observableList(
new LinkedList<>() //remove of head
...
...
@@ -243,6 +227,6 @@ public class DebuggerStatusBar extends StatusBar {
this.maxRecords = maxRecords;
}
}
}
}*/
src/main/java/edu/kit/formal/gui/controls/GoalOptionsMenu.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/GoalOptionsMenu.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
com.google.common.collect.BiMap
;
import
com.google.common.collect.HashBiMap
;
import
edu.kit.formal.interpreter.data.KeyData
;
import
edu.kit.formal.
psdb.
interpreter.data.KeyData
;
import
javafx.beans.property.ObjectProperty
;
import
javafx.beans.property.SimpleObjectProperty
;
import
javafx.fxml.FXML
;
...
...
src/main/java/edu/kit/formal/gui/controls/InspectionView.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/InspectionView.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
edu.kit.formal.gui.model.InspectionModel
;
import
edu.kit.formal.interpreter.data.GoalNode
;
import
edu.kit.formal.interpreter.data.KeyData
;
import
edu.kit.formal.
psdb.
gui.model.InspectionModel
;
import
edu.kit.formal.
psdb.
interpreter.data.GoalNode
;
import
edu.kit.formal.
psdb.
interpreter.data.KeyData
;
import
javafx.beans.Observable
;
import
javafx.beans.property.ReadOnlyObjectProperty
;
import
javafx.beans.property.SimpleObjectProperty
;
...
...
src/main/java/edu/kit/formal/gui/controls/InspectionViewsController.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/InspectionViewsController.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
javafx.beans.property.SimpleMapProperty
;
import
javafx.collections.FXCollections
;
...
...
@@ -8,7 +8,7 @@ import org.dockfx.DockNode;
/**
* This controller manages a list of {@link InspectionView} and the associated {@link DockNode}s.
*
* Espeically, this class holds the active tab, which is connected with the {@link edu.kit.formal.interpreter.graphs.ProofTreeController},
* Espeically, this class holds the active tab, which is connected with the {@link edu.kit.formal.
psdb.
interpreter.graphs.ProofTreeController},
* and shows the current interpreter state.
*
* @author weigl
...
...
src/main/java/edu/kit/formal/gui/controls/JavaArea.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/JavaArea.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
antlrgrammars.Java8Lexer
;
import
javafx.beans.property.SimpleSetProperty
;
...
...
src/main/java/edu/kit/formal/gui/controls/LineMapping.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/LineMapping.java
View file @
f3c061d8
package
edu
.
kit
.
formal
.
gui
.
controls
;
package
edu
.
kit
.
formal
.
psdb
.
gui
.
controls
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
src/main/java/edu/kit/formal/gui/controls/PlaceHolderTab.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/PlaceHolderTab.java
View file @
f3c061d8
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
;
/**
...
...
src/main/java/edu/kit/formal/gui/controls/ProofTree.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/ProofTree.java
View file @
f3c061d8
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
;
...
...
src/main/java/edu/kit/formal/gui/controls/ScriptArea.java
→
src/main/java/edu/kit/formal/
psdb/
gui/controls/ScriptArea.java
View file @
f3c061d8
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.p
roofscript
parser.Facade
;
import
edu.kit.formal.p
roofscript
parser.ScriptLanguageLexer
;
import
edu.kit.formal.p
roofscript
parser.ast.*
;
import
edu.kit.formal.p
roofscriptparser
.lint.LintProblem
;