wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 15:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

aftypes: use lexical_cast instead of stringstream tests; avoid warnings by initialising newVal; use std::find for isInvector

Browse source 
makefile: -W -Wall
This commit is contained in:
River Tarnell 2008-08-07 14:14:14 +00:00
parent 4ac7f67766
commit 77aab08c36
2 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
parser_native/aftypes.cpp
View file

@ -2,6 +2,7 @@
#include <sstream>
#include <ios>
#include <iostream>
#include <boost/lexical_cast.hpp>
AFPToken::AFPToken(unsigned int new_type, string new_value, unsigned int new_pos) {
type = new_type;
@ -28,33 +29,28 @@ void AFPData::makeData( unsigned int new_type, void* new_value, size_t new_size,
}
AFPData::AFPData( string var ) {
const char* c_str = var.c_str();
long int intval;
double fval;
char* last_char;
istringstream ss(var);
this->source = "string constructor";
// Try integer
if (!!(ss >> intval) && intval != 0) { // 0.25 converts to 0, otherwise.
try {
long int intval = boost::lexical_cast<long int>(var);
// Valid conversion
long int* val = new long int( intval );
this->makeData( D_INTEGER, (void*)val, sizeof(long int), "string constructor" );
return;
} catch (boost::bad_lexical_cast &e) {
try {
double fval = boost::lexical_cast<double>(var);
double* val = new double(fval);
this->makeData( D_FLOAT, (void*)val, sizeof(double), "string constructor" );
return;
} catch (boost::bad_lexical_cast &e) {
// Last resort
// Duplicate the string.
string* s = new string(var);
this->makeData( D_STRING, (void*)s, sizeof(string), "string constructor" );
}
}
if (!!(ss >> fval)) {
double* val = new double(fval);
this->makeData( D_FLOAT, (void*)val, sizeof(double), "string constructor" );
return;
}
// Last resort
// Duplicate the string.
string* s = new string(var);
this->makeData( D_STRING, (void*)s, sizeof(string), "string constructor" );
return;
}
AFPData::AFPData( AFPData old, unsigned int newType ) {
@ -64,7 +60,7 @@ AFPData::AFPData( AFPData old, unsigned int newType ) {
}
if (old.type == newType) {
void* newVal;
void* newVal = 0;
// Duplicate the contents.
if (old.type == D_STRING) {
@ -77,6 +73,8 @@ AFPData::AFPData( AFPData old, unsigned int newType ) {
newVal = (void*) new double(old.toFloat());
}
assert(newVal);
this->makeData( old.type, newVal, old.size, "cast constructor (copy)" );
} else if (newType == 0) {
this->makeData( D_NULL, NULL, 0, "cast constructor - null" );
@ -185,7 +183,7 @@ AFPData::AFPData( const AFPData & oldData ) {
}
// Duplicate the inner data
void* newVal;
void* newVal = 0;
if (oldData.type == D_STRING) {
string* ival = new string();
@ -279,7 +277,7 @@ AFPData & AFPData::operator= (const AFPData & oldData) {
// Otherwise, do a proper copy.
// Duplicate the inner data
void* newVal;
void* newVal = 0;
if (oldData.type == D_STRING) {
string* ival = new string();
*ival = *(string*)oldData.value;
@ -304,10 +302,5 @@ AFPData & AFPData::operator= (const AFPData & oldData) {
}
bool isInVector( string needle, vector<string> haystack ) {
for( vector<string>::iterator it=haystack.begin(); it!=haystack.end(); ++it ) {
string test = *it;
if (test == needle.c_str()) { return true; }
}
return false;
return std::find(haystack.begin(), haystack.end(), needle) != haystack.end();
}

2
parser_native/makefile
View file

@ -1,5 +1,5 @@
CXX = g++
CXXFLAGS = -O3
CXXFLAGS = -O3 -W -Wall
BOOST_INCLUDES = /opt/boost/include/boost-1_35
BOOST_LIBS = /opt/boost/lib
BOOST_TAG = -gcc34-mt