Attachment 43159 Details for Bug 144450 – Patch to log errors during the conversion

[patch] Patch to log errors during the conversion

patch_144450.txt (text/plain), 7.66 KB, created by Olivier Thomann

on 2006-05-31 15:37:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-05-31 15:37:45 EDT

Size: 7.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: dom/org/eclipse/jdt/core/dom/ASTConverter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java,v
>retrieving revision 1.239
>diff -u -r1.239 ASTConverter.java
>--- dom/org/eclipse/jdt/core/dom/ASTConverter.java	24 May 2006 15:52:49 -0000	1.239
>+++ dom/org/eclipse/jdt/core/dom/ASTConverter.java	31 May 2006 19:33:51 -0000
>@@ -50,6 +50,7 @@
> import org.eclipse.jdt.internal.compiler.parser.RecoveryScanner;
> import org.eclipse.jdt.internal.compiler.parser.Scanner;
> import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
>+import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>  * Internal class for converting internal compiler ASTs into public ASTs.
>@@ -1198,78 +1199,93 @@
> 	}
> 	
> 	public CompilationUnit convert(org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration unit, char[] source) {
>-		if(unit.compilationResult.recoveryScannerData != null) {
>-			RecoveryScanner recoveryScanner = new RecoveryScanner(this.scanner, unit.compilationResult.recoveryScannerData.removeUnused());
>-			this.scanner = recoveryScanner;
>-			this.docParser.scanner = this.scanner;
>-		}
>-		this.compilationUnitSource = source;
>-		this.compilationUnitSourceLength = source.length;
>-		this.scanner.setSource(source, unit.compilationResult);
> 		CompilationUnit compilationUnit = new CompilationUnit(this.ast);
>-
>-		// Parse comments
>-		int[][] comments = unit.comments;
>-		if (comments != null) {
>-			buildCommentsTable(compilationUnit, comments);
>-		}
>-
>-		// handle the package declaration immediately
>-		// There is no node corresponding to the package declaration
>-		if (this.resolveBindings) {
>-			recordNodes(compilationUnit, unit);
>-		}
>-		if (unit.currentPackage != null) {
>-			PackageDeclaration packageDeclaration = convertPackage(unit);
>-			compilationUnit.setPackage(packageDeclaration);
>-		}
>-		org.eclipse.jdt.internal.compiler.ast.ImportReference[] imports = unit.imports;
>-		if (imports != null) {
>-			int importLength = imports.length;
>-			for (int i = 0; i < importLength; i++) {
>-				compilationUnit.imports().add(convertImport(imports[i]));
>+		try {
>+			if(unit.compilationResult.recoveryScannerData != null) {
>+				RecoveryScanner recoveryScanner = new RecoveryScanner(this.scanner, unit.compilationResult.recoveryScannerData.removeUnused());
>+				this.scanner = recoveryScanner;
>+				this.docParser.scanner = this.scanner;
>+			}
>+			this.compilationUnitSource = source;
>+			this.compilationUnitSourceLength = source.length;
>+			this.scanner.setSource(source, unit.compilationResult);
>+	
>+			// Parse comments
>+			int[][] comments = unit.comments;
>+			if (comments != null) {
>+				buildCommentsTable(compilationUnit, comments);
> 			}
>-		}
>-
>-		org.eclipse.jdt.internal.compiler.ast.TypeDeclaration[] types = unit.types;
>-		if (types != null) {
>-			int typesLength = types.length;
>-			for (int i = 0; i < typesLength; i++) {
>-				org.eclipse.jdt.internal.compiler.ast.TypeDeclaration declaration = types[i];
>-				if (CharOperation.equals(declaration.name, TypeConstants.PACKAGE_INFO_NAME)) {
>-					continue;
>+	
>+			// handle the package declaration immediately
>+			// There is no node corresponding to the package declaration
>+			if (this.resolveBindings) {
>+				recordNodes(compilationUnit, unit);
>+			}
>+			if (unit.currentPackage != null) {
>+				PackageDeclaration packageDeclaration = convertPackage(unit);
>+				compilationUnit.setPackage(packageDeclaration);
>+			}
>+			org.eclipse.jdt.internal.compiler.ast.ImportReference[] imports = unit.imports;
>+			if (imports != null) {
>+				int importLength = imports.length;
>+				for (int i = 0; i < importLength; i++) {
>+					compilationUnit.imports().add(convertImport(imports[i]));
> 				}
>-				ASTNode type = convert(declaration);
>-				if (type == null) {
>-					compilationUnit.setFlags(compilationUnit.getFlags() | ASTNode.MALFORMED);
>+			}
>+	
>+			org.eclipse.jdt.internal.compiler.ast.TypeDeclaration[] types = unit.types;
>+			if (types != null) {
>+				int typesLength = types.length;
>+				for (int i = 0; i < typesLength; i++) {
>+					org.eclipse.jdt.internal.compiler.ast.TypeDeclaration declaration = types[i];
>+					if (CharOperation.equals(declaration.name, TypeConstants.PACKAGE_INFO_NAME)) {
>+						continue;
>+					}
>+					ASTNode type = convert(declaration);
>+					if (type == null) {
>+						compilationUnit.setFlags(compilationUnit.getFlags() | ASTNode.MALFORMED);
>+					} else {
>+						compilationUnit.types().add(type);
>+					}
>+				}
>+			}
>+			compilationUnit.setSourceRange(unit.sourceStart, unit.sourceEnd - unit.sourceStart  + 1);
>+			
>+			int problemLength = unit.compilationResult.problemCount;
>+			if (problemLength != 0) {
>+				CategorizedProblem[] resizedProblems = null;
>+				final CategorizedProblem[] problems = unit.compilationResult.getProblems();
>+				final int realProblemLength=problems.length;
>+				if (realProblemLength == problemLength) {
>+					resizedProblems = problems;
> 				} else {
>-					compilationUnit.types().add(type);
>+					System.arraycopy(problems, 0, (resizedProblems = new CategorizedProblem[realProblemLength]), 0, realProblemLength);
> 				}
>+				ASTSyntaxErrorPropagator syntaxErrorPropagator = new ASTSyntaxErrorPropagator(resizedProblems);
>+				compilationUnit.accept(syntaxErrorPropagator);
>+				ASTRecoveryPropagator recoveryPropagator =
>+					new ASTRecoveryPropagator(resizedProblems, unit.compilationResult.recoveryScannerData);
>+				compilationUnit.accept(recoveryPropagator);
>+				compilationUnit.setProblems(resizedProblems);
> 			}
>-		}
>-		compilationUnit.setSourceRange(unit.sourceStart, unit.sourceEnd - unit.sourceStart  + 1);
>-		
>-		int problemLength = unit.compilationResult.problemCount;
>-		if (problemLength != 0) {
>-			CategorizedProblem[] resizedProblems = null;
>-			final CategorizedProblem[] problems = unit.compilationResult.getProblems();
>-			final int realProblemLength=problems.length;
>-			if (realProblemLength == problemLength) {
>-				resizedProblems = problems;
>-			} else {
>-				System.arraycopy(problems, 0, (resizedProblems = new CategorizedProblem[realProblemLength]), 0, realProblemLength);
>+			if (this.resolveBindings) {
>+				lookupForScopes();
> 			}
>-			ASTSyntaxErrorPropagator syntaxErrorPropagator = new ASTSyntaxErrorPropagator(resizedProblems);
>-			compilationUnit.accept(syntaxErrorPropagator);
>-			ASTRecoveryPropagator recoveryPropagator =
>-				new ASTRecoveryPropagator(resizedProblems, unit.compilationResult.recoveryScannerData);
>-			compilationUnit.accept(recoveryPropagator);
>-			compilationUnit.setProblems(resizedProblems);
>-		}
>-		if (this.resolveBindings) {
>-			lookupForScopes();
>+			compilationUnit.initCommentMapper(this.scanner);
>+		} catch(RuntimeException e) {
>+			// avoid breaking other tools due to internal compiler failure (40334)
>+			StringBuffer message = new StringBuffer("Exception occurred during problem detection:");  //$NON-NLS-1$
>+			String lineDelimiter = Util.findLineSeparator(source);
>+			if (lineDelimiter == null) lineDelimiter = System.getProperty("line.separator");//$NON-NLS-1$
>+			message.append(lineDelimiter);
>+			message.append("----------------------------------- SOURCE BEGIN -------------------------------------"); //$NON-NLS-1$
>+			message.append(lineDelimiter);
>+			message.append(source);
>+			message.append(lineDelimiter);
>+			message.append("----------------------------------- SOURCE END -------------------------------------"); //$NON-NLS-1$
>+			Util.log(e, message.toString());
>+			throw e;
> 		}
>-		compilationUnit.initCommentMapper(this.scanner);
> 		return compilationUnit;
> 	}
>

Actions: View | Diff

Attachments on bug 144450: 43159