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

Slight refactoring.

Browse source
This commit is contained in:
John Camelon 2005-01-26 16:52:57 +00:00
parent c2664b26e1
commit 7fa07edcf2
1 changed files with 55 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -557,39 +557,45 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
return EMPTY_MACRO_DEFINITIONS_ARRAY;
IASTPreprocessorMacroDefinition[] result = new IASTPreprocessorMacroDefinition[contexts
.size()];
for (int i = 0; i < contexts.size(); ++i) {
_MacroDefinition d = (_MacroDefinition) contexts.get(i);
IASTPreprocessorMacroDefinition r = null;
if (d instanceof _ObjectMacroDefinition)
r = new ASTObjectMacro();
else if (d instanceof _FunctionMacroDefinition) {
IASTPreprocessorFunctionStyleMacroDefinition f = new ASTFunctionMacro();
char[][] parms = ((_FunctionMacroDefinition) d).parms;
for (int j = 0; j < parms.length; ++j) {
if( parms[j] == null ) continue;
IASTFunctionStyleMacroParameter parm = new ASTFunctionMacroParameter();
parm.setParameter(new String(parms[j]));
f.addParameter(parm);
parm.setParent(f);
parm
.setPropertyInParent(IASTPreprocessorFunctionStyleMacroDefinition.PARAMETER);
}
r = f;
}
IASTName name = new ScannerASTName(d.name);
name.setPropertyInParent(IASTPreprocessorMacroDefinition.MACRO_NAME);
name.setParent(r);
r.setName(name);
r.setExpansion(new String(d.expansion));
((ScannerASTNode) r).setOffsetAndLength(d.context_directive_start,
d.context_directive_end - d.context_directive_start);
result[i] = r;
}
for (int i = 0; i < contexts.size(); ++i)
result[i] = createASTMacroDefinition((_MacroDefinition) contexts.get(i));
return result;
}
/**
* @param d
* @return
*/
protected IASTPreprocessorMacroDefinition createASTMacroDefinition(_MacroDefinition d) {
IASTPreprocessorMacroDefinition r = null;
if (d instanceof _ObjectMacroDefinition)
r = new ASTObjectMacro();
else if (d instanceof _FunctionMacroDefinition) {
IASTPreprocessorFunctionStyleMacroDefinition f = new ASTFunctionMacro();
char[][] parms = ((_FunctionMacroDefinition) d).parms;
for (int j = 0; j < parms.length; ++j) {
IASTFunctionStyleMacroParameter parm = new ASTFunctionMacroParameter();
parm.setParameter(new String(parms[j]));
f.addParameter(parm);
parm.setParent(f);
parm
.setPropertyInParent(IASTPreprocessorFunctionStyleMacroDefinition.PARAMETER);
}
r = f;
}
IASTName name = new ScannerASTName(d.name);
name.setPropertyInParent(IASTPreprocessorMacroDefinition.MACRO_NAME);
name.setParent(r);
r.setName(name);
r.setExpansion(new String(d.expansion));
((ScannerASTNode) r).setOffsetAndLength(d.context_directive_start,
d.context_directive_end - d.context_directive_start);
return r;
}
/*
* (non-Javadoc)
*
@ -838,7 +844,26 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
currentContext
.addSubContext(new _FunctionMacroDefinition(currentContext,
startOffset, endOffset, m.name, nameOffset, m.expansion,
m.arglist));
removeNullArguments( m.arglist)));
}
/**
* @param arglist
* @return
*/
private char [][] removeNullArguments(char[][] arglist) {
int nullCount = 0;
for (int i = 0; i < arglist.length; ++i)
if (arglist[i] == null)
++nullCount;
if (nullCount == 0)
return arglist;
char [][] old = arglist;
int newSize = old.length - nullCount;
arglist = new char [newSize][];
for (int i = 0; i < newSize; ++i)
arglist[i] = old[i];
return arglist;
}
/*