Attachment 73893 Details for Bug 196249 – Proposed fix

[patch] Proposed fix

patch_196249.txt (text/plain), 15.84 KB, created by Olivier Thomann

on 2007-07-16 16:00:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-07-16 16:00:44 EDT

Size: 15.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java,v
>retrieving revision 1.67
>diff -u -r1.67 AbstractCommentParser.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java	27 Apr 2007 15:51:39 -0000	1.67
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java	16 Jul 2007 20:01:26 -0000
>@@ -683,90 +683,27 @@
> 		boolean tokenWhiteSpace = this.scanner.tokenizeWhiteSpace;
> 		this.scanner.tokenizeWhiteSpace = true;
> 		
>-		// Verify that there are whitespaces after tag
>-		boolean isCompletionParser = (this.kind & COMPLETION_PARSER) != 0;
>-		if (this.scanner.currentCharacter != ' ' && !ScannerHelper.isWhitespace(this.scanner.currentCharacter)) {
>-			if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidTag(start, this.scanner.getCurrentTokenEndPosition());
>-			if (!isCompletionParser) {
>-				this.scanner.currentPosition = start;
>-				this.index = start;
>-			}
>-			this.currentTokenType = -1;
>-			this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
>-			return false;
>-		}
>-		
>-		// Get first non whitespace token
>-		this.identifierPtr = -1;
>-		this.identifierLengthPtr = -1;
>-		boolean hasMultiLines = this.scanner.currentPosition > (this.lineEnd+1);
>-		boolean isTypeParam = false;
>-		boolean valid = true, empty = true;
>-		boolean mayBeGeneric = this.sourceLevel >= ClassFileConstants.JDK1_5;
>-		int token = -1;
>-		nextToken: while (true) {
>-			this.currentTokenType = -1;
>-			try {
>-				token = readToken();
>-			} catch (InvalidInputException e) {
>-				valid = false;
>-			}
>-			switch (token) {
>-				case TerminalTokens.TokenNameIdentifier :
>-					if (valid) { 
>-						// store param name id
>-						pushIdentifier(true, false);
>-						start = this.scanner.getCurrentTokenStartPosition();
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						break nextToken;
>-					}
>-					// fall through next case to report error
>-				case TerminalTokens.TokenNameLESS:
>-					if (valid && mayBeGeneric) {
>-						// store '<' in identifiers stack as we need to add it to tag element (bug 79809)
>-						pushIdentifier(true, true);
>-						start = this.scanner.getCurrentTokenStartPosition();
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						isTypeParam = true;
>-						break nextToken;
>-					}
>-					// fall through next case to report error
>-				default:
>-					if (token == TerminalTokens.TokenNameLEFT_SHIFT) isTypeParam = true;
>-					if (valid && !hasMultiLines) start = this.scanner.getCurrentTokenStartPosition();
>-					valid = false;
>-					if (!hasMultiLines) {
>-						empty = false;
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						break;
>-					}
>-					end = this.lineEnd;
>-					// when several lines, fall through next case to report problem immediately
>-				case TerminalTokens.TokenNameWHITESPACE:
>-					if (this.scanner.currentPosition > (this.lineEnd+1)) hasMultiLines = true;
>-					if (valid) break;
>-					// if not valid fall through next case to report error
>-				case TerminalTokens.TokenNameEOF:
>-					if (this.reportProblems)
>-						if (empty)
>-							this.sourceParser.problemReporter().javadocMissingParamName(start, end, this.sourceParser.modifiers);
>-						else if (mayBeGeneric && isTypeParam)
>-							this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>-						else
>-							this.sourceParser.problemReporter().javadocInvalidParamTagName(start, end);
>-					if (!isCompletionParser) {
>-						this.scanner.currentPosition = start;
>-						this.index = start;
>-					}
>-					this.currentTokenType = -1;
>-					this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
>-					return false;
>+		try {
>+			// Verify that there are whitespaces after tag
>+			boolean isCompletionParser = (this.kind & COMPLETION_PARSER) != 0;
>+			if (this.scanner.currentCharacter != ' ' && !ScannerHelper.isWhitespace(this.scanner.currentCharacter)) {
>+				if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidTag(start, this.scanner.getCurrentTokenEndPosition());
>+				if (!isCompletionParser) {
>+					this.scanner.currentPosition = start;
>+					this.index = start;
>+				}
>+				this.currentTokenType = -1;
>+				return false;
> 			}
>-		}
>-		
>-		// Scan more tokens for type parameter declaration
>-		if (isTypeParam && mayBeGeneric) {
>-			// Get type parameter name
>+			
>+			// Get first non whitespace token
>+			this.identifierPtr = -1;
>+			this.identifierLengthPtr = -1;
>+			boolean hasMultiLines = this.scanner.currentPosition > (this.lineEnd+1);
>+			boolean isTypeParam = false;
>+			boolean valid = true, empty = true;
>+			boolean mayBeGeneric = this.sourceLevel >= ClassFileConstants.JDK1_5;
>+			int token = -1;
> 			nextToken: while (true) {
> 				this.currentTokenType = -1;
> 				try {
>@@ -775,112 +712,173 @@
> 					valid = false;
> 				}
> 				switch (token) {
>+					case TerminalTokens.TokenNameIdentifier :
>+						if (valid) { 
>+							// store param name id
>+							pushIdentifier(true, false);
>+							start = this.scanner.getCurrentTokenStartPosition();
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							break nextToken;
>+						}
>+						// fall through next case to report error
>+					case TerminalTokens.TokenNameLESS:
>+						if (valid && mayBeGeneric) {
>+							// store '<' in identifiers stack as we need to add it to tag element (bug 79809)
>+							pushIdentifier(true, true);
>+							start = this.scanner.getCurrentTokenStartPosition();
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							isTypeParam = true;
>+							break nextToken;
>+						}
>+						// fall through next case to report error
>+					default:
>+						if (token == TerminalTokens.TokenNameLEFT_SHIFT) isTypeParam = true;
>+						if (valid && !hasMultiLines) start = this.scanner.getCurrentTokenStartPosition();
>+						valid = false;
>+						if (!hasMultiLines) {
>+							empty = false;
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							break;
>+						}
>+						end = this.lineEnd;
>+						// when several lines, fall through next case to report problem immediately
> 					case TerminalTokens.TokenNameWHITESPACE:
>-						if (valid && this.scanner.currentPosition <= (this.lineEnd+1)) break;
>+						if (this.scanner.currentPosition > (this.lineEnd+1)) hasMultiLines = true;
>+						if (valid) break;
> 						// if not valid fall through next case to report error
> 					case TerminalTokens.TokenNameEOF:
>-						if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>+						if (this.reportProblems)
>+							if (empty)
>+								this.sourceParser.problemReporter().javadocMissingParamName(start, end, this.sourceParser.modifiers);
>+							else if (mayBeGeneric && isTypeParam)
>+								this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>+							else
>+								this.sourceParser.problemReporter().javadocInvalidParamTagName(start, end);
> 						if (!isCompletionParser) {
> 							this.scanner.currentPosition = start;
> 							this.index = start;
> 						}
> 						this.currentTokenType = -1;
>-						this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
> 						return false;
>-					case TerminalTokens.TokenNameIdentifier :
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						if (valid) {
>-							// store param name id
>-							pushIdentifier(false, false);
>-							break nextToken;
>-						}
>-						break;
>-					default:
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+				}
>+			}
>+			
>+			// Scan more tokens for type parameter declaration
>+			if (isTypeParam && mayBeGeneric) {
>+				// Get type parameter name
>+				nextToken: while (true) {
>+					this.currentTokenType = -1;
>+					try {
>+						token = readToken();
>+					} catch (InvalidInputException e) {
>+						valid = false;
>+					}
>+					switch (token) {
>+						case TerminalTokens.TokenNameWHITESPACE:
>+							if (valid && this.scanner.currentPosition <= (this.lineEnd+1)) break;
>+							// if not valid fall through next case to report error
>+						case TerminalTokens.TokenNameEOF:
>+							if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>+							if (!isCompletionParser) {
>+								this.scanner.currentPosition = start;
>+								this.index = start;
>+							}
>+							this.currentTokenType = -1;
>+							return false;
>+						case TerminalTokens.TokenNameIdentifier :
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							if (valid) {
>+								// store param name id
>+								pushIdentifier(false, false);
>+								break nextToken;
>+							}
>+							break;
>+						default:
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							valid = false;
>+							break;
>+					}
>+				}
>+				
>+				// Get last character of type parameter declaration
>+				boolean spaces = false;
>+				nextToken: while (true) {
>+					this.currentTokenType = -1;
>+					try {
>+						token = readToken();
>+					} catch (InvalidInputException e) {
> 						valid = false;
>-						break;
>+					}
>+					switch (token) {
>+						case TerminalTokens.TokenNameWHITESPACE:
>+							if (this.scanner.currentPosition > (this.lineEnd+1)) {
>+								// do not accept type parameter declaration on several lines
>+								hasMultiLines = true;
>+								valid = false;
>+							}
>+							spaces = true;
>+							if (valid) break;
>+							// if not valid fall through next case to report error
>+						case TerminalTokens.TokenNameEOF:
>+							if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>+							if (!isCompletionParser) {
>+								this.scanner.currentPosition = start;
>+								this.index = start;
>+							}
>+							this.currentTokenType = -1;
>+							return false;
>+						case TerminalTokens.TokenNameGREATER:
>+							end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							if (valid) {
>+								// store '>' in identifiers stack as we need to add it to tag element (bug 79809)
>+								pushIdentifier(false, true);
>+								break nextToken;
>+							}
>+							break;
>+						default:
>+							if (!spaces) end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+							valid = false;
>+							break;
>+					}
> 				}
> 			}
> 			
>-			// Get last character of type parameter declaration
>-			boolean spaces = false;
>-			nextToken: while (true) {
>+			// Verify that tag name is well followed by white spaces
>+			if (valid) {
> 				this.currentTokenType = -1;
>+				int restart = this.scanner.currentPosition;
> 				try {
> 					token = readToken();
> 				} catch (InvalidInputException e) {
> 					valid = false;
> 				}
>-				switch (token) {
>-					case TerminalTokens.TokenNameWHITESPACE:
>-						if (this.scanner.currentPosition > (this.lineEnd+1)) {
>-							// do not accept type parameter declaration on several lines
>-							hasMultiLines = true;
>-							valid = false;
>-						}
>-						spaces = true;
>-						if (valid) break;
>-						// if not valid fall through next case to report error
>-					case TerminalTokens.TokenNameEOF:
>-						if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>-						if (!isCompletionParser) {
>-							this.scanner.currentPosition = start;
>-							this.index = start;
>-						}
>-						this.currentTokenType = -1;
>-						this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
>-						return false;
>-					case TerminalTokens.TokenNameGREATER:
>-						end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						if (valid) {
>-							// store '>' in identifiers stack as we need to add it to tag element (bug 79809)
>-							pushIdentifier(false, true);
>-							break nextToken;
>-						}
>-						break;
>-					default:
>-						if (!spaces) end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-						valid = false;
>-						break;
>+				if (token == TerminalTokens.TokenNameWHITESPACE) {
>+					this.scanner.currentPosition = restart;
>+					this.index = restart;
>+					return pushParamName(isTypeParam);
> 				}
> 			}
>-		}
>-		
>-		// Verify that tag name is well followed by white spaces
>-		if (valid) {
>+			// Report problem
> 			this.currentTokenType = -1;
>-			int restart = this.scanner.currentPosition;
>-			try {
>-				token = readToken();
>-			} catch (InvalidInputException e) {
>-				valid = false;
>-			}
>-			if (token == TerminalTokens.TokenNameWHITESPACE) {
>-				this.scanner.currentPosition = restart;
>-				this.index = restart;
>-				this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
>-				return pushParamName(isTypeParam);
>+			if (isCompletionParser) return false;
>+			end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+			while ((token=readToken()) != TerminalTokens.TokenNameWHITESPACE && token != TerminalTokens.TokenNameEOF) {
>+				this.currentTokenType = -1;
>+				end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
> 			}
>-		}
>-		
>-		// Report problem
>-		this.currentTokenType = -1;
>-		if (isCompletionParser) return false;
>-		end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>-		while ((token=readToken()) != TerminalTokens.TokenNameWHITESPACE && token != TerminalTokens.TokenNameEOF) {
>+			if (this.reportProblems)
>+				if (mayBeGeneric && isTypeParam)
>+					this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>+				else
>+					this.sourceParser.problemReporter().javadocInvalidParamTagName(start, end);
>+			this.scanner.currentPosition = start;
>+			this.index = start;
> 			this.currentTokenType = -1;
>-			end = hasMultiLines ? this.lineEnd: this.scanner.getCurrentTokenEndPosition();
>+			return false;
>+		} finally {
>+			// we have to make sure that this is reset to the previous value even if an exception occurs
>+			this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
> 		}
>-		if (this.reportProblems)
>-			if (mayBeGeneric && isTypeParam)
>-				this.sourceParser.problemReporter().javadocInvalidParamTypeParameter(start, end);
>-			else
>-				this.sourceParser.problemReporter().javadocInvalidParamTagName(start, end);
>-		this.scanner.currentPosition = start;
>-		this.index = start;
>-		this.currentTokenType = -1;
>-		this.scanner.tokenizeWhiteSpace = tokenWhiteSpace;
>-		return false;
> 	}
> 
> 	/*
>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.248
>diff -u -r1.248 ASTConverter.java
>--- dom/org/eclipse/jdt/core/dom/ASTConverter.java	25 Apr 2007 16:59:24 -0000	1.248
>+++ dom/org/eclipse/jdt/core/dom/ASTConverter.java	16 Jul 2007 20:01:27 -0000
>@@ -4310,6 +4310,7 @@
> 	 * @param bodyDeclaration
> 	 */
> 	protected void setModifiers(BodyDeclaration bodyDeclaration, org.eclipse.jdt.internal.compiler.ast.Annotation[] annotations) {
>+		this.scanner.tokenizeWhiteSpace = false;
> 		try {
> 			int token;
> 			int indexInAnnotations = 0;
>@@ -4372,8 +4373,7 @@
> 			// ignore
> 		}
> 	}
>-	
>-	
>+
> 	protected void setModifiers(EnumDeclaration enumDeclaration, org.eclipse.jdt.internal.compiler.ast.TypeDeclaration enumDeclaration2) {
> 		this.scanner.resetTo(enumDeclaration2.declarationSourceStart, enumDeclaration2.sourceStart);
> 		this.setModifiers(enumDeclaration, enumDeclaration2.annotations);

Actions: View | Diff

Attachments on bug 196249: 73682 | 73886 | 73887 | 73888 | 73893