[cdt-patch] Applied [HEAD] Unbreak the 2.0 builds

[John Camelon <jcamelon@xxxxxxxxxx>]

Virtual donuts to y'all. 

JohnC

Index: parser/ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/ChangeLog,v
retrieving revision 1.159
diff -u -r1.159 ChangeLog
--- parser/ChangeLog    6 Nov 2003 04:57:31 -0000       1.159
+++ parser/ChangeLog    6 Nov 2003 19:40:22 -0000
@@ -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 
Index: parser/org/eclipse/cdt/internal/core/parser/ContextStack.java
===================================================================
RCS file: 
/home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ContextStack.java,v
retrieving revision 1.16
diff -u -r1.16 ContextStack.java
--- parser/org/eclipse/cdt/internal/core/parser/ContextStack.java       5 
Nov 2003 18:15:11 -0000 1.16
+++ parser/org/eclipse/cdt/internal/core/parser/ContextStack.java       6 
Nov 2003 19:40:25 -0000
@@ -18,11 +18,10 @@
 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 @@
  */
 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 @@
                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 
)
Index: parser/org/eclipse/cdt/internal/core/parser/Scanner.java
===================================================================
RCS file: 
/home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java,v
retrieving revision 1.65
diff -u -r1.65 Scanner.java
--- parser/org/eclipse/cdt/internal/core/parser/Scanner.java    6 Nov 2003 
04:57:31 -0000  1.65
+++ parser/org/eclipse/cdt/internal/core/parser/Scanner.java    6 Nov 2003 
19:40:26 -0000
@@ -86,7 +86,7 @@
                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 @@
        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;