From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#16526: 24.3.50; scroll-conservatively & c-mode regression Date: Fri, 04 Jul 2014 15:43:02 -0400 Message-ID: References: <53AFE536.7010407@gmx.at> <20140629124829.GC2948@acm.acm> <53B02042.1050107@gmx.at> <20140629144151.GD2948@acm.acm> <53B03876.9070307@gmx.at> <20140629174953.GE2948@acm.acm> <53B117D6.1050306@gmx.at> <20140702200522.GB3823@acm.acm> <20140704182709.GA3535@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1404503079 23559 80.91.229.3 (4 Jul 2014 19:44:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Jul 2014 19:44:39 +0000 (UTC) Cc: 16526@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 04 21:44:32 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X39PM-0006MB-02 for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Jul 2014 21:44:32 +0200 Original-Received: from localhost ([::1]:37878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X39PL-00088O-Ls for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Jul 2014 15:44:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X39P9-0007yx-9i for bug-gnu-emacs@gnu.org; Fri, 04 Jul 2014 15:44:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X39P0-0000pI-UI for bug-gnu-emacs@gnu.org; Fri, 04 Jul 2014 15:44:19 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X39Os-0000oY-4q; Fri, 04 Jul 2014 15:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1X39Or-00026c-MR; Fri, 04 Jul 2014 15:44:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Fri, 04 Jul 2014 19:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16526 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: Original-Received: via spool by 16526-submit@debbugs.gnu.org id=B16526.14045030108043 (code B ref 16526); Fri, 04 Jul 2014 19:44:01 +0000 Original-Received: (at 16526) by debbugs.gnu.org; 4 Jul 2014 19:43:30 +0000 Original-Received: from localhost ([127.0.0.1]:43135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X39OM-00025f-3m for submit@debbugs.gnu.org; Fri, 04 Jul 2014 15:43:30 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:46606) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X39OI-00025U-Fi for 16526@debbugs.gnu.org; Fri, 04 Jul 2014 15:43:27 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 33BF184EBA; Fri, 4 Jul 2014 15:43:26 -0400 (EDT) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 142FF1E5B74; Fri, 4 Jul 2014 15:43:03 -0400 (EDT) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id E3AB3B4167; Fri, 4 Jul 2014 15:43:02 -0400 (EDT) In-Reply-To: <20140704182709.GA3535@acm.acm> (Alan Mackenzie's message of "Fri, 4 Jul 2014 18:27:09 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:91191 Archived-At: > I'm not sure what I'm meant to see, but it has made no perceptible > difference to the "slow" invocation of scan-lists. In particular, that > invocation took 0.7196781635284424 seconds with the patch, which is > "exactly" (near enough) what it took before. OK, the initialization needs to be after the "lossage:" label, of course. Try the patch below instead, Stefan === modified file 'src/syntax.c' --- src/syntax.c 2014-02-08 05:12:47 +0000 +++ src/syntax.c 2014-07-04 19:42:50 +0000 @@ -530,17 +530,6 @@ { ptrdiff_t opoint = PT, opoint_byte = PT_BYTE; - if (!open_paren_in_column_0_is_defun_start) - { - find_start_value = BEGV; - find_start_value_byte = BEGV_BYTE; - find_start_buffer = current_buffer; - find_start_modiff = MODIFF; - find_start_begv = BEGV; - find_start_pos = pos; - return BEGV; - } - /* Use previous finding, if it's valid and applies to this inquiry. */ if (current_buffer == find_start_buffer /* Reuse the defun-start even if POS is a little farther on. @@ -550,7 +539,20 @@ && pos >= find_start_value && BEGV == find_start_begv && MODIFF == find_start_modiff) + { + if (!open_paren_in_column_0_is_defun_start) + fprintf (stderr, "Optimized lossage by %d (%d%%)!\n", + find_start_value - BEGV, + 100 * (find_start_value - BEGV) / (pos - BEGV)); return find_start_value; + } + + if (!open_paren_in_column_0_is_defun_start) + { + find_start_value = BEGV; + find_start_value_byte = BEGV_BYTE; + goto found; + } /* Back up to start of line. */ scan_newline (pos, pos_byte, BEGV, BEGV_BYTE, -1, 1); @@ -582,13 +584,14 @@ /* Record what we found, for the next try. */ find_start_value = PT; find_start_value_byte = PT_BYTE; + TEMP_SET_PT_BOTH (opoint, opoint_byte); + + found: find_start_buffer = current_buffer; find_start_modiff = MODIFF; find_start_begv = BEGV; find_start_pos = pos; - TEMP_SET_PT_BOTH (opoint, opoint_byte); - return find_start_value; } @@ -841,7 +844,9 @@ else { struct lisp_parse_state state; + bool adjusted; lossage: + adjusted = false; /* We had two kinds of string delimiters mixed up together. Decode this going forwards. Scan fwd from a known safe place (beginning-of-defun) @@ -852,6 +857,8 @@ { defun_start = find_defun_start (comment_end, comment_end_byte); defun_start_byte = find_start_value_byte; + if (defun_start != BEGV) + adjusted = true; } do { @@ -860,6 +867,16 @@ comment_end, TYPE_MINIMUM (EMACS_INT), 0, Qnil, 0); defun_start = comment_end; + if (!adjusted) + { + adjusted = true; + find_start_value + = CONSP (state.levelstarts) ? XINT (XCAR (state.levelstarts)) + : state.thislevelstart >= 0 ? state.thislevelstart + : find_start_value; + find_start_value_byte = CHAR_TO_BYTE (find_start_value); + } + if (state.incomment == (comnested ? 1 : -1) && state.comstyle == comstyle) from = state.comstr_start;