[Parser] Refactoring MDT-OCL grammars to remove the use of deprecated macros

[eclipse-ocl-bot]

| --- | --- | | Bugzilla Link | 300534 | | Status | CLOSED FIXED | | Importance | P3 normal | | Reported | Jan 22, 2010 13:46 EDT | | Modified | May 27, 2011 02:54 EDT | | Version | 1.3.0 | | Reporter | Adolfo Sanchez-Barbudo Herrera |

Description

The new LPG template/include files introduced in the Bug 299396, discourage the use of some macros commonly used in LPGv1.x grammars such as, $getIToken, $result, etc.

This should be changed in the current MDT-OCL grammars.

Patch coming soon.

[eclipse-ocl-bot]

By Adolfo Sanchez-Barbudo Herrera on Jan 22, 2010 15:32

Created attachment 156994 Proposed fixing patch

Hi all,

Firstly:

• When committing, some new templates were erroneously modified by CVS to introduce the CVS info inside the template, because of the following macro "$header$case". I have fixed the templates in this patch. However, I'm suspecting that when committing the templates again, the CVS info will also be included. Splitting $header$case into $header and $case simple doesn't work. Any additional idea ?. Maybe the problem only arises when they are new files....

About the patch, the macros have been successfully replaced. Additionally:

• The old getIToken($getToken(i)) is simplified as getRhsIToken(i)
• Similarly I have included a new getRhsTokenText in the grammar file, so that getTokenText($getToken(i)) may be replaced by a simple function.
• Both, getIToken and getTokenText have been deprecated, and some comments have been added to explain the new way of use.
• I've detected a bug in EssentialOCLErrors.gi::TupleLiteralExpCS, in which an erroneous RhsTokenIndex was passed to the reportErrorToken function.

Have a nice weekend, Adolfo

:notepad_spiral: ocl300534_FixingGrammarMacros.patch

[eclipse-ocl-bot]

By Ed Willink on Jan 24, 2010 12:03

The $ substitution properties can be fixed by:

For now: In the Synchronize View

->Change ASCII/Binary Property.. and select ASCII without keyword expansion. Better: Change the spelling of $Header$ Better: Specify a different $ character. --- Otherwise looks fine.

[eclipse-ocl-bot]

By Adolfo Sanchez-Barbudo Herrera on Jan 25, 2010 06:20

Ed,

I have tried your solution, and it works. Thanks.

About specifying a different escape symbol. & could be a candidate since it is not used in EssentialOCL and OCLParser grammars. The point is that the templates would also need to be changed. Extending grammars would also need to react to the new escape symbol.

I'm wondering if this subtle issue related to CVS should make us change all these files....

Regards,\ Adolfo.

[eclipse-ocl-bot]

By Adolfo Sanchez-Barbudo Herrera on Jan 25, 2010 06:34

Ed, Sergey,

Committed to HEAD.

P.S: Sergey, In principle this patch should be compatible to QVTo. However, I recommend changing the QVTo grammars in the same way the MDT-OCL ones have been changed.

Assigning to myself and resolving as fixed.

[eclipse-ocl-bot]

By Adolfo Sanchez-Barbudo Herrera on Jan 25, 2010 07:12

Resolving as fixed >.<

[eclipse-ocl-bot]

By Ed Willink on May 27, 2011 02:54

Closing