2022-07-01 15:41:59 +00:00
#!/usr/bin/env zsh
2016-10-09 07:06:50 +00:00
#
2022-07-01 15:41:59 +00:00
# -*- mode: sh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
2016-10-09 07:06:50 +00:00
#
2022-07-01 15:41:59 +00:00
# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
# Copyright (c) 2016-2017 Sebastian Gniazdowski (modifications)
# Copyright (c) 2021-2022 zdharma-continuum and contributors
2016-10-09 07:06:50 +00:00
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:23:43 +00:00
: ${HSMW_HIGHLIGHT_STYLES[globbing]:=fg=blue,bold}
: ${HSMW_HIGHLIGHT_STYLES[history-expansion]:=fg=blue,bold}
2017-01-27 12:19:48 +00:00
: ${HSMW_HIGHLIGHT_STYLES[single-hyphen-option]:=fg=cyan}
: ${HSMW_HIGHLIGHT_STYLES[double-hyphen-option]:=fg=cyan}
2016-10-09 07:24:03 +00:00
: ${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}
*highlight: Extension for HSMW: colorify two newline characters \n
This is a serious slow down for highlighting multi-line code not having
new lines replaced with '\n' – but such code can revert this patch, and
also should.
parse.zsh ./to-parse.zsh changes.out, after changes
Running time: 2.3695570000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2368,80 2368,80 99,99% 2222,89 2222,89 93,83% -hsmw-highlight-process
2) 754 124,15 0,16 5,24% 124,15 0,16 5,24% -hsmw-highlight-main-type
3) 395 12,22 0,03 0,52% 12,22 0,03 0,52% -hsmw-highlight-check-path
4) 22 5,99 0,27 0,25% 5,99 0,27 0,25% -hsmw-highlight-string
5) 6 2,60 0,43 0,11% 2,60 0,43 0,11% -hsmw-highlight-dollar-string
6) 46 0,95 0,02 0,04% 0,95 0,02 0,04% -hsmw-highlight-stack-pop
7) 1 0,15 0,15 0,01% 0,15 0,15 0,01% -hsmw-highlight-fill-option-variables
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
Line-wise input is also affected, but the feature is too good to resign
of it.
parse.zsh -oo, after changes:
Running time: 1.5768150000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1569,21 4,48 99,99% 1204,77 3,44 76,77% -hsmw-highlight-process
2) 2800 288,78 0,10 18,40% 288,78 0,10 18,40% -hsmw-highlight-string
3) 1750 41,03 0,02 2,61% 41,03 0,02 2,61% -hsmw-highlight-check-path
4) 1400 24,76 0,02 1,58% 24,76 0,02 1,58% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,63% 9,87 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,10 0,10 0,01% 0,10 0,10 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 13:13:07 +00:00
: ${HSMW_HIGHLIGHT_STYLES[newline]:=fg=black,bold} # '\n' strings
2016-11-03 10:49:07 +00:00
: ${HSMW_HIGHLIGHT_STYLES[variable]:=none}
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
)
2016-10-09 07:31:00 +00:00
-hsmw-highlight-main-type() {
*highlight: Optimization: *-type to not guard cache with ifs; compress
parse.zsh -oo, after changes:
Running time: 1.6934050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1685,89 4,82 99,99% 1225,79 3,50 72,70% -hsmw-highlight-process
2) 2800 336,76 0,12 19,97% 336,76 0,12 19,97% -hsmw-highlight-string
3) 2450 80,37 0,03 4,77% 80,37 0,03 4,77% -hsmw-highlight-check-path
4) 1400 25,65 0,02 1,52% 25,65 0,02 1,52% -hsmw-highlight-main-type
5) 350 9,80 0,03 0,58% 9,80 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,52 0,02 0,45% 7,52 0,02 0,45% -hsmw-highlight-path-separators
7) 1 0,09 0,09 0,01% 0,09 0,09 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 16:49:53 +00:00
REPLY=$__hsmw_highlight_main__command_type_cache[(e)$1]
*highlight: Optimization: remove "return" keyword from *-main-type
parse.zsh -oo, before changes:
Running time: 1.5856540000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1577,71 4,51 99,99% 1205,79 3,45 76,42% -hsmw-highlight-process
2) 2800 295,44 0,11 18,72% 295,44 0,11 18,72% -hsmw-highlight-string
3) 1750 40,91 0,02 2,59% 40,91 0,02 2,59% -hsmw-highlight-check-path
4) 1400 25,58 0,02 1,62% 25,58 0,02 1,62% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,63% 9,98 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,13 0,13 0,01% 0,13 0,13 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
parse.zsh -oo, after changes:
Running time: 1.5778930000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1570,41 4,49 99,99% 1205,58 3,44 76,76% -hsmw-highlight-process
2) 2800 293,42 0,10 18,68% 293,42 0,10 18,68% -hsmw-highlight-string
3) 1750 41,16 0,02 2,62% 41,16 0,02 2,62% -hsmw-highlight-check-path
4) 1400 20,32 0,01 1,29% 20,32 0,01 1,29% -hsmw-highlight-main-type
5) 350 9,93 0,03 0,63% 9,93 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-11-02 08:31:15 +00:00
[[ -z "$REPLY" ]] && {
*highlight: Optimization: *-type to not guard cache with ifs; compress
parse.zsh -oo, after changes:
Running time: 1.6934050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1685,89 4,82 99,99% 1225,79 3,50 72,70% -hsmw-highlight-process
2) 2800 336,76 0,12 19,97% 336,76 0,12 19,97% -hsmw-highlight-string
3) 2450 80,37 0,03 4,77% 80,37 0,03 4,77% -hsmw-highlight-check-path
4) 1400 25,65 0,02 1,52% 25,65 0,02 1,52% -hsmw-highlight-main-type
5) 350 9,80 0,03 0,58% 9,80 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,52 0,02 0,45% 7,52 0,02 0,45% -hsmw-highlight-path-separators
7) 1 0,09 0,09 0,01% 0,09 0,09 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 16:49:53 +00:00
2022-07-01 15:41:59 +00:00
if zmodload -e zsh/parameter; then
if (( $+aliases[(e)$1] )); then
REPLY=alias
elif (( $+functions[(e)$1] )); then
REPLY=function
elif (( $+builtins[(e)$1] )); then
REPLY=builtin
elif (( $+commands[(e)$1] )); then
REPLY=command
elif (( $+saliases[(e)${1##*.}] )); then
REPLY='suffix alias'
elif (( $reswords[(Ie)$1] )); then
REPLY=reserved
elif [[ $1 != */* || "${+ZSH_ARGZERO}" = "1" ]] && ! builtin type -w -- $1 >/dev/null 2>&1; then
REPLY=none
fi
2016-10-09 07:06:50 +00:00
fi
*highlight: Optimization: *-type to not guard cache with ifs; compress
parse.zsh -oo, after changes:
Running time: 1.6934050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1685,89 4,82 99,99% 1225,79 3,50 72,70% -hsmw-highlight-process
2) 2800 336,76 0,12 19,97% 336,76 0,12 19,97% -hsmw-highlight-string
3) 2450 80,37 0,03 4,77% 80,37 0,03 4,77% -hsmw-highlight-check-path
4) 1400 25,65 0,02 1,52% 25,65 0,02 1,52% -hsmw-highlight-main-type
5) 350 9,80 0,03 0,58% 9,80 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,52 0,02 0,45% 7,52 0,02 0,45% -hsmw-highlight-path-separators
7) 1 0,09 0,09 0,01% 0,09 0,09 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 16:49:53 +00:00
2022-07-01 15:41:59 +00:00
[[ -z "$REPLY" ]] && REPLY="${$(LC_ALL=C builtin type -w -- $1 2>/dev/null)##*: }"
*highlight: Optimization: *-type to not guard cache with ifs; compress
parse.zsh -oo, after changes:
Running time: 1.6934050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1685,89 4,82 99,99% 1225,79 3,50 72,70% -hsmw-highlight-process
2) 2800 336,76 0,12 19,97% 336,76 0,12 19,97% -hsmw-highlight-string
3) 2450 80,37 0,03 4,77% 80,37 0,03 4,77% -hsmw-highlight-check-path
4) 1400 25,65 0,02 1,52% 25,65 0,02 1,52% -hsmw-highlight-main-type
5) 350 9,80 0,03 0,58% 9,80 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,52 0,02 0,45% 7,52 0,02 0,45% -hsmw-highlight-path-separators
7) 1 0,09 0,09 0,01% 0,09 0,09 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 16:49:53 +00:00
2022-07-01 15:41:59 +00:00
[[ "$REPLY" = "none" ]] && {
[[ -d "$1" ]] && REPLY="dirpath" || {
for cdpath_dir in $cdpath; do
[[ -d "$cdpath_dir/$1" ]] && { REPLY="dirpath"; break; }
done
}
2018-03-17 06:51:48 +00:00
}
2022-07-01 15:41:59 +00:00
__hsmw_highlight_main__command_type_cache[(e)$1]=$REPLY
*highlight: Optimization: remove "return" keyword from *-main-type
parse.zsh -oo, before changes:
Running time: 1.5856540000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1577,71 4,51 99,99% 1205,79 3,45 76,42% -hsmw-highlight-process
2) 2800 295,44 0,11 18,72% 295,44 0,11 18,72% -hsmw-highlight-string
3) 1750 40,91 0,02 2,59% 40,91 0,02 2,59% -hsmw-highlight-check-path
4) 1400 25,58 0,02 1,62% 25,58 0,02 1,62% -hsmw-highlight-main-type
5) 350 9,98 0,03 0,63% 9,98 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,13 0,13 0,01% 0,13 0,13 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
parse.zsh -oo, after changes:
Running time: 1.5778930000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1570,41 4,49 99,99% 1205,58 3,44 76,76% -hsmw-highlight-process
2) 2800 293,42 0,10 18,68% 293,42 0,10 18,68% -hsmw-highlight-string
3) 1750 41,16 0,02 2,62% 41,16 0,02 2,62% -hsmw-highlight-check-path
4) 1400 20,32 0,01 1,29% 20,32 0,01 1,29% -hsmw-highlight-main-type
5) 350 9,93 0,03 0,63% 9,93 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-11-02 08:31:15 +00:00
}
2016-10-09 07:06:50 +00:00
}
# 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.
*highlight: Optimization: remove *-stack-pop call, squash conditions
parse.zsh -oo, after changes:
Running time: 1.5628500000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1555,27 4,44 100,00% 1199,16 3,43 77,10% -hsmw-highlight-process
2) 2800 295,11 0,11 18,97% 295,11 0,11 18,97% -hsmw-highlight-string
3) 1750 40,98 0,02 2,64% 40,98 0,02 2,64% -hsmw-highlight-check-path
4) 1400 20,01 0,01 1,29% 20,01 0,01 1,29% -hsmw-highlight-main-type
5) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
6) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-11-02 10:58:41 +00:00
#-hsmw-highlight-stack-pop() {
2016-10-09 07:06:50 +00:00
*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.
2022-07-01 15:41:59 +00:00
-hsmw-highlight-process() {
2016-10-09 07:06:50 +00:00
emulate -L zsh
2016-10-25 16:36:27 +00:00
setopt extendedglob bareglobqual nonomatch noksharrays
2016-10-09 07:06:50 +00:00
2016-10-25 16:41:23 +00:00
(( path_dirs_was_set )) && setopt PATH_DIRS
*highlight: Let "emulate" be first instruction in *process function
parse.zsh -oo, after changes:
Running time: 1.7100990000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1702,69 4,86 99,99% 1229,47 3,51 72,20% -hsmw-highlight-process
2) 2800 337,70 0,12 19,83% 337,70 0,12 19,83% -hsmw-highlight-string
3) 2450 79,86 0,03 4,69% 79,86 0,03 4,69% -hsmw-highlight-check-path
4) 1400 38,44 0,03 2,26% 38,44 0,03 2,26% -hsmw-highlight-main-type
5) 350 9,76 0,03 0,57% 9,76 0,03 0,57% -hsmw-highlight-stack-pop
6) 350 7,48 0,02 0,44% 7,48 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,09 0,09 0,01% 0,09 0,09 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 16:13:39 +00:00
(( ointeractive_comments )) && local interactive_comments= # _set_ to empty
*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
*highlight: Optimization: cdpath_dir declared outside *-check-path
parse.zsh -oo, after changes:
Running time: 1.5547670000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1547,01 4,42 99,99% 1183,65 3,38 76,50% -hsmw-highlight-process
2) 2800 266,89 0,10 17,25% 266,89 0,10 17,25% -hsmw-highlight-string
3) 2450 62,13 0,03 4,02% 62,13 0,03 4,02% -hsmw-highlight-check-path
4) 1400 24,75 0,02 1,60% 24,75 0,02 1,60% -hsmw-highlight-main-type
5) 350 9,59 0,03 0,62% 9,59 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,14 0,14 0,01% 0,14 0,14 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
2016-10-26 09:13:12 +00:00
# mybuf, cdpath_dir are used in sub-functions
*highlight: Optimization: remove *-resolve-alias call
parse.zsh -oo, after changes:
Running time: 1.5813580000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1573,92 4,50 99,99% 1206,50 3,45 76,65% -hsmw-highlight-process
2) 2800 294,35 0,11 18,70% 294,35 0,11 18,70% -hsmw-highlight-string
3) 1750 40,74 0,02 2,59% 40,74 0,02 2,59% -hsmw-highlight-check-path
4) 1400 22,48 0,02 1,43% 22,48 0,02 1,43% -hsmw-highlight-main-type
5) 350 9,86 0,03 0,63% 9,86 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-11-02 08:44:02 +00:00
local start_pos="$2" end_pos highlight_glob=1 arg style in_array_assignment=0 MATCH expanded_path braces_stack buf="$1" mybuf cdpath_dir cur_cmd alias_target
*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
# arg_type can be 0, 1, 2 or 3, i.e. precommand, control flow, command separator
*highlight: Optimization: declare *-string vars outside, once
parse.zsh -oo, after changes:
Running time: 1.5839050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1576,36 4,50 99,99% 1177,23 3,36 74,68% -hsmw-highlight-process
2) 2800 292,16 0,10 18,53% 292,16 0,10 18,53% -hsmw-highlight-string
3) 2450 72,24 0,03 4,58% 72,24 0,03 4,58% -hsmw-highlight-check-path
4) 1400 24,98 0,02 1,58% 24,98 0,02 1,58% -hsmw-highlight-main-type
5) 350 9,74 0,03 0,62% 9,74 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:05:27 +00:00
# idx and end_idx are used in sub-functions
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
# for this_word and next_word look below at commented integers and at state machine description
2016-11-02 17:52:19 +00:00
integer arg_type=0 MBEGIN MEND in_redirection len=${#buf} already_added offset idx end_idx this_word=1 next_word=0 insane_alias
2016-10-25 16:41:23 +00:00
local -a match mbegin mend
2016-10-09 07:06:50 +00:00
# Processing buffer
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
local proc_buf="$buf" needle
2022-07-01 15:41:59 +00:00
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 ))
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
(( in_redirection == 0 )) && next_word=2 # else Stall $next_word.
2016-10-09 07:06:50 +00:00
*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
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
if (( this_word & 1 )); 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
*highlight: Huge optimization: Don't redefine variables at each loop
parse.zsh -oo, after changes:
Running time: 1.7135350000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1706,03 4,87 99,99% 1230,37 3,52 72,11% -hsmw-highlight-process
2) 2800 338,39 0,12 19,83% 338,39 0,12 19,83% -hsmw-highlight-string
3) 2450 81,56 0,03 4,78% 81,56 0,03 4,78% -hsmw-highlight-check-path
4) 1400 38,43 0,03 2,25% 38,43 0,03 2,25% -hsmw-highlight-main-type
5) 350 9,85 0,03 0,58% 9,85 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,44 0,02 0,44% 7,44 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,12 0,12 0,01% 0,12 0,12 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 16:06:45 +00:00
needle=$'[;\n]'
offset=$(( ${proc_buf[(i)$needle]} - 1 ))
2016-10-09 07:06:50 +00:00
(( start_pos += offset ))
(( end_pos = start_pos + $#arg ))
*highlight: Optimization and slowdown – short path for actual new lines
parse.zsh ./to-parse.zsh changes.out, before changes:
Running time: 2.2866420000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2286,16 2286,16 100,00% 2131,92 2131,92 93,25% -hsmw-highlight-process
2) 1270 133,34 0,10 5,83% 133,34 0,10 5,83% -hsmw-highlight-main-type
3) 395 12,09 0,03 0,53% 12,09 0,03 0,53% -hsmw-highlight-check-path
4) 22 5,48 0,25 0,24% 5,48 0,25 0,24% -hsmw-highlight-string
5) 6 2,36 0,39 0,10% 2,36 0,39 0,10% -hsmw-highlight-dollar-string
6) 46 0,97 0,02 0,04% 0,97 0,02 0,04% -hsmw-highlight-stack-pop
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
parse.zsh ./to-parse.zsh changes.out, after changes:
Running time: 2.1237140000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2123,18 2123,18 100,00% 1979,84 1979,84 93,25% -hsmw-highlight-process
2) 755 122,09 0,16 5,75% 122,09 0,16 5,75% -hsmw-highlight-main-type
3) 395 13,66 0,03 0,64% 13,66 0,03 0,64% -hsmw-highlight-check-path
4) 22 4,46 0,20 0,21% 4,46 0,20 0,21% -hsmw-highlight-string
5) 6 2,04 0,34 0,10% 2,04 0,34 0,10% -hsmw-highlight-dollar-string
6) 46 1,10 0,02 0,05% 1,10 0,02 0,05% -hsmw-highlight-stack-pop
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
./parse.zsh -oo, after changes:
Running time: 1.5936520000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1586,12 4,53 99,99% 1222,20 3,49 77,05% -hsmw-highlight-process
2) 2800 288,42 0,10 18,18% 288,42 0,10 18,18% -hsmw-highlight-string
3) 1750 40,57 0,02 2,56% 40,57 0,02 2,56% -hsmw-highlight-check-path
4) 1400 24,97 0,02 1,57% 24,97 0,02 1,57% -hsmw-highlight-main-type
5) 350 9,96 0,03 0,63% 9,96 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 12:36:55 +00:00
if [[ "${proc_buf[offset+1]}" = $'\n' ]]; then
(( in_array_assignment )) && (( this_word = 2 )) || { (( this_word = 1 )); highlight_glob=1; }
in_redirection=0
*highlight: Extension for HSMW: colorify two newline characters \n
This is a serious slow down for highlighting multi-line code not having
new lines replaced with '\n' – but such code can revert this patch, and
also should.
parse.zsh ./to-parse.zsh changes.out, after changes
Running time: 2.3695570000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2368,80 2368,80 99,99% 2222,89 2222,89 93,83% -hsmw-highlight-process
2) 754 124,15 0,16 5,24% 124,15 0,16 5,24% -hsmw-highlight-main-type
3) 395 12,22 0,03 0,52% 12,22 0,03 0,52% -hsmw-highlight-check-path
4) 22 5,99 0,27 0,25% 5,99 0,27 0,25% -hsmw-highlight-string
5) 6 2,60 0,43 0,11% 2,60 0,43 0,11% -hsmw-highlight-dollar-string
6) 46 0,95 0,02 0,04% 0,95 0,02 0,04% -hsmw-highlight-stack-pop
7) 1 0,15 0,15 0,01% 0,15 0,15 0,01% -hsmw-highlight-fill-option-variables
8) 1 0,02 0,02 0,00% 0,02 0,02 0,00% -hsmw-highlight-init
Line-wise input is also affected, but the feature is too good to resign
of it.
parse.zsh -oo, after changes:
Running time: 1.5768150000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1569,21 4,48 99,99% 1204,77 3,44 76,77% -hsmw-highlight-process
2) 2800 288,78 0,10 18,40% 288,78 0,10 18,40% -hsmw-highlight-string
3) 1750 41,03 0,02 2,61% 41,03 0,02 2,61% -hsmw-highlight-check-path
4) 1400 24,76 0,02 1,58% 24,76 0,02 1,58% -hsmw-highlight-main-type
5) 350 9,87 0,03 0,63% 9,87 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,10 0,10 0,01% 0,10 0,10 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 13:13:07 +00:00
reply+=("$(( start_pos - 1)) $end_pos ${HSMW_HIGHLIGHT_STYLES[newline]}")
*highlight: Optimization and slowdown – short path for actual new lines
parse.zsh ./to-parse.zsh changes.out, before changes:
Running time: 2.2866420000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2286,16 2286,16 100,00% 2131,92 2131,92 93,25% -hsmw-highlight-process
2) 1270 133,34 0,10 5,83% 133,34 0,10 5,83% -hsmw-highlight-main-type
3) 395 12,09 0,03 0,53% 12,09 0,03 0,53% -hsmw-highlight-check-path
4) 22 5,48 0,25 0,24% 5,48 0,25 0,24% -hsmw-highlight-string
5) 6 2,36 0,39 0,10% 2,36 0,39 0,10% -hsmw-highlight-dollar-string
6) 46 0,97 0,02 0,04% 0,97 0,02 0,04% -hsmw-highlight-stack-pop
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
parse.zsh ./to-parse.zsh changes.out, after changes:
Running time: 2.1237140000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2123,18 2123,18 100,00% 1979,84 1979,84 93,25% -hsmw-highlight-process
2) 755 122,09 0,16 5,75% 122,09 0,16 5,75% -hsmw-highlight-main-type
3) 395 13,66 0,03 0,64% 13,66 0,03 0,64% -hsmw-highlight-check-path
4) 22 4,46 0,20 0,21% 4,46 0,20 0,21% -hsmw-highlight-string
5) 6 2,04 0,34 0,10% 2,04 0,34 0,10% -hsmw-highlight-dollar-string
6) 46 1,10 0,02 0,05% 1,10 0,02 0,05% -hsmw-highlight-stack-pop
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
./parse.zsh -oo, after changes:
Running time: 1.5936520000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1586,12 4,53 99,99% 1222,20 3,49 77,05% -hsmw-highlight-process
2) 2800 288,42 0,10 18,18% 288,42 0,10 18,18% -hsmw-highlight-string
3) 1750 40,57 0,02 2,56% 40,57 0,02 2,56% -hsmw-highlight-check-path
4) 1400 24,97 0,02 1,57% 24,97 0,02 1,57% -hsmw-highlight-main-type
5) 350 9,96 0,03 0,63% 9,96 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 12:36:55 +00:00
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
start_pos=$end_pos
continue
*highlight: Optimization: short path for ';'
Values at 15xx level started to again appear quite much often.
parse.zsh -oo, after changes:
Running time: 1.5699860000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1561,31 4,46 99,99% 1197,84 3,42 76,71% -hsmw-highlight-process
2) 2800 288,12 0,10 18,45% 288,12 0,10 18,45% -hsmw-highlight-string
3) 1750 41,02 0,02 2,63% 41,02 0,02 2,63% -hsmw-highlight-check-path
4) 1400 24,56 0,02 1,57% 24,56 0,02 1,57% -hsmw-highlight-main-type
5) 350 9,77 0,03 0,63% 9,77 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,09 0,09 0,01% 0,09 0,09 0,01% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 12:53:42 +00:00
else
(( in_array_assignment )) && (( this_word = 2 )) || { (( this_word = 1 )); highlight_glob=1; }
in_redirection=0
[[ "${HSMW_HIGHLIGHT_STYLES[commandseparator]}" != "none" ]] && reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[commandseparator]}")
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
start_pos=$end_pos
continue
*highlight: Optimization and slowdown – short path for actual new lines
parse.zsh ./to-parse.zsh changes.out, before changes:
Running time: 2.2866420000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2286,16 2286,16 100,00% 2131,92 2131,92 93,25% -hsmw-highlight-process
2) 1270 133,34 0,10 5,83% 133,34 0,10 5,83% -hsmw-highlight-main-type
3) 395 12,09 0,03 0,53% 12,09 0,03 0,53% -hsmw-highlight-check-path
4) 22 5,48 0,25 0,24% 5,48 0,25 0,24% -hsmw-highlight-string
5) 6 2,36 0,39 0,10% 2,36 0,39 0,10% -hsmw-highlight-dollar-string
6) 46 0,97 0,02 0,04% 0,97 0,02 0,04% -hsmw-highlight-stack-pop
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
parse.zsh ./to-parse.zsh changes.out, after changes:
Running time: 2.1237140000
num calls time self name
-----------------------------------------------------------------------------------
1) 1 2123,18 2123,18 100,00% 1979,84 1979,84 93,25% -hsmw-highlight-process
2) 755 122,09 0,16 5,75% 122,09 0,16 5,75% -hsmw-highlight-main-type
3) 395 13,66 0,03 0,64% 13,66 0,03 0,64% -hsmw-highlight-check-path
4) 22 4,46 0,20 0,21% 4,46 0,20 0,21% -hsmw-highlight-string
5) 6 2,04 0,34 0,10% 2,04 0,34 0,10% -hsmw-highlight-dollar-string
6) 46 1,10 0,02 0,05% 1,10 0,02 0,05% -hsmw-highlight-stack-pop
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
./parse.zsh -oo, after changes:
Running time: 1.5936520000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1586,12 4,53 99,99% 1222,20 3,49 77,05% -hsmw-highlight-process
2) 2800 288,42 0,10 18,18% 288,42 0,10 18,18% -hsmw-highlight-string
3) 1750 40,57 0,02 2,56% 40,57 0,02 2,56% -hsmw-highlight-check-path
4) 1400 24,97 0,02 1,57% 24,97 0,02 1,57% -hsmw-highlight-main-type
5) 350 9,96 0,03 0,63% 9,96 0,03 0,63% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-31 12:36:55 +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
arg_type=3
2016-10-09 07:06:50 +00:00
else
*highlight: Huge optimization: Don't redefine variables at each loop
parse.zsh -oo, after changes:
Running time: 1.7135350000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1706,03 4,87 99,99% 1230,37 3,52 72,11% -hsmw-highlight-process
2) 2800 338,39 0,12 19,83% 338,39 0,12 19,83% -hsmw-highlight-string
3) 2450 81,56 0,03 4,78% 81,56 0,03 4,78% -hsmw-highlight-check-path
4) 1400 38,43 0,03 2,25% 38,43 0,03 2,25% -hsmw-highlight-main-type
5) 350 9,85 0,03 0,58% 9,85 0,03 0,58% -hsmw-highlight-stack-pop
6) 350 7,44 0,02 0,44% 7,44 0,02 0,44% -hsmw-highlight-path-separators
7) 1 0,12 0,12 0,01% 0,12 0,12 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 16:06:45 +00:00
offset=0
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
if [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\[[:space:]])##)* ]]; then
2022-07-01 15:41:59 +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
arg_type=${__HSMW_HIGHLIGHT_TOKENS_TYPES[$arg]}
2016-10-09 07:06:50 +00:00
fi
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
proc_buf="${proc_buf[offset + $#arg + 1,len]}"
2016-10-09 07:06:50 +00:00
if [[ -n ${interactive_comments+'set'} && $arg[1] == $histchars[3] ]]; then
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
if (( this_word & 3 )); 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
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
2016-11-02 09:55:10 +00:00
start_pos=$end_pos
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
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
if (( this_word & 4 )) && [[ $arg != -* ]]; then
(( this_word = this_word ^ 4 ))
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
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
if (( this_word & 4 )); then
2016-10-09 07:06:50 +00:00
case "$arg" in
2022-07-01 15:41:59 +00:00
# Flag that requires an argument
2016-10-15 17:12:40 +00:00
'-'[Cgprtu])
2022-07-01 15:41:59 +00:00
(( this_word & 1 )) && (( this_word = this_word ^ 1 ))
(( next_word = 8 ))
;;
# This prevents misbehavior with sudo -u -otherargument
2016-10-15 17:12:40 +00:00
'-'*)
2022-07-01 15:41:59 +00:00
(( this_word & 1 )) && (( this_word = this_word ^ 1 ))
(( next_word = next_word | 1 ))
(( next_word = next_word | 4 ))
;;
2016-10-09 07:06:50 +00:00
*) ;;
esac
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
elif (( this_word & 8 )); then
(( next_word = next_word | 4 ))
(( next_word = next_word | 1 ))
2016-10-09 07:06:50 +00:00
fi
2022-07-01 15:41:59 +00:00
fi
expanded_path=""
# The Great Fork: is this a command word? Is this a non-command word?
if (( this_word & 16 )) && [[ $arg == 'always' ]]; then
# try-always construct
style=reserved-word # de facto a reserved word, although not de jure
(( next_word = 1 ))
elif (( this_word & 1 )) && (( in_redirection == 0 )); then # $arg is the command word
cur_cmd="$arg"
if (( arg_type == 1 )); then
style=precommand
elif [[ "$arg" = "sudo" ]]; then
style=precommand
(( next_word & 2 )) && (( next_word = next_word ^ 2 ))
(( next_word = next_word | 4 ))
(( next_word = next_word | 1 ))
else
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
case $REPLY in
reserved) # reserved word
style=reserved-word
if [[ $arg == $'\x7b' ]]; then
braces_stack='Y'"$braces_stack"
elif [[ $arg == $'\x7d' && $braces_stack[1] == "Y" ]]; then
braces_stack[1]=""
style=reserved-word
(( next_word = next_word | 16 ))
elif [[ $arg == "[[" ]]; then
braces_stack='A'"$braces_stack"
fi
;;
'suffix alias') style=suffix-alias ;;
alias)
insane_alias=0
case $arg in
'='*)
:
;;
*'='*)
insane_alias=1
;;
*)
:
;;
esac
if (( insane_alias )); then
style=unknown-token
else
style=alias
zmodload -e zsh/parameter && alias_target=${aliases[$arg]} || alias_target="${"$(alias -- $arg)"#*=}"
[[ ${__HSMW_HIGHLIGHT_TOKENS_TYPES[$alias_target]} = "1" && "$arg_type" != "1" ]] && __HSMW_HIGHLIGHT_TOKENS_TYPES[$arg]="1"
fi
;;
builtin)
style=builtin ;;
function)
style=() ;;
command)
style=command ;;
hashed)
style=hashed-command ;;
dirpath)
style=path ;;
none)
if [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[[^\]]#\])(|[+])=* ]] || [[ $arg == [0-9]##(|[+])=* ]]; then
style=assign
[[ $arg[-1] == '(' ]] && in_array_assignment=1 || (( next_word = next_word | 1 ))
elif [[ $arg[1] = $histchars[1] && -n "${arg[2]}" ]]; then
style=history-expansion
elif [[ $arg[1] == $histchars[2] ]]; then
style=history-expansion
elif (( arg_type == 3 )); then
(( this_word & 2 )) && style=commandseparator
elif [[ $arg[1,2] == '((' ]]; then
reply+=("$start_pos $(( start_pos + 2 )) ${HSMW_HIGHLIGHT_STYLES[reserved-word]}")
already_added=1
[[ $arg[-2,-1] == '))' ]] && reply+=("$(( end_pos - 2 )) $end_pos ${HSMW_HIGHLIGHT_STYLES[reserved-word]}")
elif [[ $arg == '()' ]]; then
style=reserved-word
elif [[ $arg == $'\x28' ]]; then
style=reserved-word
braces_stack='R'"$braces_stack"
elif [[ $arg == $'\x29' ]]; then
[[ $braces_stack[1] == "R" ]] && { braces_stack[1]=""; style=reserved-word; }
elif (( this_word & 14 )); then
style=default
fi
;;
*)
already_added=1
;;
esac
fi
elif (( in_redirection + this_word & 14 )); then
2016-10-09 07:06:50 +00:00
case $arg in
2016-10-30 10:42:53 +00:00
']]')
2022-07-01 15:41:59 +00:00
style=reserved-word
[[ $braces_stack[1] == "A" ]] && braces_stack[1]=""
;;
2017-04-10 08:40:12 +00:00
']')
2022-07-01 15:41:59 +00:00
style=builtin
;;
2018-03-17 06:49:00 +00:00
$'\x28')
2022-07-01 15:41:59 +00:00
style=reserved-word
braces_stack='R'"$braces_stack"
;;
2016-10-09 07:06:50 +00:00
$'\x29') # subshell or end of array assignment
2022-07-01 15:41:59 +00:00
if (( in_array_assignment )); then
style=assign
in_array_assignment=0
(( next_word = next_word | 1 ))
elif [[ $braces_stack[1] == "R" ]]; then
braces_stack[1]=""
style=reserved-word
fi ;;
$'\x28\x29')
(( multi_func_def )) && (( next_word = next_word | 1 ))
style=reserved-word
reply[-1]=()
;;
'--'*)
style=double-hyphen-option ;;
'-'*)
style=single-hyphen-option ;;
"'"*)
style=single-quoted-argument ;;
*highlight: Optimization: Don't assign `style` just to use its value
parse.zsh -oo, after changes:
Running time: 1.6640020000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1656,49 4,73 99,99% 1215,36 3,47 73,37% -hsmw-highlight-process
2) 2800 326,28 0,12 19,70% 326,28 0,12 19,70% -hsmw-highlight-string
3) 2450 72,58 0,03 4,38% 72,58 0,03 4,38% -hsmw-highlight-check-path
4) 1400 24,87 0,02 1,50% 24,87 0,02 1,50% -hsmw-highlight-main-type
5) 350 9,75 0,03 0,59% 9,75 0,03 0,59% -hsmw-highlight-stack-pop
6) 350 7,66 0,02 0,46% 7,66 0,02 0,46% -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 19:01:51 +00:00
'"'*)
2022-07-01 15:41:59 +00:00
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[double-quoted-argument]}")
-hsmw-highlight-string
already_added=1
;;
\$\*)
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[dollar-quoted-argument]}")
-hsmw-highlight-dollar-string
already_added=1
;;
2016-11-03 10:49:07 +00:00
\$[^\(]*)
2022-07-01 15:41:59 +00:00
style=variable
;;
'`'*)
style=back-quoted-argument
;;
2016-10-09 07:06:50 +00:00
[*?]*|*[^\\][*?]*)
2022-07-01 15:41:59 +00:00
(( highlight_glob )) && style=globbing || style=default
;;
*)
if [[ $arg = $'\x7d' && $braces_stack[1] == "Y" ]] && [[ "$right_brace_is_recognised_everywhere" = "1" ]]; then
braces_stack[1]=""
style=reserved-word
(( next_word = next_word | 16 ))
elif [[ $arg[1] = $histchars[1] && -n "${arg[2]}" ]]; then
style=history-expansion
elif (( arg_type == 3 )); then
style=commandseparator
elif (( in_redirection == 2 )); then
style=redirection
else
if (( __hsmw_no_check_paths == 0 )) && -hsmw-highlight-check-path; then
reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[path]}")
already_added=1
if [[ -n "$HSMW_HIGHLIGHT_STYLES[path_pathseparator]" && "$HSMW_HIGHLIGHT_STYLES[path]" != "$HSMW_HIGHLIGHT_STYLES[path_pathseparator]" ]]; then
local pos
for (( pos = start_pos; pos <= end_pos; pos++ )) ; do
[[ ${buf[pos]} == "/" ]] && reply+=("$(( pos - 1 )) $pos ${HSMW_HIGHLIGHT_STYLES[path_pathseparator]}")
done
fi
else
style=default
fi
fi
;;
2016-10-09 07:06:50 +00:00
esac
fi
*highlight: Optimization: Compress main region_highlight update code
parse.zsh -oo, after changes:
Running time: 1.6200120000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1612,65 4,61 100,00% 1181,71 3,38 73,27% -hsmw-highlight-process
2) 2800 323,54 0,12 20,06% 323,54 0,12 20,06% -hsmw-highlight-string
3) 2450 71,88 0,03 4,46% 71,88 0,03 4,46% -hsmw-highlight-check-path
4) 1400 25,71 0,02 1,59% 25,71 0,02 1,59% -hsmw-highlight-main-type
5) 350 9,81 0,03 0,61% 9,81 0,03 0,61% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 08:29:03 +00:00
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
(( already_added == 0 )) && [[ "${HSMW_HIGHLIGHT_STYLES[$style]}" != "none" ]] && reply+=("$start_pos $end_pos ${HSMW_HIGHLIGHT_STYLES[$style]}")
*highlight: Optimization: Compress main region_highlight update code
parse.zsh -oo, after changes:
Running time: 1.6200120000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1612,65 4,61 100,00% 1181,71 3,38 73,27% -hsmw-highlight-process
2) 2800 323,54 0,12 20,06% 323,54 0,12 20,06% -hsmw-highlight-string
3) 2450 71,88 0,03 4,46% 71,88 0,03 4,46% -hsmw-highlight-check-path
4) 1400 25,71 0,02 1,59% 25,71 0,02 1,59% -hsmw-highlight-main-type
5) 350 9,81 0,03 0,61% 9,81 0,03 0,61% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 08:29:03 +00:00
*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
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
(( next_word = 2 ))
2018-03-17 06:49:00 +00:00
elif [[ -n "${braces_stack[(r)A]}" ]]; then
(( next_word = 2 ))
2016-10-09 07:06:50 +00:00
else
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
(( next_word = 1 ))
*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: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
elif (( arg_type == 1 || arg_type == 2 )) && (( this_word & 1 )); then
2022-07-01 15:41:59 +00:00
(( next_word = 1 ))
*highlight: Optimization: Convert from BIT_* variables into integers
./parse.zsh -oo, after changes:
Running time: 1.5050810000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1497,75 4,28 99,99% 1132,48 3,24 75,61% -hsmw-highlight-process
2) 2800 267,48 0,10 17,86% 267,48 0,10 17,86% -hsmw-highlight-string
3) 2450 61,29 0,03 4,09% 61,29 0,03 4,09% -hsmw-highlight-check-path
4) 1400 24,89 0,02 1,66% 24,89 0,02 1,66% -hsmw-highlight-main-type
5) 350 11,61 0,03 0,78% 11,61 0,03 0,78% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:54:43 +00:00
elif [[ $arg == "repeat" ]] && (( this_word & 1 )); then
2016-10-09 07:06:50 +00:00
in_redirection=2
2022-07-01 15:41:59 +00:00
(( thisword = 3 ))
2016-10-09 07:06:50 +00:00
fi
start_pos=$end_pos
2022-07-01 15:41:59 +00:00
(( in_redirection == 0 )) && (( this_word = next_word ))
2016-10-09 07:06:50 +00:00
done
2018-03-17 06:49:00 +00:00
return 0
2016-10-09 07:06:50 +00:00
}
2022-07-01 15:41:59 +00:00
-hsmw-highlight-check-path() {
2016-10-17 11:07:29 +00:00
: ${expanded_path:=${(Q)~arg}}
2018-05-25 17:51:22 +00:00
[[ -n "${FAST_BLIST_PATTERNS[(k)$expanded_path]}" ]] && return 1
2016-10-09 07:06:50 +00:00
[[ -z $expanded_path ]] && return 1
[[ -e $expanded_path ]] && return 0
2022-07-01 15:41:59 +00:00
if [[ "$cur_cmd" = "cd" ]]; then
for cdpath_dir in $cdpath ; do
if [[ -e "$cdpath_dir/$expanded_path" ]]; then
return 0
fi
done
fi
2016-10-09 07:06:50 +00:00
return 1
}
2022-07-01 15:41:59 +00:00
-hsmw-highlight-string() {
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
mybuf="$arg"
*highlight: Optimization: declare *-string vars outside, once
parse.zsh -oo, after changes:
Running time: 1.5839050000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1576,36 4,50 99,99% 1177,23 3,36 74,68% -hsmw-highlight-process
2) 2800 292,16 0,10 18,53% 292,16 0,10 18,53% -hsmw-highlight-string
3) 2450 72,24 0,03 4,58% 72,24 0,03 4,58% -hsmw-highlight-check-path
4) 1400 24,98 0,02 1,58% 24,98 0,02 1,58% -hsmw-highlight-main-type
5) 350 9,74 0,03 0,62% 9,74 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:05:27 +00:00
idx=start_pos
2016-10-16 10:38:37 +00:00
2022-07-01 15:41:59 +00:00
while [[ "$mybuf" = (#b)[^\$\\]#((\$(#B)([a-zA-Z_:][a-zA-Z0-9_:]#|[0-9]##)(#b)(\[[^\]]#\])(#c0,1))|(\$[{](\([a-zA-Z0@%#]##\))(#c0,1)[a-zA-Z0-9_:#]##(\[[^\]]#\])(#c0,1)[}])|[\\][\"\'\$]|[\\](*))(*) ]]; do
if [[ -n "${match[7]}" ]]; then
2016-11-01 07:36:22 +00:00
idx+=${mbegin[1]}+1
mybuf="${match[7]:1}"
2022-07-01 15:41:59 +00:00
else
2016-10-16 11:41:14 +00:00
idx+=${mbegin[1]}-1
end_idx=idx+${mend[1]}-${mbegin[1]}+1
Revert "*highlight: Optimization: convert "$var" -> $var"
This reverts commit 453de0a0ab69887068c1c217514a2c804cf9f616.
Turns out that ./parse ./to-parse works MUCH (almost 100ms) slower
without variables quoted.
./parse.zsh -oo, after changes:
Running time: 1.5502340000
num calls time self name
-----------------------------------------------------------------------------------
1) 350 1542,62 4,41 99,99% 1177,33 3,36 76,32% -hsmw-highlight-process
2) 2800 267,57 0,10 17,34% 267,57 0,10 17,34% -hsmw-highlight-string
3) 2450 61,97 0,03 4,02% 61,97 0,03 4,02% -hsmw-highlight-check-path
4) 1400 26,14 0,02 1,69% 26,14 0,02 1,69% -hsmw-highlight-main-type
5) 350 9,61 0,03 0,62% 9,61 0,03 0,62% -hsmw-highlight-stack-pop
6) 1 0,07 0,07 0,00% 0,07 0,07 0,00% -hsmw-highlight-fill-option-variables
7) 1 0,01 0,01 0,00% 0,01 0,01 0,00% -hsmw-highlight-init
2016-10-26 09:22:09 +00:00
mybuf="${match[8]}"
2016-10-16 10:38:37 +00:00
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
2022-07-01 15:41:59 +00:00
fi
2016-10-09 07:06:50 +00:00
done
}
2022-07-01 15:41:59 +00:00
-hsmw-highlight-dollar-string() {
2016-10-09 07:06:50 +00:00
local i j k style
local AA
integer c
2022-07-01 15:41:59 +00:00
for (( i = 3 ; i < end_pos - start_pos ; i += 1 )); do
2016-10-09 07:06:50 +00:00
(( j = i + start_pos - 1 ))
(( k = j + 1 ))
2022-07-01 15:41:59 +00:00
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]
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
style=unknown-token
fi
(( k += 1 )) # Color following char too.
(( i += 1 )) # Skip parsing the escaped char.
fi
;;
*)
continue
;;
2016-10-09 07:06:50 +00:00
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
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
}
2017-10-18 11:39:37 +00:00
typeset -g __HSMW_MH_SOURCED=1