From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: RFR cc-langs.el: change syntax for @ in Java Date: Thu, 8 Apr 2021 10:15:31 +0000 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25801"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Apr 08 12:17:21 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lURiy-0006RQ-Uo for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Apr 2021 12:17:20 +0200 Original-Received: from localhost ([::1]:54614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lURiy-00081y-0Z for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Apr 2021 06:17:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lURhM-00066e-CZ for emacs-devel@gnu.org; Thu, 08 Apr 2021 06:15:40 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:34979 helo=mail.muc.de) by eggs.gnu.org with smtp (Exim 4.90_1) (envelope-from ) id 1lURhG-00016w-T7 for emacs-devel@gnu.org; Thu, 08 Apr 2021 06:15:40 -0400 Original-Received: (qmail 21018 invoked by uid 3782); 8 Apr 2021 10:15:32 -0000 Original-Received: from acm.muc.de (p4fe15b29.dip0.t-ipconnect.de [79.225.91.41]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Thu, 08 Apr 2021 12:15:31 +0200 Original-Received: (qmail 4700 invoked by uid 1000); 8 Apr 2021 10:15:31 -0000 Content-Disposition: inline In-Reply-To: X-Submission-Agent: TMDA/1.3.x (Ph3nix) X-Primary-Address: acm@muc.de Received-SPF: pass client-ip=193.149.48.1; envelope-from=acm@muc.de; helo=mail.muc.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:267605 Archived-At: Hello again, Filipp On Wed, Apr 07, 2021 at 23:41:09 +0300, Filipp Gunbin wrote: > Hi Alan, are you ok if I make this small change? Prefix is better > syntax for @ in Java, because it just denotes that the following is > an annotation interface name (but is not part of it). I've just run the CC Mode test suite with this amendment, and it produces the following successes on annotations-1.java: annotations-1.java:4: Expected analysis ((inclass 1) (topmost-intro 21)), got ((inclass 21) (topmost-intro 21)) annotations-1.java:4: Expected indentation 0, got 32 annotations-1.java:5: Expected analysis ((class-close 1)), got ((class-close 21)) .. So, there are things to sort out before we can apply the change. Again, what's the reason for this change? There must be a test case where the current CC Mode handles some Java source code badly. > Thanks. > Filipp > diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el > index fa4e73087e..e2c1c6099f 100644 > --- a/lisp/progmodes/cc-langs.el > +++ b/lisp/progmodes/cc-langs.el > @@ -378,12 +378,14 @@ c-make-mode-syntax-table > (let ((table (make-syntax-table))) > (c-populate-syntax-table table) > ;; Mode specific syntaxes. > - ,(cond ((or (c-major-mode-is 'objc-mode) (c-major-mode-is 'java-mode)) > + ,(cond ((c-major-mode-is 'objc-mode) > ;; Let '@' be part of symbols in ObjC to cope with > ;; its compiler directives as single keyword tokens. > ;; This is then necessary since it's assumed that > ;; every keyword is a single symbol. > '(modify-syntax-entry ?@ "_" table)) > + ((c-major-mode-is 'java-mode) > + '(modify-syntax-entry ?@ "'" table)) > ((c-major-mode-is 'pike-mode) > '(modify-syntax-entry ?@ "." table))) > table))) -- Alan Mackenzie (Nuremberg, Germany).