cleaning up the architecture of the LR parsers

2 files changed, 6 insertions, 6 deletions

diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
index d893671abe3..8076a5afaeb 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
@@ -35,7 +35,7 @@ import org.eclipse.cdt.core.dom.ast.IParameter;
 import org.eclipse.cdt.core.dom.ast.IPointerType;
 import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.ITypedef;
-import org.eclipse.cdt.core.dom.lrparser.IParserActionTokenProvider;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
 import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack;
 import org.eclipse.cdt.core.parser.util.DebugUtil;
 import org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym;
@@ -87,7 +87,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 	
 	  
 	// provides limited access to the token stream
-	private final IParserActionTokenProvider parser;
+	private final ITokenStream parser;
 	
 	// The symbolTable currently in use 
 	private C99SymbolTable symbolTable = C99SymbolTable.EMPTY_TABLE;
@@ -138,7 +138,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 	}
 	
 	
-	public C99ResolveParserAction(IParserActionTokenProvider parser) {
+	public C99ResolveParserAction(ITokenStream parser) {
 		this.parser = parser;
 		bindingScopeStack.add(new C99Scope(EScopeKind.eGlobal)); // the global scope
 		System.out.println();
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java
index 7667e1d80df..9930e3b0383 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java
@@ -14,7 +14,7 @@ import java.util.LinkedList;
 
 import lpg.lpgjavaruntime.IToken;
 
-import org.eclipse.cdt.core.dom.lrparser.IParserActionTokenProvider;
+import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream;
 import org.eclipse.cdt.core.parser.util.DebugUtil;
 import org.eclipse.cdt.internal.core.dom.lrparser.symboltable.TypedefSymbolTable;
 /**
@@ -32,7 +32,7 @@ public class C99TypedefTrackerParserAction {
 	
 	  
 	// provides limited access to the token stream
-	private final IParserActionTokenProvider parser;
+	private final ITokenStream parser;
 	
 	// The symbolTable currently in use 
 	private TypedefSymbolTable symbolTable = TypedefSymbolTable.EMPTY_TABLE;
@@ -64,7 +64,7 @@ public class C99TypedefTrackerParserAction {
 	}
 	
 	
-	public C99TypedefTrackerParserAction(IParserActionTokenProvider parser) {
+	public C99TypedefTrackerParserAction(ITokenStream parser) {
 		this.parser = parser;
 	}