From 9bf64fd0e52136cb2c845cf0fc1cd84b24d7e644 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 11 Nov 2008 15:50:59 +0000 Subject: [PATCH] Follow up for parameter annotations, bug 254520. --- .../cdt/internal/core/pdom/dom/c/PDOMCParameter.java | 10 +++++++--- .../internal/core/pdom/dom/cpp/PDOMCPPParameter.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java index 2d2ab74f0d9..d0bf39d8ae6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java @@ -208,11 +208,15 @@ class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBinding { return null; } - protected byte encodeFlags(IParameter param) throws DOMException { + protected byte encodeFlags(IParameter param) { // C99 ISO/IEC 9899: 6.7.5.3.2 byte flags= 0; - flags |= (param.isAuto() ? 1 : 0) << PDOMCAnnotation.AUTO_OFFSET; - flags |= (param.isRegister() ? 1 : 0) << PDOMCAnnotation.REGISTER_OFFSET; + try { + flags |= (param.isAuto() ? 1 : 0) << PDOMCAnnotation.AUTO_OFFSET; + flags |= (param.isRegister() ? 1 : 0) << PDOMCAnnotation.REGISTER_OFFSET; + } catch (DOMException e) { + // ignore and miss out on some flags + } return flags; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java index 25e33d0a39f..5b9deeced08 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java @@ -118,7 +118,7 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind byte annotations = PDOMCPPAnnotation.encodeAnnotation(param); db.putByte(record + ANNOTATIONS, annotations); } catch (DOMException e) { - throw new CoreException(Util.createStatus(e)); + // ignore and miss out on some properties of the parameter } }