Skip to content

Commit 3aa5e54

Browse files
committed
Basic grammer: reformat MessagePart, define msg datatype as [datatype]
1 parent ae1b0b4 commit 3aa5e54

1 file changed

Lines changed: 18 additions & 16 deletions

File tree

  • plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/Basics.xtext

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ DateTime0 returns type::DateTime:
197197
//MESSAGE PRIMITIVES DEFINITION
198198
///////////////////
199199
MessagePart returns primitives::MessagePart:
200-
Type = AbstractType
201-
Data =(KEYWORD | MESSAGE_ASIGMENT | EString)
200+
Data =(KEYWORD | MESSAGE_ASIGMENT | EString)':' Type = AbstractType
202201
;
203202

204203
terminal MESSAGE_ASIGMENT:
@@ -288,66 +287,66 @@ duration returns primitives::duration:
288287

289288
boolArray returns primitives::boolArray:
290289
{primitives::boolArray}
291-
'bool[]'
290+
'[bool]'
292291
;
293292

294293
int8Array returns primitives::int8Array:
295294
{primitives::int8Array}
296-
'int8[]'
295+
'[int8]'
297296
;
298297

299298
uint8Array returns primitives::uint8Array:
300299
{primitives::uint8Array}
301-
'uint8[]'
300+
'[uint8]'
302301
;
303302

304303
int16Array returns primitives::int16Array:
305304
{primitives::int16Array}
306-
'int16[]'
305+
'[int16]'
307306
;
308307

309308
uint16Array returns primitives::uint16Array:
310309
{primitives::uint16Array}
311-
'uint16[]'
310+
'[uint16]'
312311
;
313312

314313
int32Array returns primitives::int32Array:
315314
{primitives::int32Array}
316-
'int32[]'
315+
'[int32]'
317316
;
318317

319318
uint32Array returns primitives::uint32Array:
320319
{primitives::uint32Array}
321-
'uint32[]'
320+
'[uint32]'
322321
;
323322

324323
int64Array returns primitives::int64Array:
325324
{primitives::int64Array}
326-
'int64[]'
325+
'[int64]'
327326
;
328327

329328
uint64Array returns primitives::uint64Array:
330329
{primitives::uint64Array}
331-
'uint64[]'
330+
'[uint64]'
332331
;
333332

334333
float32Array returns primitives::float32Array:
335334
{primitives::float32Array}
336-
'float32[]'
335+
'[float32]'
337336
;
338337

339338
float64Array returns primitives::float64Array:
340339
{primitives::float64Array}
341-
'float64[]'
340+
'[float64]'
342341
;
343342

344343
string0Array returns primitives::stringArray:
345344
{primitives::stringArray}
346-
'string[]'
345+
'[string]'
347346
;
348347
byteArray returns primitives::ByteArray:
349348
{primitives::ByteArray}
350-
'byte[]'
349+
'[byte]'
351350
;
352351

353352
Header returns primitives::Header:
@@ -360,7 +359,7 @@ TopicSpecRef returns TopicSpecRef:
360359
;
361360

362361
ArrayTopicSpecRef returns ArrayTopicSpecRef:
363-
TopicSpec=[TopicSpec|EString]'[]'
362+
'['TopicSpec=[TopicSpec|EString]']'
364363
;
365364

366365
KEYWORD: 'goal' | 'message' | 'result' | 'feedback' | 'name' | 'value' | 'service' | 'type' | 'action' | 'duration' | 'time' ;
@@ -384,6 +383,9 @@ RosNames returns ecore::EString:
384383
ROS_CONVENTION_A | ID | 'node'
385384
;
386385

386+
PreListElement hidden(SL_COMMENT):
387+
'-';
388+
387389
terminal ROS_CONVENTION_A:
388390
( ('/' ID ) | ( ID '/' ) )* ;
389391

0 commit comments

Comments
 (0)