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
bd40666b
Commit
bd40666b
authored
Feb 21, 2016
by
Michael Schwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ignoring of RR now after // ~~ CUP-ECLIPSE:CONFLICT-RES-RR ~~
parent
c70b49cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
.../src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
+17
-2
No files found.
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
View file @
bd40666b
...
...
@@ -56,9 +56,11 @@ import de.tum.in.www2.cupplugin.views.PrecedenceToInsert.PrecedenceCyclicExcepti
public
class
CupConflictsView
extends
FailableView
implements
ICupEditorPageVisibility
,
ICupParserLaLrChangeObserver
,
IRegisterForControllerChanges
{
private
static
final
int
OUTER_MARGIN
=
10
;
// TODO: share between panels.
private
static
final
int
OUTER_MARGIN
=
10
;
static
final
int
INNER_MARGIN
=
5
;
private
static
final
String
TRESHOLD_STRING
=
"~~ CUP-ECLIPSE:CONFLICT-RES-RR ~~ "
;
Jumper
jumper
;
private
CupTextEditor
editor
;
private
boolean
isVisible
;
...
...
@@ -525,7 +527,20 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
private
boolean
isIgnored
(
Conflict
c
){
if
(
c
instanceof
ReduceReduceConflict
){
ReduceReduceConflict
rrc
=
(
ReduceReduceConflict
)
c
;
int
treshold
=
200
;
IDocument
document
=
editor
.
getDocument
();
int
offset
=
document
.
get
().
indexOf
(
TRESHOLD_STRING
);
if
(
offset
==
-
1
){
return
false
;
}
int
treshold
;
try
{
treshold
=
document
.
getLineOfOffset
(
offset
)+
1
;
}
catch
(
BadLocationException
e
)
{
return
false
;
}
return
(
rrc
.
getConflictItem1
().
the_production
().
getAstNode
().
getEnd
().
getLine
()
>
treshold
)
&&
(
rrc
.
getConflictItem2
().
the_production
().
getAstNode
().
getEnd
().
getLine
()
>
treshold
);
...
...
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