mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-16 04:35:45 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2009-08-16 23:15:54 +00:00
parent 3cb3c4832b
commit 4b2dc9b25f
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java
View file

@ -60,14 +60,14 @@ public class InclusionTests extends PreprocessorTestsBase {
public final static int SIZEOF_TRUTHTABLE = 10; public final static int SIZEOF_TRUTHTABLE = 10;
private IFile importFile(String fileName, String contents ) throws Exception{ private IFile importFile(String fileName, String contents) throws Exception {
if (fProject == null) { if (fProject == null) {
fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID); fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID);
} }
return TestSourceReader.createFile(fProject.getProject(), fileName, contents); return TestSourceReader.createFile(fProject.getProject(), fileName, contents);
} }
private IFolder importFolder(String name) throws Exception{ private IFolder importFolder(String name) throws Exception {
if (fProject == null) { if (fProject == null) {
fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID); fProject= CProjectHelper.createCProject(getClass().getName(), null, PDOMNullIndexer.ID);
} }
@ -152,8 +152,7 @@ public class InclusionTests extends PreprocessorTestsBase {
validateEOF(); validateEOF();
} }
public void testIncludePathOrdering() throws Exception public void testIncludePathOrdering() throws Exception {
{
// create directory structure: // create directory structure:
// project/base.cpp // project/base.cpp
// project/foo.h // project/foo.h

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java
View file

@ -57,7 +57,7 @@ final class ScannerContext {
} }
public ScannerContext(ILocationCtx ctx, ScannerContext parent, TokenList tokens) { public ScannerContext(ILocationCtx ctx, ScannerContext parent, TokenList tokens) {
this (ctx, parent, (Lexer) null); this(ctx, parent, (Lexer) null);
fTokens= tokens.first(); fTokens= tokens.first();
fInactiveState= CodeState.eSkipInactive; // no branches in result of macro expansion fInactiveState= CodeState.eSkipInactive; // no branches in result of macro expansion
} }
@ -169,7 +169,7 @@ final class ScannerContext {
} }
private int getOldNestingLevel(BranchKind kind, int nesting) { private int getOldNestingLevel(BranchKind kind, int nesting) {
switch(kind) { switch (kind) {
case eIf: case eIf:
return nesting-1; return nesting-1;
case eElif: case eElif: