wasAcrv_0_128_01_(1_0_stream/candidate_129)v127_04_1_0nl_stream_wasAcr

4 files changed, 8 insertions, 3 deletions

diff --git a/org.eclipse.jdt.core/changes.txt b/org.eclipse.jdt.core/changes.txt
index f8b040c175..02bc78201d 100644
--- a/org.eclipse.jdt.core/changes.txt
+++ b/org.eclipse.jdt.core/changes.txt
@@ -7,7 +7,8 @@ What's new in this drop
 

 PRs Fixed in 1.0NL stream (since 0.9)

 ==================================================================================

-1GH3218: ITPJUI:WIN - mnuemonic problems

+1GGCYEU: ITPJCORE:ALL - Using Ant for build skip files

+1GH3218: ITPJUI:WIN - mnemonic problems

 1GGLLUG: ITPJCORE:WINNT - @deprecated does not work if it is followed by a TAB 

 1GG8T8H: ITPJCORE:ALL - JCK1.3a - dasg04203 - definitely assigned value before the third operand of the conditional operator ? : 

 1GG8T56: ITPJCORE:ALL - JCK1.3a - dasg04103 - definitely assigned value before the second operand of the conditional operator ? : 

diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
index d5e48dc0b5..2ac0910b9c 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
@@ -142,6 +142,7 @@ public boolean getNextCharAsJavaIdentifierPart() {
 }

 public int getNextToken() throws InvalidInputException {

 

+	this.wasAcr = false;

 	if (diet) {

 		jumpOverMethodBody();

 		diet = false;

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index 03126051b3..11a9f3e9f8 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -614,6 +614,7 @@ protected static short check(int i) {
 public boolean checkAndReportBracketAnomalies(ProblemReporter problemReporter) {

 

 	boolean anomaliesDetected = false;	

+	this.scanner.wasAcr = false;

 	try {

 		char[] source = scanner.source;

 		int[] leftCount = {0, 0, 0};

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
index fb62e9aba1..a4421327e4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
@@ -620,6 +620,7 @@ public boolean getNextCharAsJavaIdentifierPart() {
 }

 public int getNextToken() throws InvalidInputException {

 

+	this.wasAcr = false;

 	if (diet) {

 		jumpOverMethodBody();

 		diet = false;

@@ -1147,6 +1148,7 @@ public final void getNextUnicodeChar()
  */

 public final void jumpOverMethodBody() {

 

+	this.wasAcr = false;

 	int found = 1;

 	try {

 		while (true) { //loop for jumping over comments

@@ -1411,8 +1413,7 @@ public final void jumpOverMethodBody() {
 	}

 	return;

 }

-public final boolean jumpOverUnicodeWhiteSpace()

-	throws InvalidInputException {

+public final boolean jumpOverUnicodeWhiteSpace() throws InvalidInputException {

 	//BOOLEAN

 	//handle the case of unicode. Jump over the next whiteSpace

 	//making startPosition pointing on the next available char

@@ -1420,6 +1421,7 @@ public final boolean jumpOverUnicodeWhiteSpace()
 	//correct char

 

 	try {

+		this.wasAcr = false;

 		int c1, c2, c3, c4;

 		int unicodeSize = 6;

 		currentPosition++;