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

Catch IndexOutOfBound

Browse source
This commit is contained in:
Alain Magloire 2004-06-03 02:57:51 +00:00
parent 1193d6341a
commit d12ebf93d3
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
View file

@ -62,7 +62,6 @@ import org.eclipse.cdt.core.parser.ast.IASTTypeSpecifierOwner;
import org.eclipse.cdt.core.parser.ast.IASTTypedefDeclaration; import org.eclipse.cdt.core.parser.ast.IASTTypedefDeclaration;
import org.eclipse.cdt.core.parser.ast.IASTVariable; import org.eclipse.cdt.core.parser.ast.IASTVariable;
import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.ParserException;
import org.eclipse.cdt.internal.core.parser.QuickParseCallback;
import org.eclipse.cdt.internal.core.parser.StructuralParseCallback; import org.eclipse.cdt.internal.core.parser.StructuralParseCallback;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
@ -77,6 +76,25 @@ public class CModelBuilder {
// indicator if the unit has parse errors // indicator if the unit has parse errors
private boolean hasNoErrors = false; private boolean hasNoErrors = false;
class ProblemCallback extends StructuralParseCallback {
IProblemRequestor problemRequestor;
public ProblemCallback(IProblemRequestor requestor) {
problemRequestor = requestor;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.QuickParseCallback#acceptProblem(org.eclipse.cdt.core.parser.IProblem)
*/
public boolean acceptProblem(IProblem problem) {
// Do not worry for now about problems in other files.
if (inclusionLevel == 0) {
problemRequestor.acceptProblem(problem);
}
return true;
}
}
public CModelBuilder(org.eclipse.cdt.internal.core.model.TranslationUnit tu) { public CModelBuilder(org.eclipse.cdt.internal.core.model.TranslationUnit tu) {
this.translationUnit = tu ; this.translationUnit = tu ;
this.newElements = new HashMap(); this.newElements = new HashMap();
@ -111,27 +129,7 @@ public class CModelBuilder {
quickParseCallback = (quickParseMode) ? ParserFactory.createQuickParseCallback() : quickParseCallback = (quickParseMode) ? ParserFactory.createQuickParseCallback() :
ParserFactory.createStructuralParseCallback(); ParserFactory.createStructuralParseCallback();
} else { } else {
if (quickParseMode) { quickParseCallback = new ProblemCallback(problemRequestor);
quickParseCallback = new QuickParseCallback() {
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.QuickParseCallback#acceptProblem(org.eclipse.cdt.core.parser.IProblem)
*/
public boolean acceptProblem(IProblem problem) {
problemRequestor.acceptProblem(problem);
return true;
}
};
} else {
quickParseCallback = new StructuralParseCallback() {
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.parser.QuickParseCallback#acceptProblem(org.eclipse.cdt.core.parser.IProblem)
*/
public boolean acceptProblem(IProblem problem) {
problemRequestor.acceptProblem(problem);
return true;
}
};
}
} }
// pick the language // pick the language

3
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java
View file

@ -54,6 +54,9 @@ class SourceManipulationInfo extends CElementInfo {
} }
} catch (IOException e) { } catch (IOException e) {
throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION); throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
} catch (StringIndexOutOfBoundsException bound) {
// This is not good we screwed up the offset some how
throw new CModelException(bound, ICModelStatusConstants.INDEX_OUT_OF_BOUNDS);
} }
} }
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$