Attachment 120174 Details for Bug 88626 – Proposed patch

[patch] Proposed patch

88626.txt (text/plain), 7.09 KB, created by Philipe Mulet

on 2008-12-11 06:00:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipe Mulet

Created: 2008-12-11 06:00:09 EST

Size: 7.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java,v
>retrieving revision 1.91
>diff -u -r1.91 QualifiedAllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	17 Sep 2008 11:11:09 -0000	1.91
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	11 Dec 2008 10:59:21 -0000
>@@ -109,9 +109,7 @@
> 			codeStream.dup();
> 		}
> 		// better highlight for allocation: display the type individually
>-		if (this.type != null) { // null for enum constant body
>-			codeStream.recordPositionsFrom(pc, this.type.sourceStart);
>-		} else {
>+		if (this.type == null) { // null for enum constant body
> 			// push enum constant name and ordinal
> 			codeStream.ldc(String.valueOf(this.enumConstant.name));
> 			codeStream.generateInlinedValue(this.enumConstant.binding.id);
>@@ -124,6 +122,8 @@
> 				enclosingInstance(),
> 				this);
> 		}
>+		codeStream.recordPositionsFrom(pc, this.type.sourceStart);
>+		
> 		// generate the arguments for constructor
> 		generateArguments(this.binding, this.arguments, currentScope, codeStream);
> 		// handling innerclass instance allocation - outer local arguments
>@@ -161,7 +161,7 @@
> 					codeStream.pop();
> 			}
> 		}
>-		codeStream.recordPositionsFrom(pc, this.sourceStart);
>+		codeStream.updateLastRecordedEndPC(currentScope, codeStream.position); // widen last attribute
> 
> 		if (this.anonymousType != null) {
> 			this.anonymousType.generateCode(currentScope, codeStream);
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java,v
>retrieving revision 1.76
>diff -u -r1.76 AllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	17 Sep 2008 11:11:09 -0000	1.76
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	11 Dec 2008 10:59:20 -0000
>@@ -88,9 +88,7 @@
> 		codeStream.dup();
> 	}
> 	// better highlight for allocation: display the type individually
>-	if (this.type != null) { // null for enum constant body
>-		codeStream.recordPositionsFrom(pc, this.type.sourceStart);
>-	} else {
>+	if (this.type == null) { // null for enum constant body
> 		// push enum constant name and ordinal
> 		codeStream.ldc(String.valueOf(this.enumConstant.name));
> 		codeStream.generateInlinedValue(this.enumConstant.binding.id);
>@@ -104,6 +102,8 @@
> 			enclosingInstance(),
> 			this);
> 	}
>+	codeStream.recordPositionsFrom(pc, this.sourceStart);
>+
> 	// generate the arguments for constructor
> 	generateArguments(this.binding, this.arguments, currentScope, codeStream);
> 	// handling innerclass instance allocation - outer local arguments
>@@ -140,7 +140,7 @@
> 				codeStream.pop();
> 		}
> 	}
>-	codeStream.recordPositionsFrom(pc, this.sourceStart);
>+	codeStream.updateLastRecordedEndPC(currentScope, codeStream.position); // widen last attribute
> }
> 
> /**
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java,v
>retrieving revision 1.68
>diff -u -r1.68 BinaryExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java	26 Nov 2008 17:56:55 -0000	1.68
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java	11 Dec 2008 10:59:20 -0000
>@@ -560,7 +560,7 @@
> 	if (valueRequired) {
> 		codeStream.generateImplicitConversion(this.implicitConversion);
> 	}
>-	codeStream.recordPositionsFrom(pc, this.sourceStart);
>+	codeStream.updateLastRecordedEndPC(currentScope, codeStream.position); // widen last attribute
> }
> 
> /**
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java,v
>retrieving revision 1.137
>diff -u -r1.137 MessageSend.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java	1 Oct 2008 22:27:55 -0000	1.137
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java	11 Dec 2008 10:59:21 -0000
>@@ -128,7 +128,6 @@
> 	boolean isStatic = codegenBinding.isStatic();
> 	if (isStatic) {
> 		this.receiver.generateCode(currentScope, codeStream, false);
>-		codeStream.recordPositionsFrom(pc, this.sourceStart);
> 	} else if ((this.bits & ASTNode.DepthMASK) != 0 && this.receiver.isImplicitThis()) { // outer access ?
> 		// outer method can be reached through emulation if implicit access
> 		ReferenceBinding targetType = currentScope.enclosingSourceType().enclosingTypeAt((this.bits & ASTNode.DepthMASK) >> ASTNode.DepthSHIFT);
>@@ -139,9 +138,8 @@
> 		if ((this.bits & NeedReceiverGenericCast) != 0) {
> 			codeStream.checkcast(this.actualReceiverType);
> 		}
>-		codeStream.recordPositionsFrom(pc, this.sourceStart);
>-
> 	}
>+	codeStream.recordPositionsFrom(pc, (int)(this.nameSourcePosition >>> 32)); // highlight selector
> 	// generate arguments
> 	generateArguments(this.binding, this.arguments, currentScope, codeStream);
> 
>@@ -182,7 +180,7 @@
> 				codeStream.pop();
> 		}
> 	}
>-	codeStream.recordPositionsFrom(pc, (int)(this.nameSourcePosition >>> 32)); // highlight selector
>+	codeStream.updateLastRecordedEndPC(currentScope, codeStream.position); // widen last attribute
> }
> /**
>  * @see org.eclipse.jdt.internal.compiler.lookup.InvocationSite#genericTypeArguments()
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java,v
>retrieving revision 1.67
>diff -u -r1.67 ExplicitConstructorCall.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java	17 Sep 2008 11:11:09 -0000	1.67
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java	11 Dec 2008 10:59:20 -0000
>@@ -131,6 +131,8 @@
> 					(this.bits & ASTNode.DiscardEnclosingInstance) != 0 ? null : this.qualification,
> 					this);
> 			}
>+			codeStream.recordPositionsFrom(pc, this.sourceStart);
>+
> 			// generate arguments
> 			generateArguments(this.binding, this.arguments, currentScope, codeStream);
> 
>@@ -153,7 +155,7 @@
> 			} else {
> 				codeStream.invoke(Opcodes.OPC_invokespecial, codegenBinding, null /* default declaringClass */);
> 			}
>-			codeStream.recordPositionsFrom(pc, this.sourceStart);
>+			codeStream.updateLastRecordedEndPC(currentScope, codeStream.position); // widen last attribute
> 		} finally {
> 			((MethodScope) currentScope).isConstructorCall = false;
> 		}

Actions: View | Diff

Attachments on bug 88626: 120174 | 120185