Skip to content

Reintroduce getMonitorCount #19

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

Merged
merged 2 commits into from
Apr 1, 2019
Merged

Reintroduce getMonitorCount #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b857306
Model for String.split
romainbrenguier Apr 1, 2019
8a43440
Reintroduce getMonitorCount
romainbrenguier Apr 1, 2019
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
142 changes: 138 additions & 4 deletions src/main/java/java/lang/String.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3092,8 +3092,6 @@ public String replace(CharSequence target, CharSequence replacement) {
* @diffblue.noSupport
*/
public String[] split(String regex, int limit) {
CProver.notModelled();
return CProver.nondetWithNullForNotModelled();
// /* fastpath if the regex is a
// (1)one-char String and this character is not one of the
// RegEx's meta characters ".$|()[{^?*+\\", or
Expand Down Expand Up @@ -3145,6 +3143,72 @@ public String[] split(String regex, int limit) {
// return list.subList(0, resultSize).toArray(result);
// }
// return Pattern.compile(regex).split(this, limit);

// DIFFBLUE MODEL LIBRARY
if (limit == 0) {
return split(regex);
}

int size = CProver.nondetInt();
CProver.assume(size > 0);
String[] result = new String[size];

if (regex.length() == 0) {
int tokenIndex = 0;
while (tokenIndex < length() && tokenIndex != limit - 1) {
result[tokenIndex] =
CProverString.substring(this, tokenIndex, tokenIndex + 1);
tokenIndex++;
}
// extract the remainder of the string
if (tokenIndex < length()) {
result[tokenIndex] =
CProverString.substring(this, tokenIndex, length());
tokenIndex++;
} else {
result[tokenIndex] = "";
tokenIndex++;
}
// Ensure the size of the array corresponds to the number of tokens
CProver.assume(tokenIndex == size);
return result;
}

// We only handle empty or single character delimiters
CProver.assume(regex.length() == 1);
char delimiter = CProverString.charAt(regex, 0);

// We don't handle special regex characters \.[{()<>*+-=?^$|
CProver.assume(delimiter != '\\' && delimiter != '.' && delimiter != '['
&& delimiter != '{' && delimiter != '('
&& delimiter != ')' && delimiter != '<'
&& delimiter != '>' && delimiter != '*'
&& delimiter != '+' && delimiter != '-'
&& delimiter != '=' && delimiter != '?'
&& delimiter != '^' && delimiter != '$'
&& delimiter != '|');

int tokenStart = 0;
int tokenIndex = 0;
int tokenEnd = indexOf(delimiter, tokenStart);
while (tokenIndex < size - 1) {
// extract the token prior to the delimiter
CProver.assume(tokenEnd != -1);
result[tokenIndex] =
CProverString.substring(this, tokenStart, tokenEnd);
tokenIndex++;
tokenStart = tokenEnd + 1;
tokenEnd = indexOf(delimiter, tokenStart);
}

// extract the remainder of the string
result[tokenIndex] =
CProverString.substring(this, tokenStart, length());
tokenIndex++;
CProver.assume(tokenIndex == limit || tokenEnd == -1);

CProver.assume(limit <= 0 || size <= limit);
return result;
}

/**
Expand Down Expand Up @@ -3188,9 +3252,79 @@ public String[] split(String regex, int limit) {
* @diffblue.noSupport
*/
public String[] split(String regex) {
CProver.notModelled();
return CProver.nondetWithNullForNotModelled();
// return split(regex, 0);

// DIFFBLUE MODEL LIBRARY
// The (String, int) version in our model calls the String version,
// which is the other way in the original implementation.
// This way, if the String version is called in the code we analyse,
// only the code for this one is loaded.
// The 0 case is a bit special compared to the others in that it disregard trailing empty strings.
int size = CProver.nondetInt();
CProver.assume(size > 0);
String[] result = new String[size];

if (regex.length() == 0) {
int tokenIndex = 0;
if (length() == 0) {
CProver.assume(size == 1);
result[tokenIndex] = "";
return result;
}
while (tokenIndex < length()) {
result[tokenIndex] =
CProverString.substring(this, tokenIndex, tokenIndex + 1);
tokenIndex++;
}
// Ensure the size of the array corresponds to the number of tokens
CProver.assume(tokenIndex == size);
return result;
}

// We only handle empty or single character delimiters
CProver.assume(regex.length() == 1);
char delimiter = CProverString.charAt(regex, 0);

// We don't handle special regex characters \.[{()<>*+-=?^$|
CProver.assume(delimiter != '\\' && delimiter != '.' && delimiter != '['
&& delimiter != '{' && delimiter != '('
&& delimiter != ')' && delimiter != '<'
&& delimiter != '>' && delimiter != '*'
&& delimiter != '+' && delimiter != '-'
&& delimiter != '=' && delimiter != '?'
&& delimiter != '^' && delimiter != '$'
&& delimiter != '|');

int tokenIndex = 0;
int tokenStart = 0;
int tokenEnd = indexOf(delimiter, tokenStart);
while (tokenIndex < size - 1) {
CProver.assume(tokenEnd != -1);
result[tokenIndex++] =
CProverString.substring(this, tokenStart, tokenEnd);
tokenStart = tokenEnd + 1;
tokenEnd = indexOf(delimiter, tokenStart);
}
// extract the remainder of the string
if (tokenEnd == -1) {
// Exclude trailing empty strings
CProver.assume(tokenStart != length());

result[tokenIndex] =
CProverString.substring(this, tokenStart, length());
} else {
// Exclude trailing empty strings
CProver.assume(tokenStart != tokenEnd);

result[tokenIndex] =
CProverString.substring(this, tokenStart, tokenEnd);

// ignore trailing empty strings
for (int i = tokenEnd + 1; i < length(); i++) {
CProver.assume(charAt(i) == delimiter);
}
}
return result;
}

/**
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/cprover/CProver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,12 @@ public static void arraycopyInPlace(byte[] src, int srcPos, byte[] dest,
dest[destPos + i] = src[srcPos + i];
}
}

/**
* Retrieves the current locking count for 'object'.
*/
public static int getMonitorCount(Object object)
{
return object.cproverMonitorCount;
}
}