Attachment 155227 Details for Bug 242153 – Fixing BacktrackingParser patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fixing BacktrackingParser patch

ocl242153_OCLBacktrackingFix.patch (text/plain), 6.12 KB, created by Adolfo Sanchez-Barbudo Herrera

on 2010-01-04 08:06:41 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Adolfo Sanchez-Barbudo Herrera

Created: 2010-01-04 08:06:41 EST

Size: 6.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ocl
>Index: src/org/eclipse/ocl/OCL.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCL.java,v
>retrieving revision 1.12
>diff -u -r1.12 OCL.java
>--- src/org/eclipse/ocl/OCL.java	23 Oct 2009 21:06:56 -0000	1.12
>+++ src/org/eclipse/ocl/OCL.java	4 Jan 2010 12:56:30 -0000
>@@ -259,7 +259,7 @@
> 	 */
> 	public OCLAnalyzer<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> createAnalyzer(String input) {
> 		OCLAnalyzer<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> analyzer;
>-		if (parserRepairCount > 0) {
>+		if (parserRepairCount != 0) {
> 			OCLBacktrackingLexer lexer = new OCLBacktrackingLexer(
> 				rootEnvironment, input.toCharArray());
> 			OCLBacktrackingParser parser = new OCLBacktrackingParser(lexer);
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF,v
>retrieving revision 1.20
>diff -u -r1.20 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Dec 2009 15:49:52 -0000	1.20
>+++ META-INF/MANIFEST.MF	4 Jan 2010 12:56:30 -0000
>@@ -33,7 +33,7 @@
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
>  org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
>- lpg.runtime.java;bundle-version="2.0.17";visibility:=reexport
>+ lpg.runtime.java;bundle-version="[2.0.17,3.0.0)";visibility:=reexport
> Bundle-Activator: org.eclipse.ocl.internal.OCLPlugin$Implementation
> Eclipse-LazyStart: true
> Bundle-ActivationPolicy: lazy
>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.7
>diff -u -r1.7 AbstractParser.java
>--- src/org/eclipse/ocl/lpg/AbstractParser.java	27 Dec 2009 15:49:50 -0000	1.7
>+++ src/org/eclipse/ocl/lpg/AbstractParser.java	4 Jan 2010 12:56:31 -0000
>@@ -276,19 +276,16 @@
> 	 * performing repairs (the BacktrackingParser) unless overridden on the
> 	 * specific parser invocation method.
> 	 * 
>+     * When repair count is 0, no Error token recoveries occur.
>+     * When repair count is > 0, it limits the number of Error token recoveries.
>+     * When repair count is < 0, the number of error token recoveries is unlimited.
>+     * 
> 	 * @param defaultRepairCount
> 	 *            the default repair count
> 	 * 
>-	 * @throws IllegalArgumentException
>-	 *             if the <tt>defaultRepairCount</tt> is negative
>-	 * 
> 	 * @since 1.3
> 	 */
> 	public void setDefaultRepairCount(int defaultRepairCount) {
>-		if (defaultRepairCount < 0) {
>-			throw new IllegalArgumentException("negative default repair count"); //$NON-NLS-1$
>-		}
>-
> 		this.defaultRepairCount = defaultRepairCount;
> 	}
> 
>Index: src/org/eclipse/ocl/parser/EssentialOCL.gi
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.gi,v
>retrieving revision 1.2
>diff -u -r1.2 EssentialOCL.gi
>--- src/org/eclipse/ocl/parser/EssentialOCL.gi	27 Dec 2009 15:49:46 -0000	1.2
>+++ src/org/eclipse/ocl/parser/EssentialOCL.gi	4 Jan 2010 12:56:32 -0000
>@@ -27,6 +27,7 @@
>     $prs_parser_class /.DeterministicParser./
>     $prs_parser_exception /.NotDeterministicParseTableException./
>     $prs_parser_throw /.throw new RuntimeException("****Error: Regenerate $prs_type.java with -NOBACKTRACK option")./
>+    $prs_parse_call /.parse./
>     $prs_parse_args /../
>     $lex_stream_class /.AbstractLexer./
>     $action_class /.$file_prefix./
>@@ -156,7 +157,7 @@
>             }
> 
>             try {
>-                return ($ast_type) dtParser.parse($prs_parse_args);
>+                return ($ast_type) dtParser.$prs_parse_call($prs_parse_args);
>             }
>             catch (BadParseException e) {
>                 reset(e.error_token); // point to error token
>Index: src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g,v
>retrieving revision 1.3
>diff -u -r1.3 OCLBacktrackingParser.g
>--- src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g	27 Dec 2009 15:49:48 -0000	1.3
>+++ src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g	4 Jan 2010 12:56:32 -0000
>@@ -55,5 +55,6 @@
> 	$prs_parser_class /.BacktrackingParser./
> 	$prs_parser_exception /.NotBacktrackParseTableException./
> 	$prs_parser_throw /.throw new RuntimeException("****Error: Regenerate $prs_type.java with -BACKTRACK option")./
>+	$prs_parses_call /.fuzzyParse./
> 	$prs_parse_args /.error_repair_count./
> %End
>#P org.eclipse.ocl.ecore.tests
>Index: src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.ocl/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 ParserBacktrackingTest.java
>--- src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java	15 Oct 2009 19:46:28 -0000	1.1
>+++ src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java	4 Jan 2010 12:56:34 -0000
>@@ -159,7 +159,7 @@
> 		AbstractBasicEnvironment abstractBasicEnvironment = (AbstractBasicEnvironment)environment;
> 		OCLBacktrackingLexer lexer = new OCLBacktrackingLexer(environment, oclText.toCharArray());
> 		OCLBacktrackingParser parser = new OCLBacktrackingParser(lexer);
>-		parser.setDefaultRepairCount(10);
>+		parser.setDefaultRepairCount(-1);
> 		MyProblemHandler problemHandler = new MyProblemHandler(parser, oclText, failure);
> 		abstractBasicEnvironment.setProblemHandler(problemHandler);
> 		try {

Actions: View | Diff

Attachments on bug 242153: 113562 | 144433 | 144559 | 144561 | 146213 | 146215 | 146307 | 146308 | 146322 | 146527 | 146557 | 154939 | 154947 | 155049 | 155227 | 155269