AcediaFramework
/
AcediaCore
2
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
Browse Source

Change `ColorAPI` parsing to be more efficient 

Now `ColorAPI` uses `Text` constants returned by `T()` instead of
breaking `string` constants into cahracters each time.
pull/8/head
Anton Tarasenko 3 years ago
parent
c8ed85387d
commit
265daa71b0
1 changed files with 57 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      sources/Color/ColorAPI.uc

88
sources/Color/ColorAPI.uc
Unescape View File

@ -504,6 +504,10 @@ var public config const Color greydarken2;
var public config const Color greydarken3; var public config const Color greydarken3;
var public config const Color greydarken4; var public config const Color greydarken4;
var private const int TRGB, TRGBA, TCLOSING_PARENTHESIS, TR_COMPONENT;
var private const int TG_COMPONENT, TB_COMPONENT, TA_COMPONENT, TCOMMA, THASH;
var private const int TDOLLAR;
// Struct and array that are meant to store colors used by "^"-color tags: // Struct and array that are meant to store colors used by "^"-color tags:
// "^2" means green, "^b" means blue, etc.. // "^2" means green, "^b" means blue, etc..
struct ShortColorTagDefinition struct ShortColorTagDefinition
@ -852,26 +856,26 @@ private final function Color ParseRGB(Parser parser)
local int blueComponent; local int blueComponent;
local Parser.ParserState initialParserState; local Parser.ParserState initialParserState;
initialParserState = parser.GetCurrentState(); initialParserState = parser.GetCurrentState();
parser.MatchS("rgb(", SCASE_INSENSITIVE) parser.Match(T(TRGB), SCASE_INSENSITIVE)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MInteger(blueComponent).MatchS(")"); .MInteger(blueComponent).Match(T(TCLOSING_PARENTHESIS));
if (!parser.Ok()) if (!parser.Ok())
{ {
parser.RestoreState(initialParserState) parser.RestoreState(initialParserState)
.MatchS("rgb(", SCASE_INSENSITIVE) .Match(T(TRGB), SCASE_INSENSITIVE)
.MatchS("r=", SCASE_INSENSITIVE) .Match(T(TR_COMPONENT), SCASE_INSENSITIVE)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MatchS("g=", SCASE_INSENSITIVE) .Match(T(TG_COMPONENT), SCASE_INSENSITIVE)
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MatchS("b=", SCASE_INSENSITIVE) .Match(T(TB_COMPONENT), SCASE_INSENSITIVE)
.MInteger(blueComponent).MatchS(")"); .MInteger(blueComponent).Match(T(TCLOSING_PARENTHESIS));
} }
if (!parser.Ok()) if (!parser.Ok())
{ {
parser.RestoreState(initialParserState) parser.RestoreState(initialParserState)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MInteger(blueComponent); .MInteger(blueComponent);
} }
return RGB(redComponent, greenComponent, blueComponent); return RGB(redComponent, greenComponent, blueComponent);
@ -887,30 +891,30 @@ private final function Color ParseRGBA(Parser parser)
local int alphaComponent; local int alphaComponent;
local Parser.ParserState initialParserState; local Parser.ParserState initialParserState;
initialParserState = parser.GetCurrentState(); initialParserState = parser.GetCurrentState();
parser.MatchS("rgba(", SCASE_INSENSITIVE) parser.Match(T(TRGBA), SCASE_INSENSITIVE)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MInteger(blueComponent).MatchS(",") .MInteger(blueComponent).Match(T(TCOMMA))
.MInteger(alphaComponent).MatchS(")"); .MInteger(alphaComponent).Match(T(TCLOSING_PARENTHESIS));
if (!parser.Ok()) if (!parser.Ok())
{ {
parser.RestoreState(initialParserState) parser.RestoreState(initialParserState)
.MatchS("rgba(", SCASE_INSENSITIVE) .Match(T(TRGBA), SCASE_INSENSITIVE)
.MatchS("r=", SCASE_INSENSITIVE) .Match(T(TR_COMPONENT), SCASE_INSENSITIVE)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MatchS("g=", SCASE_INSENSITIVE) .Match(T(TG_COMPONENT), SCASE_INSENSITIVE)
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MatchS("b=", SCASE_INSENSITIVE) .Match(T(TB_COMPONENT), SCASE_INSENSITIVE)
.MInteger(blueComponent).MatchS(",") .MInteger(blueComponent).Match(T(TCOMMA))
.MatchS("a=", SCASE_INSENSITIVE) .Match(T(TA_COMPONENT), SCASE_INSENSITIVE)
.MInteger(alphaComponent).MatchS(")"); .MInteger(alphaComponent).Match(T(TCLOSING_PARENTHESIS));
} }
if (!parser.Ok()) if (!parser.Ok())
{ {
parser.RestoreState(initialParserState) parser.RestoreState(initialParserState)
.MInteger(redComponent).MatchS(",") .MInteger(redComponent).Match(T(TCOMMA))
.MInteger(greenComponent).MatchS(",") .MInteger(greenComponent).Match(T(TCOMMA))
.MInteger(blueComponent).MatchS(",") .MInteger(blueComponent).Match(T(TCOMMA))
.MInteger(alphaComponent); .MInteger(alphaComponent);
} }
return RGBA(redComponent, greenComponent, blueComponent, alphaComponent); return RGBA(redComponent, greenComponent, blueComponent, alphaComponent);
@ -922,7 +926,7 @@ private final function Color ParseHexColor(Parser parser)
local int redComponent; local int redComponent;
local int greenComponent; local int greenComponent;
local int blueComponent; local int blueComponent;
parser.MatchS("#") parser.Match(T(THASH))
.MUnsignedInteger(redComponent, 16, 2) .MUnsignedInteger(redComponent, 16, 2)
.MUnsignedInteger(greenComponent, 16, 2) .MUnsignedInteger(greenComponent, 16, 2)
.MUnsignedInteger(blueComponent, 16, 2); .MUnsignedInteger(blueComponent, 16, 2);
@ -954,7 +958,7 @@ public final function bool ParseWith(Parser parser, out Color resultingColor)
resultingColor.a = 0xff; resultingColor.a = 0xff;
colorParser = parser; colorParser = parser;
initialParserState = parser.GetCurrentState(); initialParserState = parser.GetCurrentState();
if (parser.MatchS("$").MUntil(colorAlias,, true).Ok()) if (parser.Match(T(TDOLLAR)).MUntil(colorAlias,, true).Ok())
{ {
colorContent = _.alias.ResolveColor(colorAlias); colorContent = _.alias.ResolveColor(colorAlias);
colorParser = _.text.Parse(colorContent); colorParser = _.text.Parse(colorContent);
@ -1508,4 +1512,24 @@ defaultproperties
shortColorTag(18)=(char="w",color=(R=255,G=255,B=255,A=255)) shortColorTag(18)=(char="w",color=(R=255,G=255,B=255,A=255))
CODEPOINT_SMALL_A = 97 CODEPOINT_SMALL_A = 97
CODEPOINT_ESCAPE = 27 CODEPOINT_ESCAPE = 27
TRGB = 0
stringConstants(0) = "rgb("
TRGBA = 1
stringConstants(1) = "rgba("
TCLOSING_PARENTHESIS = 2
stringConstants(2) = ")"
TR_COMPONENT = 3
stringConstants(3) = "r="
TG_COMPONENT = 4
stringConstants(4) = "g="
TB_COMPONENT = 5
stringConstants(5) = "b="
TA_COMPONENT = 6
stringConstants(6) = "a="
TCOMMA = 7
stringConstants(7) = ","
THASH = 8
stringConstants(8) = "#"
TDOLLAR = 9
stringConstants(9) = "$"
} }
Write Preview
Loading…
Cancel
Save