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
Dr. Michael Petter
CUP Eclipse Plugin
Commits
96575236
Commit
96575236
authored
Dec 01, 2014
by
Johannes Roith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the conflicting states ...
parent
ae6aaf7d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
CupParser/src/de/in/tum/www2/cup/internal/lalr_state.java
CupParser/src/de/in/tum/www2/cup/internal/lalr_state.java
+3
-2
No files found.
CupParser/src/de/in/tum/www2/cup/internal/lalr_state.java
View file @
96575236
...
...
@@ -886,9 +886,10 @@ public class lalr_state {
shift_sym
=
itm
.
symbol_after_dot
();
if
(!
shift_sym
.
is_non_term
()
&&
shift_sym
.
index
()
==
conflict_sym
)
{
/* yes, report on it */
conflictingItems
.
add
(
itm
);
/* yes, report on it */
message
+=
" and "
+
itm
.
to_simple_string
()+
"\n"
;
}
}
}
}
terminal
.
terminal_shared
shared
=
terminal
.
getShared
(
context
);
...
...
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