Changeset 10142 for trunk/gsdl/src/recpt/formattools.cpp
- Timestamp:
- 2005-06-17T10:51:52+12:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/formattools.cpp
r9948 r10142 1329 1329 1330 1330 // check for operator 1331 if ((op_expr != "eq") && (op_expr != "ne")) { 1331 if ((op_expr != "eq") && (op_expr != "ne") && (op_expr != "gt") && 1332 (op_expr != "ge") && (op_expr != "lt") && (op_expr != "le") && (op_expr != "==") && (op_expr != "!=") && (op_expr != ">") && (op_expr != ">=") && (op_expr != "<") && (op_expr != "<=") && (op_expr != "sw") && (op_expr != "ew")) { 1332 1333 // not a valid operator 1333 1334 return false; … … 1359 1360 const text_t& rhs_expr, ostream& logout) 1360 1361 { 1361 if (op_expr == "eq") { 1362 return (lhs_expr == rhs_expr); 1363 } 1364 else if (op_expr == "ne" ) { 1365 return (lhs_expr != rhs_expr); 1366 } 1362 if (op_expr == "eq") return (lhs_expr == rhs_expr); 1363 else if (op_expr == "ne" ) return (lhs_expr != rhs_expr); 1364 else if (op_expr == "gt") return (lhs_expr > rhs_expr); 1365 else if (op_expr == "ge") return (lhs_expr >= rhs_expr); 1366 else if (op_expr == "lt") return (lhs_expr < rhs_expr); 1367 else if (op_expr == "le") return (lhs_expr <= rhs_expr); 1368 else if (op_expr == "==") return (lhs_expr.getint() == rhs_expr.getint()); 1369 else if (op_expr == "!=") return (lhs_expr.getint() != rhs_expr.getint()); 1370 else if (op_expr == ">") return (lhs_expr.getint() > rhs_expr.getint()); 1371 else if (op_expr == ">=") return (lhs_expr.getint() >= rhs_expr.getint()); 1372 else if (op_expr == "<") return (lhs_expr.getint() < rhs_expr.getint()); 1373 else if (op_expr == "<=") return (lhs_expr.getint() <= rhs_expr.getint()); 1374 else if (op_expr == "sw") return (starts_with(lhs_expr,rhs_expr)); 1375 else if (op_expr == "ew") return (ends_with(lhs_expr,rhs_expr)); 1367 1376 else { 1368 1377 logout << "Error: '" << op_expr << "' is not a recognised operator." << endl; 1369 1378 } 1370 1379 1371 1380 return false; 1372 1381 }
Note:
See TracChangeset
for help on using the changeset viewer.