Changed source folders in preparation for merging into head.
diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath
index 8ab952a..2438a41 100644
--- a/core/org.eclipse.cdt.core/.classpath
+++ b/core/org.eclipse.cdt.core/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="model/"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="utils/"/>
- <classpathentry kind="src" path="newparser"/>
+ <classpathentry kind="src" path="parser"/>
<classpathentry kind="src" path="build"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
@@ -14,5 +14,6 @@
<classpathentry kind="src" path="/org.eclipse.debug.core"/>
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
+ <classpathentry kind="src" path="dom"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/core/dom/IScope.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/core/dom/IScope.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/core/dom/IScope.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/core/dom/IScope.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java
similarity index 94%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java
index da6cd43..025955c 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java
+++ b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java
@@ -4,7 +4,7 @@
import java.util.List;
import org.eclipse.cdt.core.dom.IScope;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.util.Name;
public class ClassSpecifier extends TypeSpecifier implements IScope {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/DOMBuilder.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/DOMBuilder.java
similarity index 96%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/DOMBuilder.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/DOMBuilder.java
index f3f70a0..85eb663 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/DOMBuilder.java
+++ b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/DOMBuilder.java
@@ -2,10 +2,10 @@
import org.eclipse.cdt.core.dom.IScope;
-import org.eclipse.cdt.internal.core.newparser.IParserCallback;
-import org.eclipse.cdt.internal.core.newparser.Token;
-import org.eclipse.cdt.internal.core.newparser.util.*;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.IParserCallback;
+import org.eclipse.cdt.internal.core.parser.Token;
+import org.eclipse.cdt.internal.core.parser.util.*;
+import org.eclipse.cdt.internal.core.parser.util.Name;
/**
* This is the parser callback that creates objects in the DOM.
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declaration.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declaration.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declaration.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declaration.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declarator.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declarator.java
similarity index 90%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declarator.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declarator.java
index f08d6ad..ab94281 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declarator.java
+++ b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declarator.java
@@ -1,7 +1,7 @@
package org.eclipse.cdt.internal.core.dom;
-import org.eclipse.cdt.internal.core.newparser.util.*;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.util.*;
+import org.eclipse.cdt.internal.core.parser.util.Name;
public class Declarator {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java
similarity index 95%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java
index edf4664..cfe7caa 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java
+++ b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java
@@ -3,7 +3,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.cdt.internal.core.newparser.util.*;
+import org.eclipse.cdt.internal.core.parser.util.*;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java
similarity index 95%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java
index 4dc9bd1..2f7e39a 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java
+++ b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java
@@ -3,7 +3,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.cdt.internal.core.newparser.util.*;
+import org.eclipse.cdt.internal.core.parser.util.*;
public class SimpleDeclaration extends Declaration implements DeclarationSpecifier.Container{
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TranslationUnit.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TranslationUnit.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TranslationUnit.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TranslationUnit.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java b/core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java
rename to core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
index 077de63..1400aed 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
@@ -11,7 +11,7 @@
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ISourceRange;
-import org.eclipse.cdt.internal.core.newparser.Parser;
+import org.eclipse.cdt.internal.core.parser.Parser;
import org.eclipse.cdt.internal.parser.CStructurizer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Declarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Declarator.java
similarity index 94%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Declarator.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Declarator.java
index 7be8968..95698cc 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Declarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Declarator.java
@@ -2,7 +2,7 @@
import java.util.List;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.util.Name;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java
similarity index 96%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java
index 3688c96..e5ea3d4 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java
@@ -14,11 +14,11 @@
import java.util.List;
import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.internal.core.newparser.IParserCallback;
-import org.eclipse.cdt.internal.core.newparser.Token;
-import org.eclipse.cdt.internal.core.newparser.util.DeclSpecifier;
-import org.eclipse.cdt.internal.core.newparser.util.DeclarationSpecifier;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.IParserCallback;
+import org.eclipse.cdt.internal.core.parser.Token;
+import org.eclipse.cdt.internal.core.parser.util.DeclSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.DeclarationSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.Name;
public class NewModelBuilder implements IParserCallback {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Parameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Parameter.java
similarity index 90%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Parameter.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Parameter.java
index 8492d69..5637029 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Parameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Parameter.java
@@ -3,8 +3,8 @@
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.cdt.internal.core.newparser.util.DeclSpecifier;
-import org.eclipse.cdt.internal.core.newparser.util.DeclarationSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.DeclSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.DeclarationSpecifier;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java
similarity index 96%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java
index 22edcb6..1e6bf4e 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java
@@ -5,8 +5,8 @@
import org.eclipse.cdt.core.model.IStructure;
import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.newparser.util.DeclSpecifier;
-import org.eclipse.cdt.internal.core.newparser.util.DeclarationSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.DeclSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.DeclarationSpecifier;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java
similarity index 100%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/BranchTracker.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/BranchTracker.java
similarity index 98%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/BranchTracker.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/BranchTracker.java
index 94129e6..4aab642 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/BranchTracker.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/BranchTracker.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.EmptyStackException;
import java.util.Stack;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Declaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Declaration.java
similarity index 98%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Declaration.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Declaration.java
index 2f9e9c9..8ad426e 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Declaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Declaration.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ExpressionEvaluator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionEvaluator.java
similarity index 98%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ExpressionEvaluator.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionEvaluator.java
index e7dbf6c..bfb67a3 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ExpressionEvaluator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionEvaluator.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.Stack;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IMacroDescriptor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IMacroDescriptor.java
similarity index 90%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IMacroDescriptor.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IMacroDescriptor.java
index 8d6a817..9c9fba8 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IMacroDescriptor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IMacroDescriptor.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.List;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IParserCallback.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IParserCallback.java
similarity index 97%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IParserCallback.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IParserCallback.java
index d903987..f8d7fe7 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IParserCallback.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IParserCallback.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
public interface IParserCallback {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScanner.java
similarity index 94%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScanner.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScanner.java
index 1692d95..63ef331 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.Reader;
import java.util.List;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScannerContext.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScannerContext.java
similarity index 91%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScannerContext.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScannerContext.java
index 6a807ec..b96f3f2 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScannerContext.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScannerContext.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.Reader;
import java.io.IOException;
/**
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/MacroDescriptor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/MacroDescriptor.java
similarity index 97%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/MacroDescriptor.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/MacroDescriptor.java
index d7a369f..13874ca 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/MacroDescriptor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/MacroDescriptor.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.Iterator;
import java.util.List;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Main.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Main.java
similarity index 97%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Main.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Main.java
index 6c6458a..85636ac 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Main.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Main.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.FileReader;
import java.io.Reader;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/NullParserCallback.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/NullParserCallback.java
similarity index 98%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/NullParserCallback.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/NullParserCallback.java
index 6a841ae..2560d74 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/NullParserCallback.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/NullParserCallback.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
public class NullParserCallback implements IParserCallback {
/**
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
similarity index 99%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Parser.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
index f26c23b..8197ad2 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Parser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserException.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserException.java
similarity index 93%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserException.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserException.java
index acebeab..90246f0 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserException.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserException.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
public class ParserException extends Exception {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTable.java
similarity index 96%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTable.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTable.java
index 0eaddca..3f4f5ab 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTable.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.util.Stack;
/**
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTableException.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTableException.java
similarity index 93%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTableException.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTableException.java
index ef53e1e..b031325 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTableException.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTableException.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
/**
* @author aniefer
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Scanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
similarity index 99%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Scanner.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
index 202b880..ee57683 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Scanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.FileNotFoundException;
import java.io.FileReader;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerContext.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerContext.java
similarity index 96%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerContext.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerContext.java
index fec5e08..e7df600 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerContext.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerContext.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
import java.io.IOException;
import java.io.Reader;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerException.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerException.java
similarity index 93%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerException.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerException.java
index 8e6da89..8f29952 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerException.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerException.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
public class ScannerException extends Exception {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Token.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Token.java
similarity index 98%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Token.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Token.java
index dac2866..5a7dd39 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Token.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Token.java
@@ -8,7 +8,7 @@
* Contributors:
* Rational Software - initial implementation
******************************************************************************/
-package org.eclipse.cdt.internal.core.newparser;
+package org.eclipse.cdt.internal.core.parser;
public class Token {
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclSpecifier.java
similarity index 97%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclSpecifier.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclSpecifier.java
index 163008e..6ed3b42 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclSpecifier.java
@@ -1,6 +1,6 @@
-package org.eclipse.cdt.internal.core.newparser.util;
+package org.eclipse.cdt.internal.core.parser.util;
-import org.eclipse.cdt.internal.core.newparser.Token;
+import org.eclipse.cdt.internal.core.parser.Token;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclarationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclarationSpecifier.java
similarity index 91%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclarationSpecifier.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclarationSpecifier.java
index f235e68..9413877 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclarationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclarationSpecifier.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.internal.core.newparser.util;
+package org.eclipse.cdt.internal.core.parser.util;
import java.util.List;
diff --git a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/Name.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Name.java
similarity index 87%
rename from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/Name.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Name.java
index ab2a21f..deb9433 100644
--- a/core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/Name.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Name.java
@@ -1,6 +1,6 @@
-package org.eclipse.cdt.internal.core.newparser.util;
+package org.eclipse.cdt.internal.core.parser.util;
-import org.eclipse.cdt.internal.core.newparser.Token;
+import org.eclipse.cdt.internal.core.parser.Token;
/**
diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath
index 01c6bb2..a7f81b4 100644
--- a/core/org.eclipse.cdt.ui.tests/.classpath
+++ b/core/org.eclipse.cdt.ui.tests/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="ui"/>
<classpathentry kind="src" path="core"/>
<classpathentry kind="src" path="model"/>
- <classpathentry kind="src" path="newparser"/>
+ <classpathentry kind="src" path="parser"/>
<classpathentry kind="src" path="/org.eclipse.core.boot"/>
<classpathentry kind="src" path="/org.eclipse.core.resources"/>
<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java
similarity index 96%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java
index 20098f7..96250bb 100644
--- a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java
@@ -2,8 +2,8 @@
import junit.framework.TestCase;
-import org.eclipse.cdt.internal.core.newparser.BranchTracker;
-import org.eclipse.cdt.internal.core.newparser.ScannerException;
+import org.eclipse.cdt.internal.core.parser.BranchTracker;
+import org.eclipse.cdt.internal.core.parser.ScannerException;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/DOMTests.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
similarity index 97%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/DOMTests.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
index 8350d85..d7356ef 100644
--- a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/DOMTests.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
@@ -15,10 +15,10 @@
import org.eclipse.cdt.internal.core.dom.ParameterDeclarationClause;
import org.eclipse.cdt.internal.core.dom.SimpleDeclaration;
import org.eclipse.cdt.internal.core.dom.TranslationUnit;
-import org.eclipse.cdt.internal.core.newparser.Parser;
-import org.eclipse.cdt.internal.core.newparser.ParserException;
-import org.eclipse.cdt.internal.core.newparser.util.DeclarationSpecifier;
-import org.eclipse.cdt.internal.core.newparser.util.Name;
+import org.eclipse.cdt.internal.core.parser.Parser;
+import org.eclipse.cdt.internal.core.parser.ParserException;
+import org.eclipse.cdt.internal.core.parser.util.DeclarationSpecifier;
+import org.eclipse.cdt.internal.core.parser.util.Name;
/**
* Tests the construction of DOMs for snippets of code
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java
similarity index 88%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java
index 5829233..fd33014 100644
--- a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java
@@ -4,8 +4,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.eclipse.cdt.internal.core.newparser.ExpressionEvaluator;
-import org.eclipse.cdt.internal.core.newparser.Parser;
+import org.eclipse.cdt.internal.core.parser.ExpressionEvaluator;
+import org.eclipse.cdt.internal.core.parser.Parser;
public class ExprEvalTest extends TestCase {
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
index be0e5ae..a2cb060 100644
--- a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
@@ -4,9 +4,9 @@
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.cdt.internal.core.newparser.Declaration;
-import org.eclipse.cdt.internal.core.newparser.ParserSymbolTable;
-import org.eclipse.cdt.internal.core.newparser.ParserSymbolTableException;
+import org.eclipse.cdt.internal.core.parser.Declaration;
+import org.eclipse.cdt.internal.core.parser.ParserSymbolTable;
+import org.eclipse.cdt.internal.core.parser.ParserSymbolTableException;
/**
* @author aniefer
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
index 5597b43..af88698 100644
--- a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
@@ -7,10 +7,10 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.eclipse.cdt.internal.core.newparser.IMacroDescriptor;
-import org.eclipse.cdt.internal.core.newparser.Scanner;
-import org.eclipse.cdt.internal.core.newparser.ScannerException;
-import org.eclipse.cdt.internal.core.newparser.Token;
+import org.eclipse.cdt.internal.core.parser.IMacroDescriptor;
+import org.eclipse.cdt.internal.core.parser.Scanner;
+import org.eclipse.cdt.internal.core.parser.ScannerException;
+import org.eclipse.cdt.internal.core.parser.Token;
/**
* @author jcamelon
diff --git a/core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/XMLDumper.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java
similarity index 100%
rename from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/XMLDumper.java
rename to core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java
