projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
icu
/
source
/
i18n
/
unicode
/
search.h
diff --git
a/src/third_party/icu/source/i18n/unicode/search.h
b/src/third_party/icu/source/i18n/unicode/search.h
index
8b82906
..
71bbf2d
100644
(file)
--- a/
src/third_party/icu/source/i18n/unicode/search.h
+++ b/
src/third_party/icu/source/i18n/unicode/search.h
@@
-1,6
+1,6
@@
/*
**********************************************************************
/*
**********************************************************************
-* Copyright (C) 2001-20
08
IBM and others. All rights reserved.
+* Copyright (C) 2001-20
11
IBM and others. All rights reserved.
**********************************************************************
* Date Name Description
* 03/22/2000 helena Creation.
**********************************************************************
* Date Name Description
* 03/22/2000 helena Creation.
@@
-306,12
+306,12
@@
public:
int32_t first(UErrorCode &status);
/**
int32_t first(UErrorCode &status);
/**
- * Returns the first index greater than <tt>position</tt> at which the
+ * Returns the first index
equal or
greater than <tt>position</tt> at which the
* string text matches the search pattern. The iterator is adjusted so
* that its current index (as returned by <tt>getOffset</tt>) is the
* string text matches the search pattern. The iterator is adjusted so
* that its current index (as returned by <tt>getOffset</tt>) is the
- * match position if one was found.
If a match is not found,
- *
<tt>USEARCH_DONE</tt> will be returned and the iterator will be
- *
adjusted to the index USEARCH_DONE
+ * match position if one was found.
+ *
If a match is not found, <tt>USEARCH_DONE</tt> will be returned and the
+ *
iterator will be adjusted to the index <tt>USEARCH_DONE</tt>.
* @param position where search if to start from. If position is less
* than or greater than the text range for searching,
* an U_INDEX_OUTOFBOUNDS_ERROR will be returned
* @param position where search if to start from. If position is less
* than or greater than the text range for searching,
* an U_INDEX_OUTOFBOUNDS_ERROR will be returned
@@
-346,6
+346,12
@@
public:
* position if one was found. If a match is not found,
* <tt>USEARCH_DONE</tt> will be returned and the iterator will be
* adjusted to the index USEARCH_DONE
* position if one was found. If a match is not found,
* <tt>USEARCH_DONE</tt> will be returned and the iterator will be
* adjusted to the index USEARCH_DONE
+ * <p>
+ * When <tt>USEARCH_OVERLAP</tt> option is off, the last index of the
+ * result match is always less than <tt>position</tt>.
+ * When <tt>USERARCH_OVERLAP</tt> is on, the result match may span across
+ * <tt>position</tt>.
+ *
* @param position where search is to start from. If position is less
* than or greater than the text range for searching,
* an U_INDEX_OUTOFBOUNDS_ERROR will be returned
* @param position where search is to start from. If position is less
* than or greater than the text range for searching,
* an U_INDEX_OUTOFBOUNDS_ERROR will be returned