Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

The is_num(), is_alpha(), and is_alnum() BiFs now return F on empty string

Browse source
This commit is contained in:
Christian Kreibich 2022-02-28 13:02:36 -08:00
parent 19bfa071e0
commit b977e76ad5
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -15,6 +15,8 @@ New Functionality
Changed Functionality Changed Functionality
--------------------- ---------------------
- The is_num(), is_alpha(), and is_alnum() BiFs now return F for the empty string.
Deprecated Functionality Deprecated Functionality
------------------------ ------------------------

18
src/strings.bif
View file

@ -1254,13 +1254,17 @@ function ends_with%(str: string, sub: string%) : bool
return zeek::val_mgr->Bool(s.rfind(sub_s) == (s.size() - sub_s.size())); return zeek::val_mgr->Bool(s.rfind(sub_s) == (s.size() - sub_s.size()));
%} %}
## Returns whether an entire string consists only of digits. ## Returns whether a string consists entirely of digits.
## The empty string is not numeric.
## ##
function is_num%(str: string%) : bool function is_num%(str: string%) : bool
%{ %{
// Python's version of this method (which this is based on) just checks to see if every // Python's version of this method (which this is based on) just checks to see if every
// character in the string is a numeric value. If something more than this is desired, we // character in the string is a numeric value. If something more than this is desired, we
// could use something like std::from_chars or std::strto{ul,f} to check it. // could use something like std::from_chars or std::strto{ul,f} to check it.
if ( str->Len() == 0 )
return zeek::val_mgr->False();
const char* s = str->CheckString(); const char* s = str->CheckString();
for ( int i = 0; i < str->Len(); i++ ) for ( int i = 0; i < str->Len(); i++ )
if ( ! std::isdigit(s[i]) ) if ( ! std::isdigit(s[i]) )
@ -1269,10 +1273,14 @@ function is_num%(str: string%) : bool
return zeek::val_mgr->True(); return zeek::val_mgr->True();
%} %}
## Returns whether an entire string is alphabetic characters. ## Returns whether a string consists entirely of alphabetic characters.
## The empty string is not alphabetic.
## ##
function is_alpha%(str: string%) : bool function is_alpha%(str: string%) : bool
%{ %{
if ( str->Len() == 0 )
return zeek::val_mgr->False();
const char* s = str->CheckString(); const char* s = str->CheckString();
for ( int i = 0; i < str->Len(); i++ ) for ( int i = 0; i < str->Len(); i++ )
if ( ! std::isalpha(s[i]) ) if ( ! std::isalpha(s[i]) )
@ -1281,10 +1289,14 @@ function is_alpha%(str: string%) : bool
return zeek::val_mgr->True(); return zeek::val_mgr->True();
%} %}
## Returns whether an entire string is alphanumeric characters ## Returns whether a string consists entirely of alphanumeric characters.
## The empty string is not alphanumeric.
## ##
function is_alnum%(str: string%) : bool function is_alnum%(str: string%) : bool
%{ %{
if ( str->Len() == 0 )
return zeek::val_mgr->False();
const char* s = str->CheckString(); const char* s = str->CheckString();
for ( int i = 0; i < str->Len(); i++ ) for ( int i = 0; i < str->Len(); i++ )
if ( ! std::isalnum(s[i]) ) if ( ! std::isalnum(s[i]) )