From ed9a85d9b7e011130223773af75892e34f5345a1 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Sun, 25 May 2003 02:30:12 +0000
Subject: [PATCH] Call ptype as a fallback

---
 .../cdt/debug/mi/core/cdi/model/Variable.java | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java
index d6150ffb097..90c5f431195 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java
@@ -8,6 +8,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDIVariableManager;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame;
+import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;
 import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType;
@@ -169,11 +170,11 @@ public class Variable extends CObject implements ICDIVariable {
 				//value = new FunctionValue(this);
 				value = new Value(this);
 			} else if (t instanceof ICDIPointerType) {
-				((ICDIPointerType)t).getComponentType();
+				//((ICDIPointerType)t).getComponentType();
 				//value = new PointerValue(this);
 				value = new Value(this);
 			} else if (t instanceof ICDIArrayType) {
-				((ICDIArrayType)t).getComponentType();
+				//((ICDIArrayType)t).getComponentType();
 				//value = new ArrayValue(this);
 				value = new Value(this);
 			} else if (t instanceof ICDIStructType) {
@@ -285,20 +286,22 @@ public class Variable extends CObject implements ICDIVariable {
 	 */
 	public ICDIType getType() throws CDIException {
 		if (type == null) {
-			Session session = (Session)(getTarget().getSession());
+			ICDITarget target = getTarget();
+			Session session = (Session)(target.getSession());
 			SourceManager sourceMgr = (SourceManager)session.getSourceManager();
 			String typename = getTypeName();
 			try {
-				type = sourceMgr.getType(getTarget(), typename);
+				type = sourceMgr.getType(target, typename);
 			} catch (CDIException e) {
-				type = new IncompleteType(getTarget(), typename);
-//				// Try after ptype.
-//				String ptype = sourceMgr.getDetailTypeName(typename);
-//				try {
-//					type = sourceMgr.getType(ptype);
-//				} catch (CDIException ex) {
-//					type = new IncompleteType(typename);
-//				}
+				// Try with ptype.
+				try {
+					String ptype = sourceMgr.getDetailTypeName(typename);
+					type = sourceMgr.getType(target, ptype);
+				} catch (CDIException ex) {
+				}
+			}
+			if (type == null) {
+				type = new IncompleteType(target, typename);
 			}
 		}
 		return type;