Changeset 19246

Timestamp:

11/20/08 19:43:57 (7 weeks ago)

Author:

stephan

Message:

more heuristic to cope with std-java code: support '.' 'team'.
See 8.12.1-otjld-scoped-keyword-1

Location:

trunk/src/plugins/org.eclipse.jdt.core

Files:

• compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java (modified) (5 diffs)
• model/org/eclipse/jdt/internal/core/util/PublicScanner.java (modified) (5 diffs)

trunk/src/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java

@@ -94 +94 @@
     protected boolean _calloutSeen = false; 
     protected boolean _callinSeen = false;
+    
+    // after a '.' even 'team' can be an identifier:
+    private int _dotSeen = 0; // 0: no, 1: previos, 2: this token
     
     // only within a joinpoint query '#' is a special token!
@@ -1163 +1166 @@
 }
 public int getNextToken() throws InvalidInputException {
+//{ObjectTeams: support '.' 'team':
+        if (this._dotSeen > 0)
+                this._dotSeen--; // "aging"
+// SH}
         this.wasAcr = false;
         if (this.diet) {
@@ -1286 +1293 @@
                                                                 this.currentPosition = temp2;
                                                                 return TokenNameDOT_DOT;
-                                                        } 
+                                                        }
+                                                        this._dotSeen = 2; // now
 //SH}
                                                         this.currentPosition = temp;
@@ -1292 +1300 @@
                                                 }
                                         } else {
+//{ObjectTeams: record the one '.':
+                                                this._dotSeen = 2; // now
+// SH}
                                                 this.currentPosition = temp;
                                                 return TokenNameDOT;
@@ -4025 +4036 @@
                                                         return TokenNametrue;
                                                 else
-//{ObjectTeams: check for team keyword (always checked, if seen set isOTsource          
+//{ObjectTeams: check for team keyword (always checked except after '.' -- if seen set isOTsource)              
                                                         if ((data[index] == 'e')
                                                                 && (data[++index] == 'a')
-                                                                && (data[++index] == 'm')) 
+                                                                && (data[++index] == 'm')
+                                                                && (this._isOTSource || this._dotSeen == 0)) 
                                                         {
                                                                 _teamKeywordSeen = true;

trunk/src/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java

@@ -82 +82 @@
     protected boolean _calloutSeen = false; 
     protected boolean _callinSeen = false;
+    
+    // after a '.' even 'team' can be an identifier:
+    private int _dotSeen = 0; // 0: no, 1: previos, 2: this token
     
     // only within a joinpoint query '#' is a special token!
@@ -1151 +1154 @@
 }
 public int getNextToken() throws InvalidInputException {
+//{ObjectTeams: support '.' 'team':
+        if (this._dotSeen > 0)
+                this._dotSeen--; // "aging"
+// SH}
         this.wasAcr = false;
         if (this.diet) {
@@ -1274 +1281 @@
                                                                 this.currentPosition = temp2;
                                                                 return TokenNameDOT_DOT;
-                                                        } 
+                                                        }
+                                                        this._dotSeen = 2; // now
 //SH}
                                                         this.currentPosition = temp;
@@ -1280 +1288 @@
                                                 }
                                         } else {
+//{ObjectTeams: record the one '.':
+                                                this._dotSeen = 2; // now
+// SH}
                                                 this.currentPosition = temp;
                                                 return TokenNameDOT;
@@ -3633 +3644 @@
                                                         return TokenNametrue;
                                                 else
-//{ObjectTeams: check for team keyword (always checked, if seen set isOTsource          
+//{ObjectTeams: check for team keyword (always checked except after '.' -- if seen set isOTsource)              
                                                         if ((data[index] == 'e')
                                                                 && (data[++index] == 'a')
-                                                                && (data[++index] == 'm')) 
+                                                                && (data[++index] == 'm')
+                                                                && (this._isOTSource || this._dotSeen == 0)) 
                                                         {
                                                                 _teamKeywordSeen = true;