Changeset 105:a8659d416de7
- Timestamp:
- 02/17/10 19:55:10 (7 months ago)
- Author:
- Roger Gammans <rgammans@…>
- Children:
- 106:3ed5f8f4f9fc, 107:0103ceea48af
- Branch:
- default
- Message:
-
Improve query operator syntax so the grammar can be more recursive.
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r103
|
r105
|
|
| 18 | 18 | notequalsOp= Literal("!=") |
| 19 | 19 | |
| | 20 | #Characters to avoid ?,:,/,!,= (eg other literals) |
| 20 | 21 | identifier = Word("_" + alphas + nums) |
| 21 | 22 | objectName = identifier.copy() |
| … |
… |
|
| 39 | 40 | |
| 40 | 41 | BoolExpr = ExprField + cfoperator + Value.copy() |
| 41 | | QueryExpr = BoolExpr + queryOp + Value.copy() + seperator +Value.copy() |
| | 42 | QueryExpr = BoolExpr + queryOp + Value.copy() + "/" +Value.copy() |
| 42 | 43 | |
| 43 | 44 | ExprText = ExprField ^ \ |
-
|
r102
|
r105
|
|
| 89 | 89 | self.assertEqual(repr(helper(self.parserA,"Object:1")) , "Object:1" ) |
| 90 | 90 | |
| | 91 | def testQueryOp(self): |
| | 92 | self.assertEqual(helper(self.parserA,":name=\"TestName\"?\"Yes\"/\"No\""),"Yes") |
| | 93 | self.assertEqual(helper(self.parserA,":name=\"WrongName\"?\":Yes\"/\"No\""),"No") |
| | 94 | |
| 91 | 95 | # Test handling of parse errors. |
| 92 | 96 | def getTestNames(): |
