Skip to content

Optimize color escape lookups #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rydnr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimize color escape lookups #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/modules/color.dw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,29 @@ function COLOR.setCachedAllowsColors() {
DW.setGlobalInt "${RESULT}" CACHED_ALLOWS_COLORS ${_flag};
}

# fun: COLOR.getColorValue symbol
# api: private
# txt: Retrieves the ANSI escape sequence for a color symbol.
# opt: symbol: The color symbol.
# txt: Returns 0/TRUE if the symbol is defined; 1/FALSE otherwise.
# txt: The variable RESULT contains the escape sequence.
# use: if COLOR.getColorValue RED; then
# use: echo "red: ${RESULT}";
# use: fi
function COLOR.getColorValue() {
local _symbol="${1}";
checkNotEmpty symbol "${_symbol}" 1;

local _value="${!_symbol}";

if isEmpty "${_value}"; then
return ${FALSE};
fi

export RESULT="${_value}";
return ${TRUE};
}

# fun: getColorEscapeCode name defaultColor?
# api: public
# txt: Retrieves the color for given name.
Expand All @@ -283,10 +306,10 @@ function getColorEscapeCode() {

if allowsColors; then
if isNotEmpty "${_colorSymbol}" \
&& evalConstant "${_colorSymbol}"; then
&& COLOR.getColorValue "${_colorSymbol}"; then
_result="${RESULT}";
elif isNotEmpty "${_defaultColorSymbol}" \
&& evalConstant "${_defaultColorSymbol}"; then
&& COLOR.getColorValue "${_defaultColorSymbol}"; then
_result="${RESULT}";
# else
# exitWithErrorCode INTERNAL_ERROR "Error getting color ${_colorSymbol} (variable: ${_colorVariableName}) (default: ${_defaultColorVariableName})";
Expand Down
4 changes: 2 additions & 2 deletions src/modules/echo.dw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ function echoInColor() {
local _noColor;
if allowsColors; then
_inColor=${TRUE};
getColorEscapeCode "${_color}";
COLOR.getColorValue "${_color}";
_colorAux="${RESULT}";
getNoColor;
getColorEscapeCode "${RESULT}";
COLOR.getColorValue "${RESULT}";
_noColor="${RESULT}";
fi

Expand Down