|
Line
Link Here
|
| 0 |
-- a/src/sphinxexpr.cpp |
0 |
++ b/src/sphinxexpr.cpp |
|
Lines 1796-1802
public:
Link Here
|
| 1796 |
/// evaluate arg, return interval id |
1796 |
/// evaluate arg, return interval id |
| 1797 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
1797 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
| 1798 |
{ |
1798 |
{ |
| 1799 |
T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
1799 |
T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
| 1800 |
ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here |
1800 |
ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here |
| 1801 |
if ( val<this->m_dValues[i] ) |
1801 |
if ( val<this->m_dValues[i] ) |
| 1802 |
return i; |
1802 |
return i; |
|
Lines 1827-1833
public:
Link Here
|
| 1827 |
/// evaluate arg, return interval id |
1827 |
/// evaluate arg, return interval id |
| 1828 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
1828 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
| 1829 |
{ |
1829 |
{ |
| 1830 |
T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
1830 |
T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
| 1831 |
ARRAY_FOREACH ( i, m_dTurnPoints ) |
1831 |
ARRAY_FOREACH ( i, m_dTurnPoints ) |
| 1832 |
if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) ) |
1832 |
if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) ) |
| 1833 |
return i; |
1833 |
return i; |
|
Lines 1873-1879
public:
Link Here
|
| 1873 |
/// evaluate arg, check if the value is within set |
1873 |
/// evaluate arg, check if the value is within set |
| 1874 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
1874 |
virtual int IntEval ( const CSphMatch & tMatch ) const |
| 1875 |
{ |
1875 |
{ |
| 1876 |
T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
1876 |
T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage |
| 1877 |
return this->m_dValues.BinarySearch ( val )!=NULL; |
1877 |
return this->m_dValues.BinarySearch ( val )!=NULL; |
| 1878 |
} |
1878 |
} |
| 1879 |
|
1879 |
|
