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

fixed calculation of conversion function names

Browse source
This commit is contained in:
Mike Kucera 2008-04-23 22:17:44 +00:00
parent f891a885bd
commit 1d4f6f9b9f
3 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java
View file

@ -113,5 +113,14 @@ public class C99CompleteParser2Tests extends CompleteParser2Tests {
//fail(); //fail();
} catch(AssertionFailedError _) { } } catch(AssertionFailedError _) { }
} }
@Override
public void testGNUASMExtension() throws Exception {
try {
super.testGNUASMExtension();
fail();
} catch(AssertionFailedError _) { }
}
} }

18
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java
View file

@ -309,24 +309,6 @@ public abstract class BuildASTParserAction {
} }
/**
* Converts the given token list to a char[] suitable for
* creating a name node. Spaces are discarded.
*/
protected static char[] tokenListToNameCharArray(List<IToken> tokens) {
StringBuilder sb = new StringBuilder(20); // longest operator name: operator delete[]
for(IToken t : tokens)
sb.append(t.toString());
int n = sb.length();
char[] cs = new char[n];
sb.getChars(0, n, cs, 0);
return cs;
}
/** /**
* Finds the tokens in the given list that are between startOffset and endOffset. * Finds the tokens in the given list that are between startOffset and endOffset.
* Note, the offsets have to be exact. * Note, the offsets have to be exact.

38
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
View file

@ -426,7 +426,9 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
public void consumeConversionName() { public void consumeConversionName() {
if(TRACE_ACTIONS) DebugUtil.printMethodTrace(); if(TRACE_ACTIONS) DebugUtil.printMethodTrace();
char[] chars = tokenListToNameCharArray(parser.getRuleTokens()); String rep = createStringRepresentation(parser.getRuleTokens());
char[] chars = rep.toCharArray();
IASTTypeId typeId = (IASTTypeId) astStack.pop(); IASTTypeId typeId = (IASTTypeId) astStack.pop();
ICPPASTConversionName name = nodeFactory.newCPPConversionName(chars, typeId); ICPPASTConversionName name = nodeFactory.newCPPConversionName(chars, typeId);
setOffsetAndLength(name); setOffsetAndLength(name);
@ -445,8 +447,7 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
public void consumeDestructorName() { public void consumeDestructorName() {
if(TRACE_ACTIONS) DebugUtil.printMethodTrace(); if(TRACE_ACTIONS) DebugUtil.printMethodTrace();
// concatenate the '~' with the identifier token char[] chars = ("~" + parser.getRightIToken()).toCharArray(); //$NON-NLS-1$
char[] chars = tokenListToNameCharArray(parser.getRuleTokens());
IASTName name = nodeFactory.newName(chars); IASTName name = nodeFactory.newName(chars);
setOffsetAndLength(name); setOffsetAndLength(name);
@ -746,19 +747,14 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
for(IASTName name : reverseIterable(names)) for(IASTName name : reverseIterable(names))
qualifiedName.addName(name); qualifiedName.addName(name);
// compute the signature, find the tokens that make up the name if(qualifiedName instanceof CPPASTQualifiedName) {
List<IToken> nameTokens = tokenOffsetSubList(parser.getRuleTokens(), startOffset, endOffset); // compute the signature, find the tokens that make up the name
StringBuilder sb = new StringBuilder(); List<IToken> nameTokens = tokenOffsetSubList(parser.getRuleTokens(), startOffset, endOffset);
IToken prev = null; String signature = createStringRepresentation(nameTokens);
for(IToken t : nameTokens) { ((CPPASTQualifiedName)qualifiedName).setSignature(signature);
if(needSpaceBetween(prev, t))
sb.append(' ');
sb.append(t.toString());
prev = t;
} }
((CPPASTQualifiedName)qualifiedName).setSignature(sb.toString());
// there must be a dummy name in the AST after the last double colon, this happens with pointer to member // there must be a dummy name in the AST after the last double colon, this happens with pointer to member names
if(endsWithColonColon) { if(endsWithColonColon) {
IASTName dummyName = nodeFactory.newName(); IASTName dummyName = nodeFactory.newName();
setOffsetAndLength(dummyName, endOffset, 0); setOffsetAndLength(dummyName, endOffset, 0);
@ -769,7 +765,21 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
} }
private static String createStringRepresentation(List<IToken> nameTokens) {
StringBuilder sb = new StringBuilder();
IToken prev = null;
for(IToken t : nameTokens) {
if(needSpaceBetween(prev, t))
sb.append(' ');
sb.append(t.toString());
prev = t;
}
return sb.toString();
}
private static boolean needSpaceBetween(IToken prev, IToken iter) { private static boolean needSpaceBetween(IToken prev, IToken iter) {
// this logic was copied from BasicTokenDuple.createCharArrayRepresentation()
if(prev == null) if(prev == null)
return false; return false;