Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2008-04-10 12:27:51 +0000
committerMarkus Schorn2008-04-10 12:27:51 +0000
commitbac604f82e54690bb0b3aadb0c6ab9185b9f1cf8 (patch)
tree9894f604e1fb8566fa1bb1b54896ccd0b0dba53b /core/org.eclipse.cdt.core/parser
parent3c104b3f4c70dbd30b6129567fe3e17ade0b0b9c (diff)
downloadorg.eclipse.cdt-bac604f82e54690bb0b3aadb0c6ab9185b9f1cf8.tar.gz
org.eclipse.cdt-bac604f82e54690bb0b3aadb0c6ab9185b9f1cf8.tar.xz
org.eclipse.cdt-bac604f82e54690bb0b3aadb0c6ab9185b9f1cf8.zip
Differentiating typeid-nodes from typeof-nodes.
Diffstat (limited to 'core/org.eclipse.cdt.core/parser')
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java30
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java13
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java15
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java28
4 files changed, 51 insertions, 35 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java
index 773d97af27c..2401e0fc5bf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java
@@ -1,12 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * IBM Rational Software - Initial API and implementation
+ * IBM Rational Software - Initial API and implementation
+ * Markus Schorn (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.core.dom.ast;
@@ -21,9 +22,28 @@ public interface IASTTypeIdExpression extends IASTExpression {
public static final int op_sizeof = 0;
/**
- * <code>op_last</code> defined for sub-interfaces to extend.
+ * For c++, only.
*/
- public static final int op_last = op_sizeof;
+ public static final int op_typeid = 1;
+
+ /**
+ * For gnu-parsers, only.
+ * <code>op_alignOf</code> is used for __alignOf( typeId ) type expressions.
+ */
+ public static final int op_alignof = 2;
+
+ /**
+ * For gnu-parsers, only.
+ * <code>op_typeof</code> is used for typeof( typeId ) type expressions.
+ */
+ public static final int op_typeof = 3;
+
+ /**
+ * @deprecated constants should be declared here, to avoid using the same constant in different
+ * interfaces.
+ */
+ @Deprecated
+ public static final int op_last = op_alignof;
/**
* Get the operator for the expression.
@@ -52,8 +72,6 @@ public interface IASTTypeIdExpression extends IASTExpression {
/**
* Get the type Id.
- *
- * @return
*/
public IASTTypeId getTypeId();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
index 1e8e12560b9..d4f2a5a7472 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
@@ -1,12 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * IBM - Initial API and implementation
+ * IBM - Initial API and implementation
+ * Markus Schorn (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.core.dom.ast.cpp;
@@ -17,7 +18,11 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
*/
public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression {
- public static final int op_typeid = IASTTypeIdExpression.op_last + 1;
+ public static final int op_typeid = IASTTypeIdExpression.op_typeid;
- public static final int op_last = op_typeid;
+ /**
+ * @deprecated all constants should be declared in {@link IASTTypeIdExpression}
+ */
+ @Deprecated
+ public static final int op_last = IASTTypeIdExpression.op_last;
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
index 7661cd0a0e1..6fd689c21c6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
@@ -1,12 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * IBM Rational Software - Initial API and implementation
+ * IBM Rational Software - Initial API and implementation
+ * Markus Schorn (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.core.dom.ast.gnu;
@@ -23,17 +24,17 @@ public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression {
/**
* <code>op_typeof</code> is used for typeof( typeId ) type expressions.
*/
- public static final int op_typeof = IASTTypeIdExpression.op_last + 1;
+ public static final int op_typeof = IASTTypeIdExpression.op_typeof;
/**
* <code>op_alignOf</code> is used for __alignOf( typeId ) type
* expressions.
*/
- public static final int op_alignof = IASTTypeIdExpression.op_last + 2;
+ public static final int op_alignof = IASTTypeIdExpression.op_alignof;
/**
- * <code>op_last</code> is available for sub-interfaces.
+ * @deprecated all constants must be declared in {@link IASTTypeIdExpression}
*/
- public static final int op_last = op_alignof;
-
+ @Deprecated
+ public static final int op_last = IASTTypeIdExpression.op_last;
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
index a94d431d54f..b0638bbb40d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ExpressionWriter.java
@@ -568,24 +568,16 @@ public class ExpressionWriter extends NodeWriter{
}
private String getTypeIdExp(IASTTypeIdExpression typeIdExp) {
- int type = typeIdExp.getOperator();
- if (type <= IASTTypeIdExpression.op_last) {
- if(type == IASTTypeIdExpression.op_sizeof) {
- return SIZEOF_OP + "("; //$NON-NLS-1$
- }
- }else {
- if (typeIdExp instanceof ICPPASTTypeIdExpression) {
- if(type == ICPPASTTypeIdExpression.op_typeid) {
- return TYPEID_OP;
- }
- }else if (typeIdExp instanceof IGNUASTTypeIdExpression) {
- switch (type) {//TODO HSR Emanuel: check if there can't be GNUTypeIdExpressions here, see #162470
- case IGNUASTTypeIdExpression.op_alignof:
- return ALIGNOF_OP + "("; //$NON-NLS-1$
- case IGNUASTTypeIdExpression.op_typeof:
- return TYPEOF_OP;
- }
- }
+ final int type = typeIdExp.getOperator();
+ switch(type) {
+ case IASTTypeIdExpression.op_sizeof:
+ return SIZEOF_OP + "("; //$NON-NLS-1$
+ case ICPPASTTypeIdExpression.op_typeid:
+ return TYPEID_OP;
+ case IGNUASTTypeIdExpression.op_alignof:
+ return ALIGNOF_OP + "("; //$NON-NLS-1$
+ case IGNUASTTypeIdExpression.op_typeof:
+ return TYPEOF_OP;
}
throw new IllegalArgumentException("Unknown TypeId Type"); //$NON-NLS-1$
}

Back to the top