-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix xtext grammar and reference node in process #194
base: main
Are you sure you want to change the base?
Conversation
…; uncapitalize index
@ipa-rwu Thanks a lot for the PR and the changes. Good job! Comments:
Your examples are quite different -> https://github.com/ipa-nhg/ros-model-examples/pull/8/files#diff-94d4e10765013b88643ad70600a187b9035d5103d84c8c1428eb2476947a1114 I will cherry pick the changes that are fine for now and create new separate PRs to discuss the others. |
Cherry-pick HotFix changes from #194
; | ||
|
||
RosParameter returns RosParameter: | ||
Name=EString':' | ||
PreListElement name=EString':' from=[ros::Parameter|EString] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PreListElement was defined in another commit, I will remove it from here. This commit is about uncapitalize the definition of the attributes
END | ||
; | ||
|
||
ComponentRef returns ComponentRef: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not needed if the metamodel is correctly defined, see: d1ce353#r113516155
END | ||
name=EString':' | ||
BEGIN | ||
('nodes:' '['nodes+=ComponentRef (',' nodes+=ComponentRef)+']')? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be simplified to:
nodes+=[RosNode| EString]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The grammar is wrong, this implementation doesn't allow a process with a single node. It should be:
('nodes:' '['nodes+=ComponentRef (',' nodes+=ComponentRef)*']')?
@@ -72,44 +73,43 @@ Artifact returns Artifact: | |||
|
|||
Node returns Node: | |||
'node:' name=RosNames | |||
BEGIN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
was this "BEGIN" removed intentionally? why?
The interfaces should be defined under the node.
f84a682
to
c9fb502
Compare
39190a9
to
5837d31
Compare
Exmaple can be fund here: ipa-nhg/ros-model-examples#8