Pretty printing qualified names.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java

@@ -17,7 +17,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
 /**
  * @author jcamelon
  */
-public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedName {
+public class CPPASTQualifiedName extends CPPASTNode implements
+      ICPPASTQualifiedName {
 
    /**
     * @param duple
@@ -25,7 +26,9 @@ public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedN
    public CPPASTQualifiedName() {
    }
 
-    /* (non-Javadoc)
+   /*
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.IASTName#resolveBinding()
     */
    public IBinding resolveBinding() {
@@ -34,39 +37,26 @@ public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedN
       return names[names.length - 1].resolveBinding();
    }
 
-    
+   /*
-    
+    * (non-Javadoc)
-    /* (non-Javadoc)
+    * 
     * @see java.lang.Object#toString()
     */
    public String toString() {
-        if( names == null ) return null;
+      return signature;
-        removeNullNames();
-        StringBuffer buffer = new StringBuffer();
-        for( int i = 0; i < names.length; ++i )
-        {
-            String n = names[i].toString();
-            if( n == null ) 
-                return null;
-            buffer.append( n );
-            if( i != names.length - 1 )
-                buffer.append( "::"); //$NON-NLS-1$
-        }
-        return buffer.toString();
    }
 
-    
+   /*
-    /* (non-Javadoc)
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName#addName(org.eclipse.cdt.core.dom.ast.IASTName)
     */
    public void addName(IASTName name) {
-        if( names == null )
+      if (names == null) {
-        {
          names = new IASTName[DEFAULT_NAMES_LIST_SIZE];
          currentIndex = 0;
       }
-        if( names.length == currentIndex )
+      if (names.length == currentIndex) {
-        {
          IASTName[] old = names;
          names = new IASTName[old.length * 2];
          for (int i = 0; i < old.length; ++i)
@@ -83,7 +73,8 @@ public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedN
       for (int i = 0; i < names.length; ++i)
          if (names[i] == null)
             ++nullCount;
-        if( nullCount == 0 ) return;
+      if (nullCount == 0)
+         return;
       IASTName[] old = names;
       int newSize = old.length - nullCount;
       names = new IASTName[newSize];
@@ -96,27 +87,33 @@ public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedN
    private IASTName[]       names                   = null;
    private static final int DEFAULT_NAMES_LIST_SIZE = 4;
    private boolean          value;
+   private String           signature;
 
-    /* (non-Javadoc)
+   /*
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName#getNames()
     */
    public IASTName[] getNames() {
-        if( names == null ) return IASTName.EMPTY_NAME_ARRAY;
+      if (names == null)
+         return IASTName.EMPTY_NAME_ARRAY;
       removeNullNames();
       return names;
    }
 
-    /* (non-Javadoc)
+   /*
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.IASTName#toCharArray()
     */
    public char[] toCharArray() {
-        if( names == null ) return null;
+      if (names == null)
+         return null;
       removeNullNames();
 
       //count first
       int len = 0;
-        for( int i = 0; i < names.length; ++i )
+      for (int i = 0; i < names.length; ++i) {
-        {
          char[] n = names[i].toCharArray();
          if (n == null)
             return null;
@@ -139,19 +136,30 @@ public class CPPASTQualifiedName extends CPPASTNode implements ICPPASTQualifiedN
       return nameArray;
    }
 
-   /* (non-Javadoc)
+   /*
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName#isFullyQualified()
     */
    public boolean isFullyQualified() {
       return value;
    }
 
-   /* (non-Javadoc)
+   /*
+    * (non-Javadoc)
+    * 
     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName#setFullyQualified(boolean)
     */
    public void setFullyQualified(boolean value) {
       this.value = value;
    }
 
+   /**
+    * @param string
+    */
+   public void setValue(String string) {
+      this.signature = string;
+
+   }
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java

@@ -2486,6 +2486,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
       CPPASTQualifiedName result = new CPPASTQualifiedName();
       result.setOffsetAndLength(duple.getStartOffset(), duple.getEndOffset()
             - duple.getStartOffset());
+      result.setValue( duple.toString() );
       ITokenDuple[] segments = duple.getSegments();
       int startingValue = 0;
       if(   segments.length > 0 &&