Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2003-03-04 10:59:55 -0500
committerDoug Schaefer2003-03-04 10:59:55 -0500
commite803ce0d5e6306ea2b4e1c14eeb5176513ad450f (patch)
tree2d3e986c9b478e2ff9591051e7980b832728498c
parent35fc95ccadbce5e7d8e5b73e9ea6096a28643c7d (diff)
downloadorg.eclipse.cdt-e803ce0d5e6306ea2b4e1c14eeb5176513ad450f.tar.gz
org.eclipse.cdt-e803ce0d5e6306ea2b4e1c14eeb5176513ad450f.tar.xz
org.eclipse.cdt-e803ce0d5e6306ea2b4e1c14eeb5176513ad450f.zip
Changed source folders in preparation for merging into head.NewParser1_branch
-rw-r--r--core/org.eclipse.cdt.core/.classpath3
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/core/dom/IScope.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/core/dom/IScope.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/BaseSpecifier.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ClassSpecifier.java)2
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/DOMBuilder.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/DOMBuilder.java)8
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declaration.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declaration.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/Declarator.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/Declarator.java)4
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/MemberDeclaration.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclaration.java)2
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/ParameterDeclarationClause.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/SimpleDeclaration.java)2
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TranslationUnit.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TranslationUnit.java)0
-rw-r--r--core/org.eclipse.cdt.core/dom/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/dom/TypeSpecifier.java)0
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Declarator.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Declarator.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/ICElementWrapper.java)0
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/NewModelBuilder.java)10
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/Parameter.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/Parameter.java)4
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/SimpleDeclarationWrapper.java)4
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/model/TranslationUnitWrapper.java)0
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/BranchTracker.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/BranchTracker.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Declaration.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Declaration.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionEvaluator.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ExpressionEvaluator.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IMacroDescriptor.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IMacroDescriptor.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IParserCallback.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IParserCallback.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScanner.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScanner.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/IScannerContext.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/IScannerContext.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/MacroDescriptor.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/MacroDescriptor.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Main.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Main.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/NullParserCallback.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/NullParserCallback.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Parser.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserException.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserException.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTable.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTable.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserSymbolTableException.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ParserSymbolTableException.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Scanner.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Scanner.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerContext.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerContext.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ScannerException.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/ScannerException.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Token.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/Token.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclSpecifier.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclSpecifier.java)4
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/DeclarationSpecifier.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/DeclarationSpecifier.java)2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Name.java (renamed from core/org.eclipse.cdt.core/newparser/org/eclipse/cdt/internal/core/newparser/util/Name.java)4
-rw-r--r--core/org.eclipse.cdt.ui.tests/.classpath2
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/BranchTrackerTest.java)4
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/DOMTests.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/DOMTests.java)8
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ExprEvalTest.java)4
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java)6
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java)8
-rw-r--r--core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java (renamed from core/org.eclipse.cdt.ui.tests/newparser/org/eclipse/cdt/core/parser/tests/XMLDumper.java)0
48 files changed, 61 insertions, 60 deletions
diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath
index 8ab952a010..2438a419b3 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
index 98d6587b8b..98d6587b8b 100644
--- 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
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
index 3e14f8a1aa..3e14f8a1aa 100644
--- 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
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
index da6cd430ec..025955c9a2 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.LinkedList;
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
index f3f70a073c..85eb663186 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 @@ package org.eclipse.cdt.internal.core.dom;
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
index 9b726db0e1..9b726db0e1 100644
--- 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
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
index f08d6ad5ca..ab94281ebc 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
index aa932d0368..aa932d0368 100644
--- 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
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
index edf4664476..cfe7caab72 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 @@ package org.eclipse.cdt.internal.core.dom;
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
index a5caa43ac7..a5caa43ac7 100644
--- 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
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
index 4dc9bd1afa..2f7e39aaf4 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 @@ package org.eclipse.cdt.internal.core.dom;
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
index 95454b73e5..95454b73e5 100644
--- 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
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
index 899ce4a394..899ce4a394 100644
--- 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
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 077de63d95..1400aede4e 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 java.io.InputStream;
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
index 7be89689ff..95698cc37a 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 @@ package org.eclipse.cdt.internal.core.model;
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
index 5f3db2b35d..5f3db2b35d 100644
--- 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
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
index 3688c969a2..e5ea3d488f 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.LinkedList;
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
index 8492d69943..5637029728 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 @@ package org.eclipse.cdt.internal.core.model;
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
index 22edcb64ca..1e6bf4e952 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 java.util.List;
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
index 7284d69540..7284d69540 100644
--- 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
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
index 94129e6c4a..4aab6428b9 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
index 2f9e9c98e6..8ad426e943 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
index e7dbf6cc28..bfb67a30d0 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
index 8d6a817607..9c9fba8e3d 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
index d903987683..f8d7fe7dc7 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
index 1692d956e6..63ef33190a 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
index 6a807ec2cc..b96f3f2aa2 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
index d7a369fe59..13874ca22e 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
index 6c6458af97..85636acb0e 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
index 6a841aeb3d..2560d7466d 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
index f26c23b65d..8197ad277a 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
index acebeab9f8..90246f0a00 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
index 0eaddca275..3f4f5ab35f 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
index ef53e1e12b..b031325bce 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
index 202b880d84..ee57683c4e 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
index fec5e0897a..e7df600860 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
index 8e6da8988a..8f299523ef 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
index dac2866e6f..5a7dd39da8 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
index 163008ea0b..6ed3b42b04 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
index f235e68440..9413877ab9 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
index ab2a21fecc..deb9433741 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 01c6bb2276..a7f81b4612 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
index 20098f737e..96250bb040 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 @@ package org.eclipse.cdt.core.parser.tests;
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
index 8350d854b2..d7356efebc 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.ParameterDeclaration;
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
index 58292331a8..fd330147e7 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.Test;
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
index be0e5aef44..a2cb060dfe 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 junit.framework.TestCase;
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
index 5597b436ce..af88698b8a 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.Test;
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
index 0221d0d25c..0221d0d25c 100644
--- 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

Back to the top