mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 18:25:40 +02:00
Code Issues Wiki Activity

Bug 286081.

Browse source
This commit is contained in:
Sergey Prigogin 2009-08-16 23:31:33 +00:00
parent 4b2dc9b25f
commit 44d46d0b79
1 changed files with 120 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
View file

@ -291,8 +291,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
Keywords.addKeywordsPreprocessor(fPPKeywords); Keywords.addKeywordsPreprocessor(fPPKeywords);
if (language == ParserLanguage.C) { if (language == ParserLanguage.C) {
Keywords.addKeywordsC(fKeywords); Keywords.addKeywordsC(fKeywords);
} } else {
else {
Keywords.addKeywordsCpp(fKeywords); Keywords.addKeywordsCpp(fKeywords);
} }
CharArrayIntMap additionalKeywords= configuration.getAdditionalKeywords(); CharArrayIntMap additionalKeywords= configuration.getAdditionalKeywords();
@ -350,9 +349,9 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
fMacroDictionary.put(__TIME__.getNameCharArray(), __TIME__); fMacroDictionary.put(__TIME__.getNameCharArray(), __TIME__);
fMacroDictionary.put(__LINE__.getNameCharArray(), __LINE__); fMacroDictionary.put(__LINE__.getNameCharArray(), __LINE__);
if (lang == ParserLanguage.CPP) if (lang == ParserLanguage.CPP) {
fMacroDictionary.put(__cplusplus.getNameCharArray(), __cplusplus); fMacroDictionary.put(__cplusplus.getNameCharArray(), __cplusplus);
else { } else {
fMacroDictionary.put(__STDC_HOSTED__.getNameCharArray(), __STDC_HOSTED__); fMacroDictionary.put(__STDC_HOSTED__.getNameCharArray(), __STDC_HOSTED__);
fMacroDictionary.put(__STDC_VERSION__.getNameCharArray(), __STDC_VERSION__); fMacroDictionary.put(__STDC_VERSION__.getNameCharArray(), __STDC_VERSION__);
} }
@ -444,8 +443,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
fLocationMap.registerPredefinedMacro(result); fLocationMap.registerPredefinedMacro(result);
fMacroDictionary.put(result.getNameCharArray(), result); fMacroDictionary.put(result.getNameCharArray(), result);
return result; return result;
} } catch (Exception e) {
catch (Exception e) {
fLog.traceLog("Invalid macro definition: '" + String.valueOf(key) + "'"); //$NON-NLS-1$//$NON-NLS-2$ fLog.traceLog("Invalid macro definition: '" + String.valueOf(key) + "'"); //$NON-NLS-1$//$NON-NLS-2$
return null; return null;
} }
@ -619,7 +617,6 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
return t1; return t1;
} }
public void skipInactiveCode() throws OffsetLimitReachedException { public void skipInactiveCode() throws OffsetLimitReachedException {
final Lexer lexer= fCurrentContext.getLexer(); final Lexer lexer= fCurrentContext.getLexer();
if (lexer != null) { if (lexer != null) {
@ -864,17 +861,13 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
// The check for bin has to come before float, otherwise binary integers // The check for bin has to come before float, otherwise binary integers
// with float components get flagged as BAD_FLOATING_POINT // with float components get flagged as BAD_FLOATING_POINT
handleProblem(IProblem.SCANNER_BAD_BINARY_FORMAT, image, number.getOffset(), number.getEndOffset()); handleProblem(IProblem.SCANNER_BAD_BINARY_FORMAT, image, number.getOffset(), number.getEndOffset());
} } else if (isFloat) {
else if (isFloat) {
handleProblem(IProblem.SCANNER_BAD_FLOATING_POINT, image, number.getOffset(), number.getEndOffset()); handleProblem(IProblem.SCANNER_BAD_FLOATING_POINT, image, number.getOffset(), number.getEndOffset());
} } else if (isHex) {
else if (isHex) {
handleProblem(IProblem.SCANNER_BAD_HEX_FORMAT, image, number.getOffset(), number.getEndOffset()); handleProblem(IProblem.SCANNER_BAD_HEX_FORMAT, image, number.getOffset(), number.getEndOffset());
} } else if (isOctal) {
else if (isOctal) {
handleProblem(IProblem.SCANNER_BAD_OCTAL_FORMAT, image, number.getOffset(), number.getEndOffset()); handleProblem(IProblem.SCANNER_BAD_OCTAL_FORMAT, image, number.getOffset(), number.getEndOffset());
} } else {
else {
handleProblem(IProblem.SCANNER_BAD_DECIMAL_FORMAT, image, number.getOffset(), number.getEndOffset()); handleProblem(IProblem.SCANNER_BAD_DECIMAL_FORMAT, image, number.getOffset(), number.getEndOffset());
} }
return; return;
@ -901,9 +894,16 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
} }
} }
// if we're not include_next, then we are looking for the first occurrence of // If we're not include_next, then we are looking for the first occurrence of
// the file, otherwise, we ignore all the paths before the current directory // the file, otherwise, we ignore all the paths before the current directory.
IncludeSearchPathElement searchAfter= includeNext ? fCurrentContext.getFoundOnPath() : null; IncludeSearchPathElement searchAfter= null;
if (includeNext) {
searchAfter = fCurrentContext.getFoundOnPath();
if (searchAfter == null) {
searchAfter = findFileInIncludePath(currentFile, includeDirective);
}
}
for (IncludeSearchPathElement path : fIncludeSearchPath) { for (IncludeSearchPathElement path : fIncludeSearchPath) {
if (searchAfter != null) { if (searchAfter != null) {
if (searchAfter.equals(path)) { if (searchAfter.equals(path)) {
@ -928,6 +928,16 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
return null; return null;
} }
private IncludeSearchPathElement findFileInIncludePath(String file, String includeDirective) {
for (IncludeSearchPathElement path : fIncludeSearchPath) {
String fileLocation = path.getLocation(includeDirective);
if (file.equals(fileLocation)) {
return path;
}
}
return null;
}
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer("Scanner @ file:"); //$NON-NLS-1$ StringBuffer buffer = new StringBuffer("Scanner @ file:"); //$NON-NLS-1$
@ -937,22 +947,19 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
return buffer.toString(); return buffer.toString();
} }
private void addMacroDefinition(IIndexMacro macro) { private void addMacroDefinition(IIndexMacro macro) {
try { try {
final char[] expansionImage = macro.getExpansionImage(); final char[] expansionImage = macro.getExpansionImage();
if (expansionImage == null) { if (expansionImage == null) {
// this is an undef // this is an undef
fMacroDictionary.remove(macro.getNameCharArray()); fMacroDictionary.remove(macro.getNameCharArray());
} } else {
else {
PreprocessorMacro result= MacroDefinitionParser.parseMacroDefinition(macro.getNameCharArray(), macro.getParameterList(), expansionImage); PreprocessorMacro result= MacroDefinitionParser.parseMacroDefinition(macro.getNameCharArray(), macro.getParameterList(), expansionImage);
final IASTFileLocation loc= macro.getFileLocation(); final IASTFileLocation loc= macro.getFileLocation();
fLocationMap.registerMacroFromIndex(result, loc, -1); fLocationMap.registerMacroFromIndex(result, loc, -1);
fMacroDictionary.put(result.getNameCharArray(), result); fMacroDictionary.put(result.getNameCharArray(), result);
} }
} } catch (Exception e) {
catch (Exception e) {
fLog.traceLog("Invalid macro definition: '" + macro.getName() + "'"); //$NON-NLS-1$//$NON-NLS-2$ fLog.traceLog("Invalid macro definition: '" + macro.getName() + "'"); //$NON-NLS-1$//$NON-NLS-2$
} }
} }
@ -1166,14 +1173,15 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
if (!active) { if (!active) {
// test if the include is inactive just because it was included before (bug 167100) // test if the include is inactive just because it was included before (bug 167100)
final IncludeResolution resolved= findInclusion(new String(headerName), userInclude, include_next, getCurrentFilename(), createPathTester); final IncludeResolution resolved= findInclusion(new String(headerName), userInclude, include_next,
getCurrentFilename(), createPathTester);
if (resolved != null && fCodeReaderFactory.hasFileBeenIncludedInCurrentTranslationUnit(resolved.fLocation)) { if (resolved != null && fCodeReaderFactory.hasFileBeenIncludedInCurrentTranslationUnit(resolved.fLocation)) {
path= resolved.fLocation; path= resolved.fLocation;
isHeuristic= resolved.fHeuristic; isHeuristic= resolved.fHeuristic;
} }
} } else {
else { final IncludeFileContent fi= findInclusion(new String(headerName), userInclude, include_next,
final IncludeFileContent fi= findInclusion(new String(headerName), userInclude, include_next, getCurrentFilename(), createCodeReaderTester); getCurrentFilename(), createCodeReaderTester);
if (fi != null) { if (fi != null) {
path= fi.getFileLocation(); path= fi.getFileLocation();
isHeuristic= fi.isFoundByHeuristics(); isHeuristic= fi.isFoundByHeuristics();
@ -1186,8 +1194,10 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
if (reader != null && !isCircularInclusion(path)) { if (reader != null && !isCircularInclusion(path)) {
reported= true; reported= true;
fAllIncludedFiles.add(path); fAllIncludedFiles.add(path);
ILocationCtx ctx= fLocationMap.pushInclusion(poundOffset, nameOffsets[0], nameOffsets[1], condEndOffset, reader.buffer, path, headerName, userInclude, isHeuristic, fi.isSource()); ILocationCtx ctx= fLocationMap.pushInclusion(poundOffset, nameOffsets[0], nameOffsets[1],
ScannerContext fctx= new ScannerContext(ctx, fCurrentContext, new Lexer(reader.buffer, fLexOptions, this, this)); condEndOffset, reader.buffer, path, headerName, userInclude, isHeuristic, fi.isSource());
ScannerContext fctx= new ScannerContext(ctx, fCurrentContext, new Lexer(reader.buffer,
fLexOptions, this, this));
fctx.setFoundOnPath(fi.getFoundOnPath()); fctx.setFoundOnPath(fi.getFoundOnPath());
fCurrentContext= fctx; fCurrentContext= fctx;
} }
@ -1196,8 +1206,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
case SKIP_FILE: case SKIP_FILE:
break; break;
} }
} } else {
else {
final int len = headerName.length + 2; final int len = headerName.length + 2;
StringBuilder name= new StringBuilder(len); StringBuilder name= new StringBuilder(len);
name.append(userInclude ? '"' : '<'); name.append(userInclude ? '"' : '<');