kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue #9851 - only seed the random number generator on the first call to STRING(RANDOM or if given the new RANDOM_SEED argument. Add test and documentation of new argument.

This commit is contained in:
David Cole 2009-11-06 10:07:10 -05:00
parent 10762565e9
commit d6fe0438c1
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmStringCommand.cxx
View File

@ -700,6 +700,9 @@ bool cmStringCommand
return false; return false;
} }
static bool seeded = false;
bool force_seed = false;
int seed = (int) time(NULL);
int length = 5; int length = 5;
const char cmStringCommandDefaultAlphabet[] = "qwertyuiopasdfghjklzxcvbnm" const char cmStringCommandDefaultAlphabet[] = "qwertyuiopasdfghjklzxcvbnm"
"QWERTYUIOPASDFGHJKLZXCVBNM" "QWERTYUIOPASDFGHJKLZXCVBNM"
@ -723,6 +726,12 @@ bool cmStringCommand
++i; ++i;
alphabet = args[i]; alphabet = args[i];
} }
else if ( args[i] == "RANDOM_SEED" )
{
++i;
seed = atoi(args[i].c_str());
force_seed = true;
}
} }
} }
if ( !alphabet.size() ) if ( !alphabet.size() )
@ -744,7 +753,13 @@ bool cmStringCommand
const std::string& variableName = args[args.size()-1]; const std::string& variableName = args[args.size()-1];
std::vector<char> result; std::vector<char> result;
srand((int)time(NULL));
if (!seeded || force_seed)
{
seeded = true;
srand(seed);
}
const char* alphaPtr = alphabet.c_str(); const char* alphaPtr = alphabet.c_str();
int cc; int cc;
for ( cc = 0; cc < length; cc ++ ) for ( cc = 0; cc < length; cc ++ )

5
Source/cmStringCommand.h
View File

@ -89,7 +89,7 @@ public:
" string(SUBSTRING <string> <begin> <length> <output variable>)\n" " string(SUBSTRING <string> <begin> <length> <output variable>)\n"
" string(STRIP <string> <output variable>)\n" " string(STRIP <string> <output variable>)\n"
" string(RANDOM [LENGTH <length>] [ALPHABET <alphabet>]\n" " string(RANDOM [LENGTH <length>] [ALPHABET <alphabet>]\n"
" <output variable>)\n" " [RANDOM_SEED <seed>] <output variable>)\n"
"REGEX MATCH will match the regular expression once and store the " "REGEX MATCH will match the regular expression once and store the "
"match in the output variable.\n" "match in the output variable.\n"
"REGEX MATCHALL will match the regular expression as many times as " "REGEX MATCHALL will match the regular expression as many times as "
@ -115,7 +115,8 @@ public:
"RANDOM will return a random string of given length consisting of " "RANDOM will return a random string of given length consisting of "
"characters from the given alphabet. Default length is 5 " "characters from the given alphabet. Default length is 5 "
"characters and default alphabet is all numbers and upper and " "characters and default alphabet is all numbers and upper and "
"lower case letters.\n" "lower case letters. If an integer RANDOM_SEED is given, its "
"value will be used to seed the random number generator.\n"
"The following characters have special meaning in regular expressions:\n" "The following characters have special meaning in regular expressions:\n"
" ^ Matches at beginning of a line\n" " ^ Matches at beginning of a line\n"
" $ Matches at end of a line\n" " $ Matches at end of a line\n"

8
Tests/CMakeTests/StringTestScript.cmake
View File

@ -182,6 +182,14 @@ elseif(testname STREQUAL random_with_various_alphabets) # pass
string(RANDOM LENGTH 1 ALPHABET "Q" v) string(RANDOM LENGTH 1 ALPHABET "Q" v)
message(STATUS "v='${v}'") message(STATUS "v='${v}'")
# seed values -- 2 same, then 1 different
string(RANDOM LENGTH 32 ALPHABET "ACGT" RANDOM_SEED 987654 v)
message(STATUS "v='${v}'")
string(RANDOM LENGTH 32 ALPHABET "ACGT" RANDOM_SEED 987654 v)
message(STATUS "v='${v}'")
string(RANDOM LENGTH 32 ALPHABET "ACGT" RANDOM_SEED 876543 v)
message(STATUS "v='${v}'")
# alphabet of many colors - use all the crazy keyboard characters # alphabet of many colors - use all the crazy keyboard characters
string(RANDOM LENGTH 78 ALPHABET "~`!@#$%^&*()_-+={}[]\\|:\\;'\",.<>/?" v) string(RANDOM LENGTH 78 ALPHABET "~`!@#$%^&*()_-+={}[]\\|:\\;'\",.<>/?" v)
message(STATUS "v='${v}'") message(STATUS "v='${v}'")