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

Fixed Bug 94933 - IASTTranslationUnit.flattenLocationsToFile does not work correctly

Browse source
This commit is contained in:
John Camelon 2005-06-01 13:56:45 +00:00
parent 15b620d7f0
commit f19c9e9061
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationMacroTests.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.core.parser.tests.ast2;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTMacroExpansion; import org.eclipse.cdt.core.dom.ast.IASTMacroExpansion;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
@ -322,4 +323,17 @@ public class DOMLocationMacroTests extends AST2BaseTest {
assertEquals( "MACRO".length(), loc.getNodeLength() ); //$NON-NLS-1$ assertEquals( "MACRO".length(), loc.getNodeLength() ); //$NON-NLS-1$
} }
} }
public void testBug94933() throws Exception {
StringBuffer buffer = new StringBuffer( "#define API extern\n" );
buffer.append( "#define MYAPI API\n");
buffer.append( "MYAPI void func() {}" );
String code = buffer.toString();
for (ParserLanguage p = ParserLanguage.C; p != null; p = (p == ParserLanguage.C) ? ParserLanguage.CPP
: null) {
IASTTranslationUnit tu = parse(code, p);
IASTFunctionDefinition f = (IASTFunctionDefinition) tu.getDeclarations()[0];
assertNotNull( f.getFileLocation() );
}
}
} }

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/LocationMap.java
View file

@ -2395,8 +2395,10 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
} else { } else {
if( result[i] != null && !result[i].getFileName().equals( filename ) ) if( result[i] != null && !result[i].getFileName().equals( filename ) )
return null; return null;
if( result[i].getNodeOffset() == result[i-1].getNodeOffset() )
continue;
if (result[i] != null if (result[i] != null
&& result[i].getNodeOffset() != (offset + length)) && result[i].getNodeOffset() != (offset + length) )
return null; return null;
if (result[i] != null) if (result[i] != null)
length += result[i].getNodeLength(); length += result[i].getNodeLength();