diff options
author | John Camelon | 2003-06-05 20:01:54 +0000 |
---|---|---|
committer | John Camelon | 2003-06-05 20:01:54 +0000 |
commit | f5f345cdfff3f09740d7f1b2a8dfc951d380e7ee (patch) | |
tree | 197653151bc96e1d4e0afee1b00725b7d1fcf202 /core/org.eclipse.cdt.core/model | |
parent | 8efde68c59b1a5acda40946de88334df0da2ac34 (diff) | |
download | org.eclipse.cdt-f5f345cdfff3f09740d7f1b2a8dfc951d380e7ee.tar.gz org.eclipse.cdt-f5f345cdfff3f09740d7f1b2a8dfc951d380e7ee.tar.xz org.eclipse.cdt-f5f345cdfff3f09740d7f1b2a8dfc951d380e7ee.zip |
CORE
Fix Bug 38380 "Include" class public methods fails JUnit tests
Updated CModel, DOM, Scanner and current Parser callback to set the information appropriately.
TESTS
Moved testBug23478A() & testBug23478B() from failed tests to TranslationUnitTests.java.
Removed TranslationUnitFailedTests.java as it was empty.
I also had to apply Alain's partial fix to the Parser_SymbolTable branch to get this working.
Diffstat (limited to 'core/org.eclipse.cdt.core/model')
-rw-r--r-- | core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java | 7 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ModelBuilder.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java index f0a8e0f06a2..332714fa20c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java @@ -10,8 +10,11 @@ import org.eclipse.cdt.core.model.IInclude; public class Include extends SourceManipulation implements IInclude { - public Include(ICElement parent, String name) { + private final boolean standard; + + public Include(ICElement parent, String name, boolean isStandard) { super(parent, name, CElement.C_INCLUDE); + standard = isStandard; } public String getIncludeName() { @@ -19,7 +22,7 @@ public class Include extends SourceManipulation implements IInclude { } public boolean isStandard() { - return true; + return standard; } protected CElementInfo createElementInfo () { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ModelBuilder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ModelBuilder.java index fe00f7d662b..545c60e4649 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ModelBuilder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ModelBuilder.java @@ -28,7 +28,7 @@ public class ModelBuilder implements IStructurizerCallback { } public void includeDecl(String name, int startPos, int endPos, int startLine, int endLine) { - Include elem= new Include(fCurrFile, name); + Include elem= new Include(fCurrFile, name, true ); // assume standard inclusion elem.setPos(startPos, fixLength(startPos, endPos)); elem.setIdPos(startPos, fixLength(startPos, endPos)); elem.setLines(startLine, endLine); |