Skip to content

Commit d4df626

Browse files
committed
'main': Optimize the unquoted arguments characterwise walker
Fixes zsh-users#730. % repeat 3 { zsh -f tests/test-zprof.zsh main | tee … | grep -w _zsh_highlight | head -n1 } 19) 1 26787.11 26787.11 100.00% 5.33 5.33 0.02% _zsh_highlight 19) 1 26900.64 26900.64 100.00% 5.45 5.45 0.02% _zsh_highlight 19) 1 26915.76 26915.76 100.00% 5.47 5.47 0.02% _zsh_highlight Merge remote-tracking branch 'danielsh/perf-argument-1-v2' * danielsh/perf-argument-1-v2: 'main': Further optimize argument parsing. 'main': Optimize a hot path. tests: Add a performance testing script, for measuring the performance of the 'main' highlighter on a large file.
2 parents b253a8b + 8f5d74d commit d4df626

File tree

2 files changed

+82
-1
lines changed

2 files changed

+82
-1
lines changed

highlighters/main/main-highlighter.zsh

+5-1
Original file line numberDiff line numberDiff line change
@@ -1311,8 +1311,12 @@ _zsh_highlight_main_highlighter_highlight_argument()
13111311
fi
13121312
esac
13131313

1314-
for (( ; i <= $#arg ; i += 1 )); do
1314+
# This loop is a hot path. Keep it fast!
1315+
(( --i ))
1316+
while (( ++i <= $#arg )); do
1317+
i=${arg[(ib.i.)[\\\'\"\`\$\<\>\*\?]]}
13151318
case "$arg[$i]" in
1319+
"") break;;
13161320
"\\") (( i += 1 )); continue;;
13171321
"'")
13181322
_zsh_highlight_main_highlighter_highlight_single_quote $i

tests/test-zprof.zsh

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#!/usr/bin/env zsh
2+
# -------------------------------------------------------------------------------------------------
3+
# Copyright (c) 2010-2015 zsh-syntax-highlighting contributors
4+
# All rights reserved.
5+
#
6+
# Redistribution and use in source and binary forms, with or without modification, are permitted
7+
# provided that the following conditions are met:
8+
#
9+
# * Redistributions of source code must retain the above copyright notice, this list of conditions
10+
# and the following disclaimer.
11+
# * Redistributions in binary form must reproduce the above copyright notice, this list of
12+
# conditions and the following disclaimer in the documentation and/or other materials provided
13+
# with the distribution.
14+
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
15+
# may be used to endorse or promote products derived from this software without specific prior
16+
# written permission.
17+
#
18+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
19+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
20+
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
21+
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
24+
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
25+
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26+
# -------------------------------------------------------------------------------------------------
27+
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
28+
# vim: ft=zsh sw=2 ts=2 et
29+
# -------------------------------------------------------------------------------------------------
30+
31+
# Load the main script.
32+
. ${0:h:h}/zsh-syntax-highlighting.zsh
33+
34+
# Activate the highlighter.
35+
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
36+
37+
source_file=0.7.1:highlighters/$1/$1-highlighter.zsh
38+
39+
# Runs a highlighting test
40+
# $1: data file
41+
run_test_internal() {
42+
setopt interactivecomments
43+
44+
local -a highlight_zone
45+
46+
local tests_tempdir="$1"; shift
47+
local srcdir="$PWD"
48+
builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! cd failed: $?"; return 1 }
49+
50+
# Load the data and prepare checking it.
51+
PREBUFFER=
52+
BUFFER=$(cd -- "$srcdir" && git cat-file blob $source_file)
53+
expected_region_highlight=()
54+
55+
zmodload zsh/zprof
56+
zprof -c
57+
# Set $? for _zsh_highlight
58+
true && _zsh_highlight
59+
zprof
60+
}
61+
62+
run_test() {
63+
# Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
64+
local __tests_tempdir
65+
__tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
66+
echo >&2 "Bail out! mktemp failed"; return 1
67+
}
68+
typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
69+
70+
{
71+
(run_test_internal "$__tests_tempdir" "$@")
72+
} always {
73+
rm -rf -- "$__tests_tempdir"
74+
}
75+
}
76+
77+
run_test

0 commit comments

Comments
 (0)