[Zope-CVS] CVS: Products/ZCTextIndex - QueryParser.py:1.1.2.8

Tim Peters tim.one@comcast.net
Fri, 3 May 2002 04:25:44 -0400


Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv31934

Modified Files:
      Tag: TextIndexDS9-branch
	QueryParser.py 
Log Message:
Restore the plain-string _nodetype class vrbls, just in case Guido
goes nuts and defines _NOT to be intern('-') ...


=== Products/ZCTextIndex/QueryParser.py 1.1.2.7 => 1.1.2.8 ===
 _RPAREN = intern(")")
 _ATOM   = intern("ATOM")
-_EOF    = intern(" EOF ")
+_EOF    = intern("EOF")
 
 # Map keyword string to token type.
 _keywords = {
@@ -148,19 +148,19 @@
 
 class NotNode(ParseTreeNode):
 
-    _nodeType = _NOT
+    _nodeType = "NOT"
 
 class AndNode(ParseTreeNode):
 
-    _nodeType = _AND
+    _nodeType = "AND"
 
 class OrNode(ParseTreeNode):
 
-    _nodeType = _OR
+    _nodeType = "OR"
 
 class AtomNode(ParseTreeNode):
 
-    _nodeType = _ATOM
+    _nodeType = "ATOM"
 
 def terms(node):
     """Return all the ATOM nodes in a parse tree node."""