From 39f8ff8c8689d57bbb0b595915bd3b425ef26185 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Thu, 6 Nov 2003 19:41:33 +0000
Subject: [PATCH] Removed one last remainder of core.model.Util in parser to
 unbreak 2.0 build.

---
 core/org.eclipse.cdt.core/parser/ChangeLog            |  3 +++
 .../cdt/internal/core/parser/ContextStack.java        | 11 ++++++-----
 .../org/eclipse/cdt/internal/core/parser/Scanner.java |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog b/core/org.eclipse.cdt.core/parser/ChangeLog
index 46b02096163..27c27d7b2dd 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog
@@ -1,3 +1,6 @@
+2003-11-06 John Camelon
+	Removed one last remainder of core.model.Util in parser to unbreak 2.0 build.  
+
 2003-11-05 John Camelon
 	Fixed Bug 44838 : exception when resolving parameter references in a constructor 
 	Fixed Bug 46165 : fields referenced in constructor chains are not called back upon 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ContextStack.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ContextStack.java
index 62c9d6b9f78..deec21eff9e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ContextStack.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ContextStack.java
@@ -18,11 +18,10 @@ import java.util.LinkedList;
 import java.util.Set;
 import java.util.Stack;
 
+import org.eclipse.cdt.core.parser.IParserLogService;
 import org.eclipse.cdt.core.parser.IProblem;
 import org.eclipse.cdt.core.parser.ISourceElementRequestor;
 import org.eclipse.cdt.core.parser.ast.IASTInclusion;
-import org.eclipse.cdt.internal.core.model.IDebugLogConstants;
-import org.eclipse.cdt.internal.core.model.Util;
 
 /**
  * @author aniefer
@@ -32,8 +31,10 @@ import org.eclipse.cdt.internal.core.model.Util;
  */
 public class ContextStack {
 
-	public ContextStack(){
-		super();
+	private final IParserLogService log;
+	
+	public ContextStack( IParserLogService l ) {
+		log = l;
 	}
 
     public void updateContext(Reader reader, String filename, int type, IASTInclusion inclusion, ISourceElementRequestor requestor) throws ContextException {
@@ -86,7 +87,7 @@ public class ContextStack {
 		try {
 			currentContext.getReader().close();
 		} catch (IOException ie) {
-			Util.debugLog("ContextStack : Error closing reader ", IDebugLogConstants.PARSER);
+			log.traceLog("ContextStack : Error closing reader ");
 		}
 
 		if( currentContext.getKind() == IScannerContext.INCLUSION )
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
index 16bf10c782e..5b6901bf482 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
@@ -86,7 +86,7 @@ public class Scanner implements IScanner {
 		this.language = language;
 		astFactory = ParserFactory.createASTFactory( mode, language );
 		this.backupReader = reader;
-		
+		contextStack = new ContextStack( log );
 		try {
 			//this is a hack to get around a sudden EOF experience
 			contextStack.push(
@@ -411,7 +411,7 @@ public class Scanner implements IScanner {
 	private static final String DEFINED = "defined";
 	private static final String POUND_DEFINE = "#define ";
 
-	private ContextStack contextStack = new ContextStack();
+	private ContextStack contextStack = null;
 	private IScannerContext lastContext = null;
 	
 	private IScannerInfo originalConfig;