Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bfs: Minor cleanup.

Browse Source 
* Added helper methods for operator/equation characters.
This commit is contained in:
Axel Dörfler 2017-01-19 20:59:13 +01:00
parent e5022f23b3
commit a2eb6bbda4
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/add-ons/kernel/file_systems/bfs/Query.cpp
View File

@ -148,6 +148,8 @@ private:
status_t _ParseQuotedString(char** _start, char** _end);
char* _CopyString(char* start, char* end);
inline bool _IsEquationChar(char c) const;
inline bool _IsOperatorChar(char c) const;
status_t _ConvertValue(type_code type);
bool _CompareTo(const uint8* value, uint16 size);
uint8* _Value() const { return (uint8*)&fValue; }
@ -232,16 +234,17 @@ Equation::Equation(char** _expression)
// set string to a valid start of the equation symbol
string = end + 2;
skipWhitespace(&string);
if (*string != '=' && *string != '<' && *string != '>'
&& *string != '!') {
if (!_IsEquationChar(string[0])) {
*_expression = string;
return;
}
} else {
// search the (in)equation for the actual equation symbol (and for other operators
// in case the equation is malformed)
while (*string && *string != '=' && *string != '<' && *string != '>'
&& *string != '!' && *string != '&' && *string != '|') {
while (string[0] != 0 && !_IsOperatorChar(string[0])
&& !_IsEquationChar(string[0])) {
if (string[0] == '\\' && string[1] != 0)
string++;
string++;
}
@ -305,7 +308,7 @@ Equation::Equation(char** _expression)
string = end + 2;
skipWhitespace(&string);
} else {
while (*string && *string != '&' && *string != '|' && *string != ')')
while (string[0] && !_IsOperatorChar(string[0]) && string[0] != ')')
string++;
end = string - 1;
@ -761,6 +764,20 @@ Equation::_CopyString(char* start, char* end)
}
bool
Equation::_IsEquationChar(char c) const
{
return c == '=' || c == '<' || c == '>' || c == '!';
}
bool
Equation::_IsOperatorChar(char c) const
{
return c == '&' || c == '|';
}
status_t
Equation::_ConvertValue(type_code type)
{