bruno/advent-of-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent "^((.*))$" in regex: easier to read, small perf improvement.

Browse Source
This commit is contained in:
Bruno Raoult
2021-07-18 11:08:49 +02:00
parent e674488a17
commit 1bc7101cf6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
day19/ex1.bash
View File

@@ -21,7 +21,7 @@ function buildtree {
local name="var_$prof" # local var name, w/ depth local name="var_$prof" # local var name, w/ depth
eval "local $name" # ... declared here eval "local $name" # ... declared here
shift 2 shift 2
local args=$* res="" arg tmp local args=$* res="" arg t
for arg in $args; do for arg in $args; do
if [[ -z "${arg/[|ab]}" ]]; then if [[ -z "${arg/[|ab]}" ]]; then
@@ -29,9 +29,12 @@ function buildtree {
else else
if [[ ! -v MATCH[$arg] ]]; then if [[ ! -v MATCH[$arg] ]]; then
buildtree "$((prof+1))" "$name" "${RULE[$arg]}" buildtree "$((prof+1))" "$name" "${RULE[$arg]}"
tmp="${!name}" t="${!name}"
[[ ! "$tmp" =~ ^.$ ]] && tmp="($tmp)" #[[ ! "$t" =~ ^.$ ]] && t="($t)"
MATCH[$arg]="$tmp" if [[ ! "$t" =~ ^[ab]+$ ]] && [[ "${t:0:1}${t: -1}" != "()" ]]; then
t="($t)"
fi
MATCH[$arg]="$t"
fi fi
res+=${MATCH[$arg]} res+=${MATCH[$arg]}
fi fi
@@ -54,7 +57,7 @@ while read -r line; do
done done
buildtree 1 var_0 0 buildtree 1 var_0 0
#printf "RULE ZERO = %s\n" "${MATCH[0]}" printf "RULE ZERO = %s\n" "${MATCH[0]}"
for str in "${STRING[@]}"; do for str in "${STRING[@]}"; do
[[ "$str" =~ ^${MATCH[0]}$ ]] && ((res++)) [[ "$str" =~ ^${MATCH[0]}$ ]] && ((res++))