[lucy-commits] svn commit: r1355229 - in /lucy/trunk/core/Lucy/Search: QueryParser.c QueryParser/ParserElem.c QueryParser/ParserElem.cfh

[marvin]

Author: marvin
Date: Fri Jun 29 03:39:01 2012
New Revision: 1355229

URL: http://svn.apache.org/viewvc?rev=1355229&view=rev
Log:
Change arguments to ParserElem constructor.

Modified:
    lucy/trunk/core/Lucy/Search/QueryParser.c
    lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.c
    lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh

Modified: lucy/trunk/core/Lucy/Search/QueryParser.c
URL: 
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser.c?rev=1355229&r1=1355228&r2=1355229&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser.c (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser.c Fri Jun 29 03:39:01 2012
@@ -249,7 +249,7 @@ S_parse_flat_string(QueryParser *self, C
     ViewCB_Trim(qstring);
 
     if (S_consume_ascii(qstring, "(", 1)) {
-        VA_Push(parse_tree, (Obj*)ParserElem_new(TOKEN_OPEN_PAREN, NULL, 0));
+        VA_Push(parse_tree, (Obj*)ParserElem_new(TOKEN_OPEN_PAREN, NULL));
         if (ViewCB_Code_Point_From(qstring, 1) == ')') {
             need_close_paren = true;
             ViewCB_Chop(qstring, 1);
@@ -266,36 +266,34 @@ S_parse_flat_string(QueryParser *self, C
         }
         else if (S_consume_ascii(qstring, "+", 1)) {
             if (ViewCB_Trim_Top(qstring)) {
-                token = ParserElem_new(TOKEN_STRING, "+", 1);
+                token = ParserElem_new(TOKEN_STRING, (Obj*)CB_newf("+"));
             }
             else {
-                token = ParserElem_new(TOKEN_PLUS, NULL, 0);
+                token = ParserElem_new(TOKEN_PLUS, NULL);
             }
         }
         else if (S_consume_ascii(qstring, "-", 1)) {
             if (ViewCB_Trim_Top(qstring)) {
-                token = ParserElem_new(TOKEN_STRING, "-", 1);
+                token = ParserElem_new(TOKEN_STRING, (Obj*)CB_newf("-"));
             }
             else {
-                token = ParserElem_new(TOKEN_MINUS, NULL, 0);
+                token = ParserElem_new(TOKEN_MINUS, NULL);
             }
         }
         else if (S_consume_ascii_token(qstring, "AND", 3)) {
-            token = ParserElem_new(TOKEN_AND, NULL, 0);
+            token = ParserElem_new(TOKEN_AND, NULL);
         }
         else if (S_consume_ascii_token(qstring, "OR", 2)) {
-            token = ParserElem_new(TOKEN_OR, NULL, 0);
+            token = ParserElem_new(TOKEN_OR, NULL);
         }
         else if (S_consume_ascii_token(qstring, "NOT", 3)) {
-            token = ParserElem_new(TOKEN_NOT, NULL, 0);
+            token = ParserElem_new(TOKEN_NOT, NULL);
         }
         else if (self->heed_colons && S_consume_field(qstring, temp)) {
-            token = ParserElem_new(TOKEN_FIELD, (char*)ViewCB_Get_Ptr8(temp),
-                                    ViewCB_Get_Size(temp));
+            token = ParserElem_new(TOKEN_FIELD, (Obj*)ViewCB_Clone(temp));
         }
         else if (S_consume_non_whitespace(qstring, temp)) {
-            token = ParserElem_new(TOKEN_STRING, (char*)ViewCB_Get_Ptr8(temp),
-                                    ViewCB_Get_Size(temp));
+            token = ParserElem_new(TOKEN_STRING, (Obj*)ViewCB_Clone(temp));
         }
         else {
             THROW(ERR, "Failed to parse '%o'", qstring);
@@ -306,7 +304,7 @@ S_parse_flat_string(QueryParser *self, C
 
     if (need_close_paren) {
         VA_Push(parse_tree,
-                (Obj*)ParserElem_new(TOKEN_CLOSE_PAREN, NULL, 0));
+                (Obj*)ParserElem_new(TOKEN_CLOSE_PAREN, NULL));
     }
 
     // Clean up.

Modified: lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.c
URL: 
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.c?rev=1355229&r1=1355228&r2=1355229&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.c (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.c Fri Jun 29 03:39:01 
2012
@@ -19,16 +19,15 @@
 #include "Lucy/Search/QueryParser/ParserElem.h"
 
 ParserElem*
-ParserElem_new(uint32_t type, const char *text, size_t len) {
+ParserElem_new(uint32_t type, Obj *value) {
     ParserElem *self = (ParserElem*)VTable_Make_Obj(PARSERELEM);
-    return ParserElem_init(self, type, text, len);
+    return ParserElem_init(self, type, value);
 }
 
 ParserElem*
-ParserElem_init(ParserElem *self, uint32_t type, const char *text,
-                 size_t len) {
+ParserElem_init(ParserElem *self, uint32_t type, Obj *value) {
     self->type  = type;
-    self->value = text ? (Obj*)CB_new_from_utf8(text, len) : NULL;
+    self->value = value;
     return self;
 }
 

Modified: lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh
URL: 
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh?rev=1355229&r1=1355228&r2=1355229&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh Fri Jun 29 03:39:01 
2012
@@ -24,11 +24,10 @@ class Lucy::QueryParser::ParserElem inhe
     Obj      *value;
 
     inert incremented ParserElem*
-    new(uint32_t type, const char *text = NULL, size_t len = 0);
+    new(uint32_t type, decremented Obj *value = NULL);
 
     inert ParserElem*
-    init(ParserElem *self, uint32_t type, const char *text = NULL,
-         size_t len = 0);
+    init(ParserElem *self, uint32_t type, decremented Obj *value = NULL);
 
     public void
     Destroy(ParserElem *self);