Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CUP Eclipse Plugin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Schwarz
CUP Eclipse Plugin
Commits
15d50333
Commit
15d50333
authored
Feb 23, 2016
by
Michael Schwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
further steps in implementing RR + bugify is SR resolution is sarted
with assoc
parent
3eef45a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
...gin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
+8
-6
CupPlugin/src/de/tum/in/www2/cupplugin/views/PrecedenceToInsert.java
...rc/de/tum/in/www2/cupplugin/views/PrecedenceToInsert.java
+1
-1
No files found.
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
View file @
15d50333
...
...
@@ -430,8 +430,13 @@ class ConflictPanel extends Composite {
changeColors
(
backgroundColorAffected
,
foregroundColorAffected
);
resolutionButton
.
setEnabled
(
false
);
// Switch depending on the dynamic type of s
markAffected
(
s
);
// Switch depending on the dynamic type of s is no option
if
(
s
instanceof
PrecedenceToInsert
){
markAffected
((
PrecedenceToInsert
)
s
);
}
else
{
markAffected
((
ReordersToDo
)
s
);
}
return
true
;
}
else
{
...
...
@@ -447,9 +452,6 @@ class ConflictPanel extends Composite {
}
}
private
void
markAffected
(
ResolutionStrategy
s
){
throw
new
IllegalArgumentException
(
"expected precedence or reorder"
);
}
private
void
markAffected
(
PrecedenceToInsert
pti
){
if
(
pti
.
isResolvedInFavorOfReduce
(
srdetails
)){
...
...
@@ -751,7 +753,7 @@ class ConflictPanel extends Composite {
}
if
(
conflict
instanceof
ShiftReduceConflict
){
resolutionBoxSelectedSR
();
}
else
{
...
...
CupPlugin/src/de/tum/in/www2/cupplugin/views/PrecedenceToInsert.java
View file @
15d50333
...
...
@@ -159,7 +159,7 @@ class PrecedenceToInsert extends GraphHelper<terminal> implements ResolutionStra
addedHigher
=
true
;
}
if
(
originalEdge
.
getFirst
().
equals
(
higher
)){
if
(
originalEdge
!=
null
&&
originalEdge
.
getFirst
()
!=
null
&&
originalEdge
.
getFirst
().
equals
(
higher
)){
// We know the for original edge u->v that u is present since u == higher
// This is a guarantee for cyclic but we let the algorithm run anyway in order to give the user
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment