2016-10-09 07:06:50 +00:00
# -------------------------------------------------------------------------------------------------
# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
2016-10-15 09:34:04 +00:00
# Copyright (c) 2016 Sebastian Gniazdowski (modifications)
2016-10-09 07:06:50 +00:00
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted
# provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this list of conditions
# and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice, this list of
# conditions and the following disclaimer in the documentation and/or other materials provided
# with the distribution.
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
# may be used to endorse or promote products derived from this software without specific prior
# written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# -------------------------------------------------------------------------------------------------
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
# vim: ft=zsh sw=2 ts=2 et
# -------------------------------------------------------------------------------------------------
2016-10-09 07:31:00 +00:00
typeset -gA __hsmw_highlight_main__command_type_cache
2016-10-09 07:06:50 +00:00
# Define default styles.
2016-10-09 07:24:03 +00:00
typeset -gA HSMW_HIGHLIGHT_STYLES
: ${HSMW_HIGHLIGHT_STYLES[default]:=none}
: ${HSMW_HIGHLIGHT_STYLES[unknown-token]:=fg=red,bold}
: ${HSMW_HIGHLIGHT_STYLES[reserved-word]:=fg=yellow}
: ${HSMW_HIGHLIGHT_STYLES[alias]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[suffix-alias]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[builtin]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[function]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[command]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[precommand]:=fg=green}
: ${HSMW_HIGHLIGHT_STYLES[commandseparator]:=none}
: ${HSMW_HIGHLIGHT_STYLES[hashed-command]:=fg=green}
2016-10-11 06:47:30 +00:00
: ${HSMW_HIGHLIGHT_STYLES[path]:=fg=magenta}
2016-10-09 07:24:03 +00:00
: ${HSMW_HIGHLIGHT_STYLES[path_pathseparator]:=}
2016-10-11 06:47:30 +00:00
: ${HSMW_HIGHLIGHT_STYLES[path_prefix]:=fg=magenta}
2016-10-09 07:24:03 +00:00
: ${HSMW_HIGHLIGHT_STYLES[path_prefix_pathseparator]:=}
2016-10-11 06:23:43 +00:00
: ${HSMW_HIGHLIGHT_STYLES[globbing]:=fg=blue,bold}
: ${HSMW_HIGHLIGHT_STYLES[history-expansion]:=fg=blue,bold}
2016-10-09 07:24:03 +00:00
: ${HSMW_HIGHLIGHT_STYLES[single-hyphen-option]:=none}
: ${HSMW_HIGHLIGHT_STYLES[double-hyphen-option]:=none}
: ${HSMW_HIGHLIGHT_STYLES[back-quoted-argument]:=none}
: ${HSMW_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow}
: ${HSMW_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow}
: ${HSMW_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow}
2016-10-16 12:54:36 +00:00
: ${HSMW_HIGHLIGHT_STYLES[back-or-dollar-double-quoted-argument]:=fg=cyan}
2016-10-09 07:24:03 +00:00
: ${HSMW_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
: ${HSMW_HIGHLIGHT_STYLES[assign]:=none}
: ${HSMW_HIGHLIGHT_STYLES[redirection]:=none}
: ${HSMW_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
2016-10-09 07:06:50 +00:00
*highlight: Optimization – a hash of token types instead of 3 arrays
./parse -oo, before changes:
Running time: 2.0874240000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2079,89 5,94 100,00% 1591,12 4,55 76,50% -hsmw-highlight-process
2) 2800 342,91 0,12 16,49% 342,91 0,12 16,49% -hsmw-highlight-string
3) 2450 85,09 0,03 4,09% 85,09 0,03 4,09% -hsmw-highlight-check-path
4) 1400 42,54 0,03 2,05% 42,54 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,48% 9,98 0,03 0,48% -hsmw-highlight-stack-pop
6) 350 8,24 0,02 0,40% 8,24 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
./parse -oo, after changes:
Running time: 1.9223140000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1914,66 5,47 100,00% 1435,29 4,10 74,96% -hsmw-highlight-process
2) 2800 340,12 0,12 17,76% 340,12 0,12 17,76% -hsmw-highlight-string
3) 2450 81,34 0,03 4,25% 81,34 0,03 4,25% -hsmw-highlight-check-path
4) 1400 39,98 0,03 2,09% 39,98 0,03 2,09% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,52% 9,87 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,05 0,02 0,42% 8,05 0,02 0,42% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:08:23 +00:00
2016-10-25 14:05:51 +00:00
typeset -gA __HSMW_HIGHLIGHT_TOKENS_TYPES
*highlight: Optimization – a hash of token types instead of 3 arrays
./parse -oo, before changes:
Running time: 2.0874240000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2079,89 5,94 100,00% 1591,12 4,55 76,50% -hsmw-highlight-process
2) 2800 342,91 0,12 16,49% 342,91 0,12 16,49% -hsmw-highlight-string
3) 2450 85,09 0,03 4,09% 85,09 0,03 4,09% -hsmw-highlight-check-path
4) 1400 42,54 0,03 2,05% 42,54 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,48% 9,98 0,03 0,48% -hsmw-highlight-stack-pop
6) 350 8,24 0,02 0,40% 8,24 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
./parse -oo, after changes:
Running time: 1.9223140000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1914,66 5,47 100,00% 1435,29 4,10 74,96% -hsmw-highlight-process
2) 2800 340,12 0,12 17,76% 340,12 0,12 17,76% -hsmw-highlight-string
3) 2450 81,34 0,03 4,25% 81,34 0,03 4,25% -hsmw-highlight-check-path
4) 1400 39,98 0,03 2,09% 39,98 0,03 2,09% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,52% 9,87 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,05 0,02 0,42% 8,05 0,02 0,42% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:08:23 +00:00
__HSMW_HIGHLIGHT_TOKENS_TYPES=(
# Precommand
'builtin' 1
'command' 1
'exec' 1
'nocorrect' 1
'noglob' 1
'pkexec' 1 # immune to #121 because it's usually not passed --option flags
# Control flow
# Tokens that, at (naively-determined) "command position", are followed by
# a de jure command position. All of these are reserved words.
$'\x7b' 2 # block
$'\x28' 2 # subshell
'()' 2 # anonymous function
'while' 2
'until' 2
'if' 2
'then' 2
'elif' 2
'else' 2
'do' 2
'time' 2
'coproc' 2
'!' 2 # reserved word; unrelated to $histchars[1]
# Command separators
'|' 3
'||' 3
';' 3
'&' 3
'&&' 3
'|&' 3
'&!' 3
'&|' 3
# ### 'case' syntax, but followed by a pattern, not by a command
# ';;' ';&' ';|'
)
2016-10-09 07:06:50 +00:00
# Get the type of a command.
#
# Uses the zsh/parameter module if available to avoid forks, and a
# wrapper around 'type -w' as fallback.
#
# Takes a single argument.
#
# The result will be stored in REPLY.
2016-10-09 07:31:00 +00:00
-hsmw-highlight-main-type() {
if (( $+__hsmw_highlight_main__command_type_cache )); then
REPLY=$__hsmw_highlight_main__command_type_cache[(e)$1]
2016-10-09 07:06:50 +00:00
if [[ -n "$REPLY" ]]; then
return
fi
fi
if (( $#options_to_set )); then
2016-10-16 06:39:33 +00:00
setopt localoptions "${options_to_set[@]}"
2016-10-09 07:06:50 +00:00
fi
unset REPLY
if zmodload -e zsh/parameter; then
2016-10-15 13:42:27 +00:00
if (( $+commands[(e)$1] )); then
REPLY=command
elif (( $+builtins[(e)$1] )); then
REPLY=builtin
elif (( $+aliases[(e)$1] )); then
2016-10-09 07:06:50 +00:00
REPLY=alias
2016-10-15 13:42:27 +00:00
elif (( $+functions[(e)$1] )); then
REPLY=function
2016-10-09 07:06:50 +00:00
elif (( $+saliases[(e)${1##*.}] )); then
REPLY='suffix alias'
elif (( $reswords[(Ie)$1] )); then
REPLY=reserved
# zsh 5.2 and older have a bug whereby running 'type -w ./sudo' implicitly
# runs 'hash ./sudo=/usr/local/bin/./sudo' (assuming /usr/local/bin/sudo
# exists and is in $PATH). Avoid triggering the bug, at the expense of
# falling through to the $() below, incurring a fork. (Issue #354.)
#
# The second disjunct mimics the isrelative() C call from the zsh bug.
elif { [[ $1 != */* ]] || is-at-least 5.3 } &&
! builtin type -w -- $1 >/dev/null 2>&1; then
REPLY=none
fi
fi
if ! (( $+REPLY )); then
REPLY="${$(LC_ALL=C builtin type -w -- $1 2>/dev/null)#*: }"
fi
2016-10-09 07:31:00 +00:00
if (( $+__hsmw_highlight_main__command_type_cache )); then
__hsmw_highlight_main__command_type_cache[(e)$1]=$REPLY
2016-10-09 07:06:50 +00:00
fi
}
# Resolve alias.
#
# Takes a single argument.
#
# The result will be stored in REPLY.
2016-10-09 07:52:50 +00:00
-hsmw-highlight-resolve-alias() {
2016-10-09 07:06:50 +00:00
if zmodload -e zsh/parameter; then
REPLY=${aliases[$arg]}
else
REPLY="${"$(alias -- $arg)"#*=}"
fi
}
# Check that the top of $braces_stack has the expected value. If it does, set
# the style according to $2; otherwise, set style=unknown-token.
#
# $1: character expected to be at the top of $braces_stack
# $2: assignment to execute it if matches
2016-10-09 07:52:50 +00:00
-hsmw-highlight-stack-pop() {
2016-10-09 07:06:50 +00:00
if [[ $braces_stack[1] == $1 ]]; then
braces_stack=${braces_stack:1}
eval "$2"
else
style=unknown-token
fi
}
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
# Below are variables that must be defined in outer
# scope so that they are reachable in *-process()
#
# local right_brace_is_recognised_everywhere
# integer path_dirs_was_set
# integer multi_func_def
# integer ointeractive_comments
-hsmw-highlight-fill-option-variables() {
2016-10-09 07:06:50 +00:00
if [[ -o ignore_braces ]] || eval '[[ -o ignore_close_braces ]] 2>/dev/null'; then
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
right_brace_is_recognised_everywhere=0
2016-10-09 07:06:50 +00:00
else
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
right_brace_is_recognised_everywhere=1
2016-10-09 07:06:50 +00:00
fi
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
2016-10-09 07:06:50 +00:00
if [[ -o path_dirs ]]; then
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
path_dirs_was_set=1
2016-10-09 07:06:50 +00:00
else
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
path_dirs_was_set=0
2016-10-09 07:06:50 +00:00
fi
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
2016-10-09 07:06:50 +00:00
if [[ -o multi_func_def ]]; then
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
multi_func_def=1
else
multi_func_def=0
fi
if [[ -o interactive_comments ]]; then
ointeractive_comments=1
2016-10-09 07:06:50 +00:00
else
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
ointeractive_comments=0
2016-10-09 07:06:50 +00:00
fi
*highlight: Optimization – save options outside main highlighting fun
Lower 18xx are being seen, like below:
Running time: 1.8632000000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1855,72 5,30 100,00% 1376,89 3,93 74,19% -hsmw-highlight-process
2) 2800 342,38 0,12 18,45% 342,38 0,12 18,45% -hsmw-highlight-string
3) 2450 80,16 0,03 4,32% 80,16 0,03 4,32% -hsmw-highlight-check-path
4) 1400 38,99 0,03 2,10% 38,99 0,03 2,10% -hsmw-highlight-main-type
5) 350 9,83 0,03 0,53% 9,83 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,47 0,02 0,40% 7,47 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:17:39 +00:00
}
# Main syntax highlighting function.
-hsmw-highlight-process()
{
(( ointeractive_comments )) && local interactive_comments= # _set_ to empty
2016-10-09 07:06:50 +00:00
emulate -L zsh
2016-10-17 05:28:26 +00:00
setopt localoptions extendedglob bareglobqual nonomatch noksharrays
2016-10-09 07:06:50 +00:00
*highlight: Optimization: reuse "local", etc. keywords
./parse -oo, after changes:
Running time: 1.8522630000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1844,79 5,27 100,00% 1368,04 3,91 74,15% -hsmw-highlight-process
2) 2800 338,28 0,12 18,34% 338,28 0,12 18,34% -hsmw-highlight-string
3) 2450 81,31 0,03 4,41% 81,31 0,03 4,41% -hsmw-highlight-check-path
4) 1400 39,39 0,03 2,14% 39,39 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,81 0,03 0,53% 9,81 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,95 0,02 0,43% 7,95 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:37:38 +00:00
# Variable declarations and initializations
# in_array_assignment true between 'a=(' and the matching ')'
# braces_stack: "R" for round, "Q" for square, "Y" for curly
local start_pos=0 end_pos highlight_glob=1 arg style in_array_assignment=0 MATCH expanded_path braces_stack
# arg_type can be 0, 1, 2 or 3, i.e. precommand, control flow, command separator
integer arg_type=0 MBEGIN MEND in_redirection
local -a options_to_set match mbegin mend
2016-10-09 07:24:03 +00:00
local buf="$1"
2016-10-09 07:06:50 +00:00
integer len="${#buf}"
2016-10-25 14:21:33 +00:00
(( path_dirs_was_set )) && options_to_set+=( PATH_DIRS )
2016-10-09 07:06:50 +00:00
# State machine
#
# The states are:
# - :start: Command word
# - :sudo_opt: A leading-dash option to sudo (such as "-u" or "-i")
# - :sudo_arg: The argument to a sudo leading-dash option that takes one,
# when given as a separate word; i.e., "foo" in "-u foo" (two
# words) but not in "-ufoo" (one word).
# - :regular: "Not a command word", and command delimiters are permitted.
# Mainly used to detect premature termination of commands.
# - :always: The word 'always' in the «{ foo } always { bar }» syntax.
#
# When the kind of a word is not yet known, $this_word / $next_word may contain
# multiple states. For example, after "sudo -i", the next word may be either
# another --flag or a command name, hence the state would include both :start:
# and :sudo_opt:.
#
# The tokens are always added with both leading and trailing colons to serve as
# word delimiters (an improvised array); [[ $x == *:foo:* ]] and x=${x//:foo:/}
# will DTRT regardless of how many elements or repetitions $x has..
#
# Handling of redirections: upon seeing a redirection token, we must stall
# the current state --- that is, the value of $this_word --- for two iterations
# (one for the redirection operator, one for the word following it representing
# the redirection target). Therefore, we set $in_redirection to 2 upon seeing a
# redirection operator, decrement it each iteration, and stall the current state
# when it is non-zero. Thus, upon reaching the next word (the one that follows
# the redirection operator and target), $this_word will still contain values
# appropriate for the word immediately following the word that preceded the
# redirection operator.
#
# The "the previous word was a redirection operator" state is not communicated
# to the next iteration via $next_word/$this_word as usual, but via
# $in_redirection. The value of $next_word from the iteration that processed
# the operator is discarded.
#
2016-10-15 17:12:40 +00:00
integer BIT_start=1 BIT_regular=2 BIT_sudo_opt=4 BIT_sudo_arg=8 BIT_always=16
*highlight: Don't redefine already_added, don't set it for comments
parse.zsh -oo, after changes:
Running time: 1.8225100000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1814,83 5,19 99,99% 1336,69 3,82 73,65% -hsmw-highlight-process
2) 2800 338,83 0,12 18,67% 338,83 0,12 18,67% -hsmw-highlight-string
3) 2450 81,75 0,03 4,50% 81,75 0,03 4,50% -hsmw-highlight-check-path
4) 1400 39,80 0,03 2,19% 39,80 0,03 2,19% -hsmw-highlight-main-type
5) 350 9,74 0,03 0,54% 9,74 0,03 0,54% -hsmw-highlight-stack-pop
6) 350 8,02 0,02 0,44% 8,02 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,10 0,10 0,01% 0,10 0,10 0,01% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:58:55 +00:00
integer this_word=BIT_start next_word=0 already_added
2016-10-15 17:12:40 +00:00
2016-10-09 07:06:50 +00:00
# Processing buffer
local proc_buf="$buf"
for arg in ${interactive_comments-${(z)buf}} \
${interactive_comments+${(zZ+c+)buf}}; do
*highlight: Optimization: compress in_redirection-related code
parse.zsh -oo, after changes:
Running time: 1.8488320000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1841,21 5,26 99,99% 1364,52 3,90 74,10% -hsmw-highlight-process
2) 2800 336,95 0,12 18,30% 336,95 0,12 18,30% -hsmw-highlight-string
3) 2450 81,13 0,03 4,41% 81,13 0,03 4,41% -hsmw-highlight-check-path
4) 1400 40,74 0,03 2,21% 40,74 0,03 2,21% -hsmw-highlight-main-type
5) 350 9,80 0,03 0,53% 9,80 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 8,08 0,02 0,44% 8,08 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,10 0,10 0,01% 0,10 0,10 0,01% -hsmw-highlight-fill-option-variables
8) 1 0,03 0,03 0,00% 0,03 0,03 0,00% -hsmw-highlight-init
2016-10-25 14:47:02 +00:00
# Initialize $next_word to its default value?
(( in_redirection )) && (( --in_redirection ))
(( in_redirection == 0 )) && next_word=BIT_regular # else Stall $next_word.
2016-10-09 07:06:50 +00:00
# Initialize per-"simple command" [zshmisc(1)] variables:
#
# $already_added (see next paragraph)
# $style how to highlight $arg
# $in_array_assignment boolean flag for "between '(' and ')' of array assignment"
# $highlight_glob boolean flag for "'noglob' is in effect"
#
# $already_added is set to 1 to disable adding an entry to region_highlight
# for this iteration. Currently, that is done for "" and $'' strings,
# which add the entry early so escape sequences within the string override
# the string's color.
*highlight: Don't redefine already_added, don't set it for comments
parse.zsh -oo, after changes:
Running time: 1.8225100000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1814,83 5,19 99,99% 1336,69 3,82 73,65% -hsmw-highlight-process
2) 2800 338,83 0,12 18,67% 338,83 0,12 18,67% -hsmw-highlight-string
3) 2450 81,75 0,03 4,50% 81,75 0,03 4,50% -hsmw-highlight-check-path
4) 1400 39,80 0,03 2,19% 39,80 0,03 2,19% -hsmw-highlight-main-type
5) 350 9,74 0,03 0,54% 9,74 0,03 0,54% -hsmw-highlight-stack-pop
6) 350 8,02 0,02 0,44% 8,02 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,10 0,10 0,01% 0,10 0,10 0,01% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:58:55 +00:00
already_added=0
2016-10-09 07:06:50 +00:00
style=unknown-token
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_start )); then
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
in_array_assignment=0
*highlight: Optimization: compress noglob-related code
parse.zsh -oo, after changes:
Running time: 1.8347470000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1827,26 5,22 100,00% 1354,88 3,87 74,14% -hsmw-highlight-process
2) 2800 335,45 0,12 18,36% 335,45 0,12 18,36% -hsmw-highlight-string
3) 2450 79,78 0,03 4,37% 79,78 0,03 4,37% -hsmw-highlight-check-path
4) 1400 39,59 0,03 2,17% 39,59 0,03 2,17% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,53% 9,61 0,03 0,53% -hsmw-highlight-stack-pop
6) 350 7,94 0,02 0,43% 7,94 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 14:49:52 +00:00
[[ $arg == 'noglob' ]] && highlight_glob=0
2016-10-09 07:06:50 +00:00
fi
# Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
if [[ $arg == ';' ]] ; then
# We're looking for either a semicolon or a newline, whichever comes
# first. Both of these are rendered as a ";" (SEPER) by the ${(z)..}
# flag.
#
# We can't use the (Z+n+) flag because that elides the end-of-command
# token altogether, so 'echo foo\necho bar' (two commands) becomes
# indistinguishable from 'echo foo echo bar' (one command with three
# words for arguments).
local needle=$'[;\n]'
integer offset=$(( ${proc_buf[(i)$needle]} - 1 ))
(( start_pos += offset ))
(( end_pos = start_pos + $#arg ))
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
arg_type=3
2016-10-09 07:06:50 +00:00
else
2016-10-15 13:22:04 +00:00
integer offset=0
2016-10-09 07:06:50 +00:00
if [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\[[:space:]])##)* ]]; then
# The first, outer parenthesis
2016-10-17 05:36:14 +00:00
offset="${mend[1]}"
2016-10-09 07:06:50 +00:00
fi
((start_pos+=offset))
2016-10-17 12:12:14 +00:00
((end_pos=start_pos+${#arg}))
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
*highlight: Optimization – a hash of token types instead of 3 arrays
./parse -oo, before changes:
Running time: 2.0874240000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2079,89 5,94 100,00% 1591,12 4,55 76,50% -hsmw-highlight-process
2) 2800 342,91 0,12 16,49% 342,91 0,12 16,49% -hsmw-highlight-string
3) 2450 85,09 0,03 4,09% 85,09 0,03 4,09% -hsmw-highlight-check-path
4) 1400 42,54 0,03 2,05% 42,54 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,48% 9,98 0,03 0,48% -hsmw-highlight-stack-pop
6) 350 8,24 0,02 0,40% 8,24 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
./parse -oo, after changes:
Running time: 1.9223140000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1914,66 5,47 100,00% 1435,29 4,10 74,96% -hsmw-highlight-process
2) 2800 340,12 0,12 17,76% 340,12 0,12 17,76% -hsmw-highlight-string
3) 2450 81,34 0,03 4,25% 81,34 0,03 4,25% -hsmw-highlight-check-path
4) 1400 39,98 0,03 2,09% 39,98 0,03 2,09% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,52% 9,87 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,05 0,02 0,42% 8,05 0,02 0,42% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:08:23 +00:00
# No-hit will result in value 0
arg_type=${__HSMW_HIGHLIGHT_TOKENS_TYPES[$arg]}
2016-10-09 07:06:50 +00:00
fi
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
# Handle the INTERACTIVE_COMMENTS option.
#
# We use the (Z+c+) flag so the entire comment is presented as one token in $arg.
if [[ -n ${interactive_comments+'set'} && $arg[1] == $histchars[3] ]]; then
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_regular + this_word & BIT_start )); then
2016-10-09 07:06:50 +00:00
style=comment
else
style=unknown-token # prematurely terminated
fi
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:06:50 +00:00
continue
fi
# Analyse the current word.
*highlight: Optimization: remove *-is-redirection call
parse.zsh -oo, before changes:
Running time: 2.5141480000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2506,66 7,16 100,00% 1713,68 4,90 68,36% -hsmw-highlight-process
2) 2800 374,42 0,13 14,94% 374,42 0,13 14,94% -hsmw-highlight-string
3) 2450 194,12 0,08 7,74% 133,36 0,05 5,32% -hsmw-highlight-check-path
4) 3850 94,01 0,02 3,75% 94,01 0,02 3,75% -hsmw-highlight-expand-path
5) 1400 66,67 0,05 2,66% 66,67 0,05 2,66% (anon)
6) 8400 54,50 0,01 2,17% 54,50 0,01 2,17% -hsmw-highlight-is-redirection
7) 1400 40,93 0,03 1,63% 40,93 0,03 1,63% -hsmw-highlight-main-type
8) 700 10,95 0,02 0,44% 10,95 0,02 0,44% -hsmw-highlight-check-assign
parse.zsh -oo, after changes:
Running time: 2.3994030000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2391,73 6,83 100,00% 1650,94 4,72 69,03% -hsmw-highlight-process
2) 2800 371,19 0,13 15,52% 371,19 0,13 15,52% -hsmw-highlight-string
3) 2450 195,75 0,08 8,18% 135,31 0,06 5,66% -hsmw-highlight-check-path
4) 3850 93,17 0,02 3,90% 93,17 0,02 3,90% -hsmw-highlight-expand-path
5) 1400 67,69 0,05 2,83% 67,69 0,05 2,83% (anon)
6) 1400 43,96 0,03 1,84% 43,96 0,03 1,84% -hsmw-highlight-main-type
7) 700 11,25 0,02 0,47% 11,25 0,02 0,47% -hsmw-highlight-check-assign
8) 350 9,78 0,03 0,41% 9,78 0,03 0,41% -hsmw-highlight-stack-pop
2016-10-16 13:08:57 +00:00
if [[ $arg == (<0-9>|)(\<|\>)* ]] && [[ $arg != (\<|\>)$'\x28'* ]]; then
2016-10-09 07:06:50 +00:00
# A '<' or '>', possibly followed by a digit
in_redirection=2
fi
# Special-case the first word after 'sudo'.
if (( ! in_redirection )); then
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_sudo_opt )) && [[ $arg != -* ]]; then
(( this_word = this_word ^ BIT_sudo_opt ))
2016-10-09 07:06:50 +00:00
fi
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
# Parse the sudo command line
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_sudo_opt )); then
2016-10-09 07:06:50 +00:00
case "$arg" in
# Flag that requires an argument
2016-10-15 17:12:40 +00:00
'-'[Cgprtu])
(( this_word & BIT_start )) && (( this_word = this_word ^ BIT_start ))
(( next_word = BIT_sudo_arg ))
;;
2016-10-09 07:06:50 +00:00
# This prevents misbehavior with sudo -u -otherargument
2016-10-15 17:12:40 +00:00
'-'*)
(( this_word & BIT_start )) && (( this_word = this_word ^ BIT_start ))
(( next_word = next_word | BIT_start ))
(( next_word = next_word | BIT_sudo_opt ))
;;
2016-10-09 07:06:50 +00:00
*) ;;
esac
2016-10-15 17:12:40 +00:00
elif (( this_word & BIT_sudo_arg )); then
(( next_word = next_word | BIT_sudo_opt ))
(( next_word = next_word | BIT_start ))
2016-10-09 07:06:50 +00:00
fi
fi
2016-10-17 11:07:29 +00:00
expanded_path=""
2016-10-09 07:06:50 +00:00
# The Great Fork: is this a command word? Is this a non-command word?
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_always )) && [[ $arg == 'always' ]]; then
2016-10-09 07:06:50 +00:00
# try-always construct
style=reserved-word # de facto a reserved word, although not de jure
2016-10-15 17:12:40 +00:00
(( next_word = BIT_start ))
elif (( this_word & BIT_start )) && (( in_redirection == 0 )); then # $arg is the command word
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
if (( arg_type == 1 )); then
2016-10-09 07:06:50 +00:00
style=precommand
elif [[ "$arg" = "sudo" ]]; then
style=precommand
2016-10-15 17:12:40 +00:00
(( next_word & BIT_regular )) && (( next_word = next_word ^ BIT_regular ))
(( next_word = next_word | BIT_sudo_opt ))
(( next_word = next_word | BIT_start ))
2016-10-09 07:06:50 +00:00
else
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
# Special-case: command word is '$foo', like that, without braces or anything.
#
# That's not entirely correct --- if the parameter's value happens to be a reserved
# word, the parameter expansion will be highlighted as a reserved word --- but that
# incorrectness is outweighed by the usability improvement of permitting the use of
# parameters that refer to commands, functions, and builtins.
if [[ ${arg[1]} == \$ ]] && (( ${+parameters} )) && [[ ${arg:1} = (#m)([a-zA-Z_][a-zA-Z0-9_]#|[0-9]##) ]] &&
(( ${+parameters[${MATCH}]} ))
then
-hsmw-highlight-main-type ${(P)MATCH}
else
: ${expanded_path::=${(Q)~arg}}
-hsmw-highlight-main-type $expanded_path
fi
2016-10-15 11:29:20 +00:00
case $REPLY in
2016-10-09 07:06:50 +00:00
reserved) # reserved word
style=reserved-word
if [[ $arg == $'\x7b' ]]; then
braces_stack='Y'"$braces_stack"
elif [[ $arg == $'\x7d' ]]; then
# We're at command word, so no need to check $right_brace_is_recognised_everywhere
2016-10-09 07:52:50 +00:00
-hsmw-highlight-stack-pop 'Y' style=reserved-word
2016-10-09 07:06:50 +00:00
if [[ $style == reserved-word ]]; then
2016-10-15 17:12:40 +00:00
(( next_word = next_word | BIT_always ))
2016-10-09 07:06:50 +00:00
fi
fi
;;
'suffix alias') style=suffix-alias;;
alias) () {
integer insane_alias
case $arg in
# Issue #263: aliases with '=' on their LHS.
#
# There are three cases:
#
# - Unsupported, breaks 'alias -L' output, but invokable:
('='*) :;;
# - Unsupported, not invokable:
(*'='*) insane_alias=1;;
# - The common case:
(*) :;;
esac
if (( insane_alias )); then
style=unknown-token
else
style=alias
2016-10-09 07:52:50 +00:00
-hsmw-highlight-resolve-alias $arg
2016-10-09 07:06:50 +00:00
local alias_target="$REPLY"
*highlight: Optimization – a hash of token types instead of 3 arrays
./parse -oo, before changes:
Running time: 2.0874240000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2079,89 5,94 100,00% 1591,12 4,55 76,50% -hsmw-highlight-process
2) 2800 342,91 0,12 16,49% 342,91 0,12 16,49% -hsmw-highlight-string
3) 2450 85,09 0,03 4,09% 85,09 0,03 4,09% -hsmw-highlight-check-path
4) 1400 42,54 0,03 2,05% 42,54 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,48% 9,98 0,03 0,48% -hsmw-highlight-stack-pop
6) 350 8,24 0,02 0,40% 8,24 0,02 0,40% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
./parse -oo, after changes:
Running time: 1.9223140000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1914,66 5,47 100,00% 1435,29 4,10 74,96% -hsmw-highlight-process
2) 2800 340,12 0,12 17,76% 340,12 0,12 17,76% -hsmw-highlight-string
3) 2450 81,34 0,03 4,25% 81,34 0,03 4,25% -hsmw-highlight-check-path
4) 1400 39,98 0,03 2,09% 39,98 0,03 2,09% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,52% 9,87 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,05 0,02 0,42% 8,05 0,02 0,42% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:08:23 +00:00
[[ ${__HSMW_HIGHLIGHT_TOKENS_TYPES[$alias_target]} = "1" && "$arg_type" != "1" ]] && __HSMW_HIGHLIGHT_TOKENS_TYPES[$arg]="1"
2016-10-09 07:06:50 +00:00
fi
}
;;
builtin) style=builtin;;
function) style=function;;
command) style=command;;
hashed) style=hashed-command;;
2016-10-17 04:48:44 +00:00
none) # Assign?
2016-10-25 15:19:18 +00:00
if [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[[^\]]#\])(|[+])=* ]] || [[ $arg == [0-9]##(|[+])=* ]]; then
2016-10-09 07:06:50 +00:00
style=assign
2016-10-25 15:24:05 +00:00
# Assignment to a scalar parameter or to array
# (For array assignments, the command doesn't start until the ")" token.)
[[ $arg[-1] == '(' ]] && in_array_assignment=1 || (( next_word = next_word | BIT_start ))
*highlight: Optimization: better code that handles history expansion
parse.zsh -oo, after changes:
Running time: 1.8102530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1802,80 5,15 100,00% 1325,15 3,79 73,50% -hsmw-highlight-process
2) 2800 339,52 0,12 18,83% 339,52 0,12 18,83% -hsmw-highlight-string
3) 2450 81,13 0,03 4,50% 81,13 0,03 4,50% -hsmw-highlight-check-path
4) 1400 39,34 0,03 2,18% 39,34 0,03 2,18% -hsmw-highlight-main-type
5) 350 9,77 0,03 0,54% 9,77 0,03 0,54% -hsmw-highlight-stack-pop
6) 350 7,89 0,02 0,44% 7,89 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,08 0,08 0,00% 0,08 0,08 0,00% -hsmw-highlight-fill-option-variables
8) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 15:28:10 +00:00
elif [[ $arg[1] = $histchars[1] && -n "${arg[2]}" ]]; then
2016-10-09 07:06:50 +00:00
style=history-expansion
2016-10-25 15:32:10 +00:00
elif [[ $arg[1] == $histchars[2] ]]; then
2016-10-09 07:06:50 +00:00
style=history-expansion
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
elif (( arg_type == 3 )); then
2016-10-15 17:12:40 +00:00
if (( this_word & BIT_regular )); then
2016-10-09 07:06:50 +00:00
# This highlights empty commands (semicolon follows nothing) as an error.
# Zsh accepts them, though.
style=commandseparator
else
style=unknown-token
fi
elif (( in_redirection == 2 )); then
style=redirection
elif [[ $arg[1,2] == '((' ]]; then
# Arithmetic evaluation.
#
# Note: prior to zsh-5.1.1-52-g4bed2cf (workers/36669), the ${(z)...}
# splitter would only output the '((' token if the matching '))' had
# been typed. Therefore, under those versions of zsh, BUFFER="(( 42"
# would be highlighted as an error until the matching "))" are typed.
#
# We highlight just the opening parentheses, as a reserved word; this
# is how [[ ... ]] is highlighted, too.
style=reserved-word
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$start_pos $(( start_pos + 2 )) ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:06:50 +00:00
already_added=1
if [[ $arg[-2,-1] == '))' ]]; then
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$(( end_pos - 2 )) $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:06:50 +00:00
already_added=1
fi
elif [[ $arg == '()' ]]; then
# anonymous function
style=reserved-word
elif [[ $arg == $'\x28' ]]; then
# subshell
style=reserved-word
braces_stack='R'"$braces_stack"
else
2016-10-09 07:52:50 +00:00
if -hsmw-highlight-check-path; then
2016-10-09 07:06:50 +00:00
style=$REPLY
else
style=unknown-token
fi
fi
;;
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
*)
# ADD
reply+=("$start_pos $end_pos commandtypefromthefuture-$REPLY")
2016-10-09 07:06:50 +00:00
already_added=1
;;
esac
fi
2016-10-25 12:03:56 +00:00
elif (( in_redirection )) || (( this_word & BIT_regular )) || (( this_word & BIT_sudo_opt )) || (( this_word & BIT_sudo_arg ))
2016-10-09 07:06:50 +00:00
then # $arg is a non-command word
case $arg in
$'\x29') # subshell or end of array assignment
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
if (( in_array_assignment )); then
2016-10-09 07:06:50 +00:00
style=assign
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
in_array_assignment=0
2016-10-15 17:12:40 +00:00
(( next_word = next_word | BIT_start ))
2016-10-09 07:06:50 +00:00
else
2016-10-09 07:52:50 +00:00
-hsmw-highlight-stack-pop 'R' style=reserved-word
2016-10-09 07:06:50 +00:00
fi;;
$'\x28\x29') # possibly a function definition
if (( multi_func_def )) || false # TODO: or if the previous word was a command word
then
2016-10-15 17:12:40 +00:00
(( next_word = next_word | BIT_start ))
2016-10-09 07:06:50 +00:00
fi
style=reserved-word
;;
$'\x7d') # right brace
#
# Parsing rule: # {
#
# Additionally, `tt(})' is recognized in any position if neither the
# tt(IGNORE_BRACES) option nor the tt(IGNORE_CLOSE_BRACES) option is set."""
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
if (( right_brace_is_recognised_everywhere )); then
2016-10-09 07:52:50 +00:00
-hsmw-highlight-stack-pop 'Y' style=reserved-word
2016-10-09 07:06:50 +00:00
if [[ $style == reserved-word ]]; then
2016-10-15 17:12:40 +00:00
(( next_word = next_word | BIT_always ))
2016-10-09 07:06:50 +00:00
fi
else
# Fall through to the catchall case at the end.
fi
;|
'--'*) style=double-hyphen-option;;
'-'*) style=single-hyphen-option;;
"'"*) style=single-quoted-argument;;
'"'*) style=double-quoted-argument
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:52:50 +00:00
-hsmw-highlight-string
2016-10-09 07:06:50 +00:00
already_added=1
;;
\$\'*) style=dollar-quoted-argument
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:52:50 +00:00
-hsmw-highlight-dollar-string
2016-10-09 07:06:50 +00:00
already_added=1
;;
'`'*) style=back-quoted-argument;;
[*?]*|*[^\\][*?]*)
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
(( highlight_glob )) && style=globbing || style=default;;
*) if [[ $arg = $'\x7d' ]] && (( right_brace_is_recognised_everywhere )); then
2016-10-09 07:06:50 +00:00
# was handled by the $'\x7d' case above
elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
style=history-expansion
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
elif (( arg_type == 3 )); then
2016-10-09 07:06:50 +00:00
style=commandseparator
elif (( in_redirection == 2 )); then
style=redirection
else
2016-10-09 07:52:50 +00:00
if -hsmw-highlight-check-path; then
2016-10-09 07:06:50 +00:00
style=$REPLY
else
style=default
fi
fi
;;
esac
fi
if ! (( already_added )); then
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
*highlight: Don't store region_highlight entry if it's "none"
parse ./to-parse.zsh before changes:
Running time: 0.8560130000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 855,65 855,65 100,00% 776,29 776,29 90,72% -hsmw-highlight-process
2) 356 43,15 0,12 5,04% 33,62 0,09 3,93% -hsmw-highlight-check-path
3) 144 15,50 0,11 1,81% 15,50 0,11 1,81% -hsmw-highlight-main-type
4) 500 13,47 0,03 1,57% 13,47 0,03 1,57% -hsmw-highlight-expand-path
5) 144 10,06 0,07 1,18% 10,06 0,07 1,18% (anon)
6) 564 4,86 0,01 0,57% 4,86 0,01 0,57% -hsmw-highlight-is-redirection
7) 83 1,53 0,02 0,18% 1,53 0,02 0,18% -hsmw-highlight-check-assign
8) 2 0,32 0,16 0,04% 0,32 0,16 0,04% -hsmw-highlight-string
parse ./to-parse.zsh after changes:
Running time: 0.8107540000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 810,39 810,39 100,00% 732,47 732,47 90,38% -hsmw-highlight-process
2) 356 42,07 0,12 5,19% 32,70 0,09 4,03% -hsmw-highlight-check-path
3) 144 15,67 0,11 1,93% 15,67 0,11 1,93% -hsmw-highlight-main-type
4) 500 13,08 0,03 1,61% 13,08 0,03 1,61% -hsmw-highlight-expand-path
5) 144 10,33 0,07 1,28% 10,33 0,07 1,28% (anon)
6) 564 4,35 0,01 0,54% 4,35 0,01 0,54% -hsmw-highlight-is-redirection
7) 83 1,52 0,02 0,19% 1,52 0,02 0,19% -hsmw-highlight-check-assign
8) 2 0,25 0,13 0,03% 0,25 0,13 0,03% -hsmw-highlight-string
2016-10-15 17:28:40 +00:00
[[ "${HSMW_HIGHLIGHT_STYLES[$style]}" != "none" ]] && reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:52:50 +00:00
[[ $style == path || $style == path_prefix ]] && -hsmw-highlight-path-separators
2016-10-09 07:06:50 +00:00
fi
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
if (( arg_type == 3 )); then
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
if [[ $arg == ';' ]] && (( in_array_assignment )); then
2016-10-09 07:06:50 +00:00
# literal newline inside an array assignment
2016-10-15 17:12:40 +00:00
(( next_word = BIT_regular ))
2016-10-09 07:06:50 +00:00
else
2016-10-15 17:12:40 +00:00
(( next_word = BIT_start ))
*highlight: Optimization: don't use 'true' and 'false' builtins
The result much more often reaches 18xx milliseconds. Below is almost
the bottom value, which is ~1874 ms.
./parse -oo, after changes:
Running time: 1.8982620000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1890,78 5,40 100,00% 1411,07 4,03 74,63% -hsmw-highlight-process
2) 2800 340,46 0,12 18,01% 340,46 0,12 18,01% -hsmw-highlight-string
3) 2450 80,94 0,03 4,28% 80,94 0,03 4,28% -hsmw-highlight-check-path
4) 1400 40,49 0,03 2,14% 40,49 0,03 2,14% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,52% 9,76 0,03 0,52% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,43% 8,07 0,02 0,43% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 13:22:54 +00:00
highlight_glob=1
2016-10-09 07:06:50 +00:00
fi
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
elif (( arg_type == 2 )) && (( this_word & BIT_start )); then
2016-10-15 17:12:40 +00:00
(( next_word = BIT_start ))
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
elif (( arg_type == 1 )) && (( this_word & BIT_start )); then
2016-10-15 17:12:40 +00:00
(( next_word = BIT_start ))
elif [[ $arg == "repeat" ]] && (( this_word & BIT_start )); then
2016-10-09 07:06:50 +00:00
# skip the repeat-count word
in_redirection=2
# The redirection mechanism assumes $this_word describes the word
# following the redirection. Make it so.
#
# That word can be a command word with shortloops (`repeat 2 ls`)
# or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`).
#
# The repeat-count word will be handled like a redirection target.
2016-10-15 17:12:40 +00:00
(( this_word = BIT_start | BIT_regular ))
2016-10-09 07:06:50 +00:00
fi
start_pos=$end_pos
if (( in_redirection == 0 )); then
# This is the default/common codepath.
2016-10-15 17:12:40 +00:00
(( this_word = next_word ))
*highlight: Set of optimizations, also logic changes (commandseparator)
parse -oo, before:
Running time: 2.2680830000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2260,37 6,46 100,00% 1679,94 4,80 74,32% -hsmw-highlight-process
2) 2800 358,98 0,13 15,88% 358,98 0,13 15,88% -hsmw-highlight-string
3) 2450 87,01 0,04 3,85% 87,01 0,04 3,85% -hsmw-highlight-check-path
4) 1400 72,33 0,05 3,20% 72,33 0,05 3,20% (anon)
5) 1400 42,94 0,03 1,90% 42,94 0,03 1,90% -hsmw-highlight-main-type
6) 350 10,27 0,03 0,45% 10,27 0,03 0,45% -hsmw-highlight-stack-pop
7) 350 8,91 0,03 0,39% 8,91 0,03 0,39% -hsmw-highlight-path-separators
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
parse -oo, after:
Running time: 2.0801330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2072,44 5,92 100,00% 1586,54 4,53 76,55% -hsmw-highlight-process
2) 2800 341,85 0,12 16,49% 341,85 0,12 16,49% -hsmw-highlight-string
3) 2450 83,71 0,03 4,04% 83,71 0,03 4,04% -hsmw-highlight-check-path
4) 1400 42,58 0,03 2,05% 42,58 0,03 2,05% -hsmw-highlight-main-type
5) 350 9,69 0,03 0,47% 9,69 0,03 0,47% -hsmw-highlight-stack-pop
6) 350 8,07 0,02 0,39% 8,07 0,02 0,39% -hsmw-highlight-path-separators
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-25 11:58:01 +00:00
#else
2016-10-09 07:06:50 +00:00
# Stall $this_word.
fi
done
}
2016-10-09 07:52:50 +00:00
-hsmw-highlight-path-separators()
2016-10-09 07:06:50 +00:00
{
local pos style_pathsep
style_pathsep=${style}_pathseparator
2016-10-09 07:24:03 +00:00
[[ -z "$HSMW_HIGHLIGHT_STYLES[$style_pathsep]" || "$HSMW_HIGHLIGHT_STYLES[$style]" == "$HSMW_HIGHLIGHT_STYLES[$style_pathsep]" ]] && return 0
2016-10-09 07:06:50 +00:00
for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
2016-10-11 06:32:58 +00:00
if [[ ${buf[pos]} == "/" ]]; then
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$(( pos - 1 )) $pos ${HSMW_HIGHLIGHT_STYLES[$style_pathsep]}")
2016-10-09 07:06:50 +00:00
fi
done
}
# Check if $arg is a path.
# If yes, return 0 and in $REPLY the style to use.
# Else, return non-zero (and the contents of $REPLY is undefined).
2016-10-09 07:52:50 +00:00
-hsmw-highlight-check-path()
2016-10-09 07:06:50 +00:00
{
2016-10-17 11:07:29 +00:00
: ${expanded_path:=${(Q)~arg}}
2016-10-09 07:06:50 +00:00
REPLY=path
[[ -z $expanded_path ]] && return 1
[[ -L $expanded_path ]] && return 0
[[ -e $expanded_path ]] && return 0
# Search the path in CDPATH
local cdpath_dir
for cdpath_dir in $cdpath ; do
[[ -e "$cdpath_dir/$expanded_path" ]] && return 0
done
# It's not a path.
return 1
}
# Highlight special chars inside double-quoted strings
2016-10-09 07:52:50 +00:00
-hsmw-highlight-string()
2016-10-09 07:06:50 +00:00
{
local -a match mbegin mend
2016-10-16 10:38:37 +00:00
local mybuf="$arg"
integer idx=start_pos end_idx
2016-10-17 04:54:11 +00:00
while [[ "$mybuf" = (#b)[^\$\\]#((\$[a-zA-Z0-9_]##(\[[^\]]#\])(#c0,1))|(\$[{](\([a-zA-Z0@%#]##\))(#c0,1)[a-zA-Z0-9_]##(\[[^\]]#\])(#c0,1)[}])|[\\][\'\"\$]|[\\](*))(*) ]]; do
2016-10-16 11:41:14 +00:00
[[ -n "${match[7]}" ]] && {
idx+=${mbegin[1]}
mybuf="${match[7]}"
*highlight: Fully optimal *-string, no / substitution and (S) flag
parse.zsh -oo, before changes:
Running time: 2.9235860000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2916,15 8,33 100,00% 1727,84 4,94 59,25% -hsmw-highlight-process
2) 2800 764,12 0,27 26,20% 764,12 0,27 26,20% -hsmw-highlight-string
3) 2450 196,31 0,08 6,73% 134,73 0,05 4,62% -hsmw-highlight-check-path
4) 3850 95,16 0,02 3,26% 95,16 0,02 3,26% -hsmw-highlight-expand-path
5) 1400 67,34 0,05 2,31% 67,34 0,05 2,31% (anon)
6) 8400 56,32 0,01 1,93% 56,32 0,01 1,93% -hsmw-highlight-is-redirection
7) 1400 41,19 0,03 1,41% 41,19 0,03 1,41% -hsmw-highlight-main-type
8) 700 11,24 0,02 0,39% 11,24 0,02 0,39% -hsmw-highlight-check-assign
parse.zsh -oo, after changes:
Running time: 2.5433330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2535,74 7,24 100,00% 1730,74 4,94 68,25% -hsmw-highlight-process
2) 2800 385,15 0,14 15,19% 385,15 0,14 15,19% -hsmw-highlight-string
3) 2450 193,50 0,08 7,63% 132,71 0,05 5,23% -hsmw-highlight-check-path
4) 3850 94,23 0,02 3,72% 94,23 0,02 3,72% -hsmw-highlight-expand-path
5) 1400 67,68 0,05 2,67% 67,68 0,05 2,67% (anon)
6) 8400 55,01 0,01 2,17% 55,01 0,01 2,17% -hsmw-highlight-is-redirection
7) 1400 41,00 0,03 1,62% 41,00 0,03 1,62% -hsmw-highlight-main-type
8) 700 11,01 0,02 0,43% 11,01 0,02 0,43% -hsmw-highlight-check-assign
764.12 - 385.15 = 378.97
2916.15 - 2535.74 = 380,41
380 / 2916.0 = 0.13
2016-10-16 11:24:50 +00:00
} || {
2016-10-16 11:41:14 +00:00
idx+=${mbegin[1]}-1
end_idx=idx+${mend[1]}-${mbegin[1]}+1
mybuf="${match[8]}"
2016-10-16 10:38:37 +00:00
*highlight: Fully optimal *-string, no / substitution and (S) flag
parse.zsh -oo, before changes:
Running time: 2.9235860000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2916,15 8,33 100,00% 1727,84 4,94 59,25% -hsmw-highlight-process
2) 2800 764,12 0,27 26,20% 764,12 0,27 26,20% -hsmw-highlight-string
3) 2450 196,31 0,08 6,73% 134,73 0,05 4,62% -hsmw-highlight-check-path
4) 3850 95,16 0,02 3,26% 95,16 0,02 3,26% -hsmw-highlight-expand-path
5) 1400 67,34 0,05 2,31% 67,34 0,05 2,31% (anon)
6) 8400 56,32 0,01 1,93% 56,32 0,01 1,93% -hsmw-highlight-is-redirection
7) 1400 41,19 0,03 1,41% 41,19 0,03 1,41% -hsmw-highlight-main-type
8) 700 11,24 0,02 0,39% 11,24 0,02 0,39% -hsmw-highlight-check-assign
parse.zsh -oo, after changes:
Running time: 2.5433330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2535,74 7,24 100,00% 1730,74 4,94 68,25% -hsmw-highlight-process
2) 2800 385,15 0,14 15,19% 385,15 0,14 15,19% -hsmw-highlight-string
3) 2450 193,50 0,08 7,63% 132,71 0,05 5,23% -hsmw-highlight-check-path
4) 3850 94,23 0,02 3,72% 94,23 0,02 3,72% -hsmw-highlight-expand-path
5) 1400 67,68 0,05 2,67% 67,68 0,05 2,67% (anon)
6) 8400 55,01 0,01 2,17% 55,01 0,01 2,17% -hsmw-highlight-is-redirection
7) 1400 41,00 0,03 1,62% 41,00 0,03 1,62% -hsmw-highlight-main-type
8) 700 11,01 0,02 0,43% 11,01 0,02 0,43% -hsmw-highlight-check-assign
764.12 - 385.15 = 378.97
2916.15 - 2535.74 = 380,41
380 / 2916.0 = 0.13
2016-10-16 11:24:50 +00:00
# ADD
2016-10-16 12:54:36 +00:00
reply+=("$idx $end_idx ${HSMW_HIGHLIGHT_STYLES[back-or-dollar-double-quoted-argument]}")
2016-10-16 10:38:37 +00:00
*highlight: Fully optimal *-string, no / substitution and (S) flag
parse.zsh -oo, before changes:
Running time: 2.9235860000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2916,15 8,33 100,00% 1727,84 4,94 59,25% -hsmw-highlight-process
2) 2800 764,12 0,27 26,20% 764,12 0,27 26,20% -hsmw-highlight-string
3) 2450 196,31 0,08 6,73% 134,73 0,05 4,62% -hsmw-highlight-check-path
4) 3850 95,16 0,02 3,26% 95,16 0,02 3,26% -hsmw-highlight-expand-path
5) 1400 67,34 0,05 2,31% 67,34 0,05 2,31% (anon)
6) 8400 56,32 0,01 1,93% 56,32 0,01 1,93% -hsmw-highlight-is-redirection
7) 1400 41,19 0,03 1,41% 41,19 0,03 1,41% -hsmw-highlight-main-type
8) 700 11,24 0,02 0,39% 11,24 0,02 0,39% -hsmw-highlight-check-assign
parse.zsh -oo, after changes:
Running time: 2.5433330000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 2535,74 7,24 100,00% 1730,74 4,94 68,25% -hsmw-highlight-process
2) 2800 385,15 0,14 15,19% 385,15 0,14 15,19% -hsmw-highlight-string
3) 2450 193,50 0,08 7,63% 132,71 0,05 5,23% -hsmw-highlight-check-path
4) 3850 94,23 0,02 3,72% 94,23 0,02 3,72% -hsmw-highlight-expand-path
5) 1400 67,68 0,05 2,67% 67,68 0,05 2,67% (anon)
6) 8400 55,01 0,01 2,17% 55,01 0,01 2,17% -hsmw-highlight-is-redirection
7) 1400 41,00 0,03 1,62% 41,00 0,03 1,62% -hsmw-highlight-main-type
8) 700 11,01 0,02 0,43% 11,01 0,02 0,43% -hsmw-highlight-check-assign
764.12 - 385.15 = 378.97
2916.15 - 2535.74 = 380,41
380 / 2916.0 = 0.13
2016-10-16 11:24:50 +00:00
idx=end_idx
}
2016-10-09 07:06:50 +00:00
done
2016-10-16 10:38:37 +00:00
return 0
2016-10-09 07:06:50 +00:00
}
# Highlight special chars inside dollar-quoted strings
2016-10-09 07:52:50 +00:00
-hsmw-highlight-dollar-string()
2016-10-09 07:06:50 +00:00
{
local i j k style
local AA
integer c
# Starting dollar-quote is at 1:2, so start parsing at offset 3 in the string.
for (( i = 3 ; i < end_pos - start_pos ; i += 1 )) ; do
(( j = i + start_pos - 1 ))
(( k = j + 1 ))
case "$arg[$i]" in
"\\") style=back-dollar-quoted-argument
for (( c = i + 1 ; c <= end_pos - start_pos ; c += 1 )); do
[[ "$arg[$c]" != ([0-9xXuUa-fA-F]) ]] && break
done
AA=$arg[$i+1,$c-1]
# Matching for HEX and OCT values like \0xA6, \xA6 or \012
if [[ "$AA" =~ "^(x|X)[0-9a-fA-F]{1,2}"
|| "$AA" =~ "^[0-7]{1,3}"
|| "$AA" =~ "^u[0-9a-fA-F]{1,4}"
|| "$AA" =~ "^U[0-9a-fA-F]{1,8}"
]]; then
(( k += $#MATCH ))
(( i += $#MATCH ))
else
if (( $#arg > $i+1 )) && [[ $arg[$i+1] == [xXuU] ]]; then
# \x not followed by hex digits is probably an error
style=unknown-token
fi
(( k += 1 )) # Color following char too.
(( i += 1 )) # Skip parsing the escaped char.
fi
;;
*) continue ;;
esac
*highlighting: Optimization – remove *add-highlight function
parse.zsh -o, before changes:
Running time: 0.9516510000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 945,28 2,70 100,00% 632,08 1,81 66,87% -hsmw-highlight-process
2) 3150 62,92 0,02 6,66% 62,92 0,02 6,66% -hsmw-add-highlight
3) 950 80,01 0,08 8,46% 58,97 0,06 6,24% -hsmw-highlight-check-path
4) 300 58,21 0,19 6,16% 57,09 0,19 6,04% -hsmw-highlight-string
5) 1950 43,18 0,02 4,57% 43,18 0,02 4,57% -hsmw-highlight-expand-path
6) 1000 36,50 0,04 3,86% 36,50 0,04 3,86% -hsmw-highlight-main-type
7) 1000 28,77 0,03 3,04% 28,77 0,03 3,04% (anon)
8) 3100 19,17 0,01 2,03% 19,17 0,01 2,03% -hsmw-highlight-is-redirection
parse.zsh -o, after changes:
Running time: 0.8807530000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 874,42 2,50 100,00% 630,15 1,80 72,06% -hsmw-highlight-process
2) 950 78,16 0,08 8,94% 57,66 0,06 6,59% -hsmw-highlight-check-path
3) 300 57,42 0,19 6,57% 57,42 0,19 6,57% -hsmw-highlight-string
4) 1950 41,83 0,02 4,78% 41,83 0,02 4,78% -hsmw-highlight-expand-path
5) 1000 33,57 0,03 3,84% 33,57 0,03 3,84% -hsmw-highlight-main-type
6) 1000 28,36 0,03 3,24% 28,36 0,03 3,24% (anon)
7) 3100 18,92 0,01 2,16% 18,92 0,01 2,16% -hsmw-highlight-is-redirection
8) 200 3,20 0,02 0,37% 3,20 0,02 0,37% -hsmw-highlight-check-assign
( 1084 - 847 ) / 1084.0 = 0.2186
2016-10-15 12:35:38 +00:00
# ADD
reply+=("$j $k ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-10-09 07:06:50 +00:00
done
}
# -------------------------------------------------------------------------------------------------
# Main highlighter initialization
# -------------------------------------------------------------------------------------------------
2016-10-09 07:52:50 +00:00
-hsmw-highlight-init() {
2016-10-09 07:31:00 +00:00
__hsmw_highlight_main__command_type_cache=()
2016-10-09 07:06:50 +00:00
}
2016-10-09 07:24:03 +00:00
__HSMW_MH_SOURCED=1
2016-10-11 06:04:04 +00:00
2016-10-15 17:12:40 +00:00
# vim:ft=zsh:sw=2