mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +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

13
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);
} }
@ -81,7 +81,7 @@ public class InclusionTests extends PreprocessorTestsBase {
// #include "one.h" // #include "one.h"
// #include "f1/two.h" // #include "f1/two.h"
// #include "f1/f2/three.h" // #include "f1/f2/three.h"
public void testIncludeVariables_69529() throws Exception { public void testIncludeVariables_69529() throws Exception {
String content= getAboveComment(); String content= getAboveComment();
IFolder f0 = importFolder(".framework"); IFolder f0 = importFolder(".framework");
@ -108,7 +108,7 @@ public class InclusionTests extends PreprocessorTestsBase {
validateEOF(); validateEOF();
} }
public void testIncludeNext() throws Exception { public void testIncludeNext() throws Exception {
String baseFile = "int zero; \n#include \"foo.h\""; //$NON-NLS-1$ String baseFile = "int zero; \n#include \"foo.h\""; //$NON-NLS-1$
String i1Next = "int one; \n#include_next <bar/foo.h>"; //$NON-NLS-1$ String i1Next = "int one; \n#include_next <bar/foo.h>"; //$NON-NLS-1$
String i2Next = "int two; \n#include_next \"bar/foo.h\""; //$NON-NLS-1$ String i2Next = "int two; \n#include_next \"bar/foo.h\""; //$NON-NLS-1$
@ -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
@ -233,7 +232,7 @@ public class InclusionTests extends PreprocessorTestsBase {
} }
// #include <inc/test.h> // #include <inc/test.h>
public void testRelativeIncludes_243170() throws Exception { public void testRelativeIncludes_243170() throws Exception {
String content= getAboveComment(); String content= getAboveComment();
IFolder f0 = importFolder("f1"); IFolder f0 = importFolder("f1");

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: