Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 113562 Details for
Bug 242153
[parser] Modification to support IMP and exploit LPG 2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
ManuallyTrimmed Patch wrt Ganymede Source
242153.patch (text/plain), 10.44 KB, created by
Ed Willink
on 2008-09-26 03:17:33 EDT
(
hide
)
Description:
ManuallyTrimmed Patch wrt Ganymede Source
Filename:
MIME Type:
Creator:
Ed Willink
Created:
2008-09-26 03:17:33 EDT
Size:
10.44 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.ocl >Index: src/org/eclipse/ocl/lpg/AbstractLexer.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractLexer.java,v >retrieving revision 1.1 >diff -u -r1.1 AbstractLexer.java >--- src/org/eclipse/ocl/lpg/AbstractLexer.java 11 Oct 2007 23:04:53 -0000 1.1 >+++ src/org/eclipse/ocl/lpg/AbstractLexer.java 26 Sep 2008 07:09:32 -0000 >@@ -99,6 +99,8 @@ > public BasicEnvironment getEnvironment() { > return environment; > } >+ >+ public abstract int [] getKeywordKinds(); > > public void lexToTokens(AbstractParser parser) { > lexToTokens(null, parser); >Index: src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java,v >retrieving revision 1.3 >diff -u -r1.3 AbstractBasicEnvironment.java >--- src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java 6 Nov 2007 20:02:10 -0000 1.3 >+++ src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java 26 Sep 2008 07:09:31 -0000 >@@ -172,6 +172,7 @@ > public void initASTMapping(Object astNode, CSTNode cstNode) { > if ((astNode != null) && (cstNode != null)) { > CSTNode oldCSTNode = getASTNodeToCSTNodeMap().put(astNode, cstNode); >+ cstNode.setAstNode(astNode); > if (oldCSTNode != null && OCLPlugin.shouldTrace(OCLDebugOptions.PARSING)) { > OCLPlugin.trace("Displaced " + oldCSTNode); //$NON-NLS-1$ > } >Index: src/org/eclipse/ocl/lpg/LexerTemplateD.g >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/LexerTemplateD.g,v >retrieving revision 1.1 >diff -u -r1.1 LexerTemplateD.g >--- src/org/eclipse/ocl/lpg/LexerTemplateD.g 11 Oct 2007 23:04:53 -0000 1.1 >+++ src/org/eclipse/ocl/lpg/LexerTemplateD.g 26 Sep 2008 07:09:32 -0000 >@@ -169,13 +169,17 @@ > return oclEnvironment; > } > >+ @Override > public int [] getKeywordKinds() { return kwLexer.getKeywordKinds(); } >+ > public int getLeftSpan() { return lexParser.getFirstToken(); } > public $prs_stream_class getParser() { return parser; } > public int getRhsFirstTokenIndex(int i) { return lexParser.getFirstToken(i); } > public int getRhsLastTokenIndex(int i) { return lexParser.getLastToken(i); } > public int getRightSpan() { return lexParser.getLastToken(); } >- @Override public int getToken(int i) { return lexParser.getToken(i); } >+ >+ @Override >+ public int getToken(int i) { return lexParser.getToken(i); } > > @Override > public void initialize(char [] content, String filename) >Index: src/org/eclipse/ocl/lpg/AbstractParser.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java,v >retrieving revision 1.2 >diff -u -r1.2 AbstractParser.java >--- src/org/eclipse/ocl/lpg/AbstractParser.java 6 Nov 2007 19:49:00 -0000 1.2 >+++ src/org/eclipse/ocl/lpg/AbstractParser.java 26 Sep 2008 07:09:32 -0000 >@@ -127,8 +127,8 @@ > * @param startEnd <code>IToken</code> to retrieve offsets from > */ > protected void setOffsets(CSTNode cstNode, IToken startEnd) { >- cstNode.setStartOffset(startEnd.getStartOffset()); >- cstNode.setEndOffset(startEnd.getEndOffset()); >+ cstNode.setStartToken(startEnd); >+ cstNode.setEndToken(startEnd); > } > > /** >@@ -139,8 +139,8 @@ > * @param startEnd <code>CSTNode</code> to retrieve offsets from > */ > protected void setOffsets(CSTNode cstNode, CSTNode startEnd) { >- cstNode.setStartOffset(startEnd.getStartOffset()); >- cstNode.setEndOffset(startEnd.getEndOffset()); >+ cstNode.setStartToken(startEnd.getStartToken()); >+ cstNode.setEndToken(startEnd.getEndToken()); > } > > /** >@@ -153,8 +153,8 @@ > * @param end <code>CSTNode</code> to retrieve end offset from > */ > protected void setOffsets(CSTNode cstNode, CSTNode start, CSTNode end) { >- cstNode.setStartOffset(start.getStartOffset()); >- cstNode.setEndOffset(end.getEndOffset()); >+ cstNode.setStartToken(start.getStartToken()); >+ cstNode.setEndToken(end.getEndToken()); > } > > /** >@@ -167,8 +167,8 @@ > * @param end <code>IToken</code> to retrieve end offset from > */ > protected void setOffsets(CSTNode cstNode, CSTNode start, IToken end) { >- cstNode.setStartOffset(start.getStartOffset()); >- cstNode.setEndOffset(end.getEndOffset()); >+ cstNode.setStartToken(start.getStartToken()); >+ cstNode.setEndToken(end); > } > > /** >@@ -181,8 +181,8 @@ > * @param end <code>CSTNode</code> to retrieve end offset from > */ > protected void setOffsets(CSTNode cstNode, IToken start, CSTNode end) { >- cstNode.setStartOffset(start.getStartOffset()); >- cstNode.setEndOffset(end.getEndOffset()); >+ cstNode.setStartToken(start); >+ cstNode.setEndToken(end.getEndToken()); > } > > /** >@@ -195,8 +195,8 @@ > * @param end <code>IToken</code> to retrieve end offset from > */ > protected void setOffsets(CSTNode cstNode, IToken start, IToken end) { >- cstNode.setStartOffset(start.getStartOffset()); >- cstNode.setEndOffset(end.getEndOffset()); >+ cstNode.setStartToken(start); >+ cstNode.setEndToken(end); > } > > /** >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/plugin.xml,v >retrieving revision 1.3 >diff -u -r1.3 plugin.xml >--- plugin.xml 21 Feb 2008 14:43:00 -0000 1.3 >+++ plugin.xml 26 Sep 2008 07:09:31 -0000 >@@ -32,4 +32,11 @@ > genModel = "model/OCL.genmodel" /> > </extension> > >+ <extension point="org.eclipse.emf.ecore.generated_package"> >+ <package >+ uri = "http://www.eclipse.org/ocl/1.1.0/OCL/CST" >+ class = "org.eclipse.ocl.cst.CSTPackage" >+ genModel = "model/OCLCST.genmodel" /> >+ </extension> >+ > </plugin> > > >Index: src/org/eclipse/ocl/parser/EssentialOCL.g >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.g,v >retrieving revision 1.3 >diff -u -r1.3 EssentialOCL.g >--- src/org/eclipse/ocl/parser/EssentialOCL.g 3 Apr 2008 13:00:10 -0000 1.3 >+++ src/org/eclipse/ocl/parser/EssentialOCL.g 26 Sep 2008 07:09:36 -0000 >@@ -170,8 +170,8 @@ > */ > protected void setOffsets(CSTNode cstNode) { > IToken firstToken = getIToken($getToken(1)); >- cstNode.setStartOffset(firstToken.getStartOffset()); >- cstNode.setEndOffset(firstToken.getEndOffset()-1); >+ cstNode.setStartToken(firstToken); >+ cstNode.setEndToken(firstToken); > } > ./ > $End >@@ -798,12 +798,15 @@ > String simpleName = text.substring(index + 1); > > // create the IntegerLiteralExpCS >- int startOffset = getIToken($getToken(1)).getStartOffset(); >+ IToken numericToken = getIToken($getToken(1)); >+ int startOffset = numericToken.getStartOffset(); > int endOffset = startOffset + integer.length() - 1; // inclusive > > IntegerLiteralExpCS integerLiteralExpCS = createIntegerLiteralExpCS(integer); >- integerLiteralExpCS.setStartOffset(startOffset); >- integerLiteralExpCS.setEndOffset(endOffset); >+// integerLiteralExpCS.setStartOffset(startOffset); >+// integerLiteralExpCS.setEndOffset(endOffset); >+ integerLiteralExpCS.setStartToken(numericToken); >+ integerLiteralExpCS.setEndToken(numericToken); > > startOffset = endOffset + 2; // end of integerLiteral + 1('.') + 1(start of simpleName) > endOffset = getIToken($getToken(1)).getEndOffset(); >@@ -813,8 +816,10 @@ > SimpleTypeEnum.IDENTIFIER_LITERAL, > simpleName > ); >- simpleNameCS.setStartOffset(startOffset); >- simpleNameCS.setEndOffset(endOffset); >+// simpleNameCS.setStartOffset(startOffset); >+// simpleNameCS.setEndOffset(endOffset); >+ simpleNameCS.setStartToken(numericToken); >+ simpleNameCS.setEndToken(numericToken); > > // create the OperationCallExpCS > CSTNode result = createOperationCallExpCS( >Index: model/OCLCST.ecore >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/model/OCLCST.ecore,v >retrieving revision 1.5 >diff -u -r1.5 OCLCST.ecore >--- model/OCLCST.ecore 3 Dec 2007 18:44:41 -0000 1.5 >+++ model/OCLCST.ecore 26 Sep 2008 07:09:31 -0000 >@@ -5,8 +5,12 @@ > nsURI="http://www.eclipse.org/ocl/1.1.0/OCLCST" nsPrefix="ocl"> > <eSubpackages name="cst" nsURI="http://www.eclipse.org/ocl/1.1.0/OCL/CST" nsPrefix="ocl.cst"> > <eClassifiers xsi:type="ecore:EClass" name="CSTNode" abstract="true"> >- <eStructuralFeatures xsi:type="ecore:EAttribute" name="startOffset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> >- <eStructuralFeatures xsi:type="ecore:EAttribute" name="endOffset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> >+ <eOperations name="getEndOffset" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> >+ <eOperations name="getStartOffset" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="startToken" eType="#//cst/IToken"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="endToken" eType="#//cst/IToken"/> >+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="astNode" eType="#//cst/Object" >+ transient="true"/> > </eClassifiers> > <eClassifiers xsi:type="ecore:EClass" name="PackageDeclarationCS" eSuperTypes="#//cst/CSTNode"> > <eStructuralFeatures xsi:type="ecore:EReference" name="pathNameCS" eType="#//cst/PathNameCS" >@@ -300,5 +303,7 @@ > <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceOfNames" upperBound="-1" > eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> > </eClassifiers> >+ <eClassifiers xsi:type="ecore:EDataType" name="IToken" instanceClassName="lpg.lpgjavaruntime.IToken"/> >+ <eClassifiers xsi:type="ecore:EDataType" name="Object" instanceClassName="java.lang.Object"/> > </eSubpackages> > </ecore:EPackage>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 242153
: 113562 |
144433
|
144559
|
144561
|
146213
|
146215
|
146307
|
146308
|
146322
|
146527
|
146557
|
154939
|
154947
|
155049
|
155227
|
155269