Differentiating typeid-nodes from typeof-nodes.

1 files changed, 10 insertions, 18 deletions

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$
 	}