From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-35735-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 14248 invoked by alias); 10 Sep 2004 20:12:53 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 14230 invoked from network); 10 Sep 2004 20:12:51 -0000
Received: from unknown (HELO mx1.redhat.com) (66.187.233.31)
  by sourceware.org with SMTP; 10 Sep 2004 20:12:51 -0000
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11/8.12.10) with ESMTP id i8AKCmbq015311
	for <gdb-patches@sources.redhat.com>; Fri, 10 Sep 2004 16:12:48 -0400
Received: from zenia.home.redhat.com (porkchop.devel.redhat.com [172.16.58.2])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i8AKCk321193;
	Fri, 10 Sep 2004 16:12:47 -0400
To: Jeff Johnston <jjohnstn@redhat.com>
Cc: Daniel Jacobowitz <drow@false.org>, gdb-patches@sources.redhat.com
Subject: Re: [RFA]: Java Inferior Call Take 3
References: <40A9264C.4060404@redhat.com>
	<20040617030603.GC23443@nevyn.them.org> <40D20494.2020608@redhat.com>
	<20040619235857.GA18759@nevyn.them.org>
	<16598.64375.217285.743094@cuddles.cambridge.redhat.com>
	<16601.25623.949217.642524@cuddles.cambridge.redhat.com>
	<20040623134742.GA24612@nevyn.them.org> <40D9FC3B.3030700@redhat.com>
	<20040623230138.GA6426@nevyn.them.org> <40EB1DDD.4070603@redhat.com>
	<20040816203502.GB14885@nevyn.them.org> <412B8EA3.3090406@redhat.com>
	<vt2r7pm3844.fsf@zenia.home> <4140EA35.9080009@redhat.com>
From: Jim Blandy <jimb@redhat.com>
Date: Fri, 10 Sep 2004 20:12:00 -0000
In-Reply-To: <4140EA35.9080009@redhat.com>
Message-ID: <vt24qm5opc9.fsf@zenia.home>
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2004-09/txt/msg00173.txt.bz2


Jeff Johnston <jjohnstn@redhat.com> writes:
> Ok.  How about the following revised patch which modifies
> typename_concat as suggested above plus incorporates your other
> comments?

Great --- thanks for revising this.

> @@ -1599,7 +1601,11 @@ partial_die_full_name (struct partial_di
>    if (parent_scope == NULL)
>      return NULL;
>    else
> -    return concat (parent_scope, "::", pdi->name, NULL);
> +    {
> +      if (cu->language == language_java)
> +	return concat (parent_scope, ".", pdi->name, NULL);
> +      return concat (parent_scope, "::", pdi->name, NULL);
> +    }
>  }
>  
>  static void

Any reason we're not using typename_concat here, too?

> @@ -3877,7 +3891,10 @@ read_namespace (struct die_info *die, st
>        char *temp_name = alloca (strlen (previous_prefix)
>  				+ 2 + strlen(name) + 1);
>        strcpy (temp_name, previous_prefix);
> -      strcat (temp_name, "::");
> +      if (cu->language == language_java)
> +	strcat (temp_name, ".");
> +      else
> +	strcat (temp_name, "::");
>        strcat (temp_name, name);
>  
>        processing_current_prefix = temp_name;

Here, too.  I guess you'll need to add a cleanup to free it, since
typename_concat can't use alloca.