rroonga 1.0.1-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/groonga/rb-grn-logger.c

@@ -368,7 +368,7 @@ static VALUE
 rb_grn_logger_s_set_path (VALUE klass, VALUE rb_path,
 			  const char **path, const char *class_variable_name)
 {
-    rb_grn_boolean need_reopen = RB_GRN_FALSE;
+    grn_bool need_reopen = GRN_FALSE;
 
     if (NIL_P(rb_path)) {
 	need_reopen = *path != NULL;
@@ -377,7 +377,7 @@ rb_grn_logger_s_set_path (VALUE klass, VALUE rb_path,
 	const char *current_path = *path;
 	*path = RSTRING_PTR(rb_path);
 	if (!current_path || strcmp(*path, current_path) != 0) {
-	    need_reopen = RB_GRN_TRUE;
+	    need_reopen = GRN_TRUE;
 	}
     }
     rb_cv_set(klass, class_variable_name, rb_path);

data/ext/groonga/rb-grn-object.c

@@ -19,7 +19,7 @@
 /*
  * Document-class: Groonga::Object
  *
- * Ruby/groongaが提供するクラスのベースとなるクラス。
+ * rroongaが提供するクラスのベースとなるクラス。
  * Groonga::ContextとGroonga::Logger以外はGroonga::Objectを継
  * 承している。
  */
@@ -248,7 +248,7 @@ rb_grn_object_to_ruby_class (grn_obj *object)
 
 VALUE
 rb_grn_object_to_ruby_object (VALUE klass, grn_ctx *context, grn_obj *object,
-			      rb_grn_boolean owner)
+			      grn_bool owner)
 {
     RbGrnContext *rb_grn_context;
     VALUE rb_object, rb_context = Qnil;
@@ -290,8 +290,8 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
     rb_grn_object->context = context;
     rb_grn_object->object = object;
     rb_grn_object->self = self;
-    rb_grn_object->need_close = RB_GRN_TRUE;
-    rb_grn_object->have_finalizer = RB_GRN_FALSE;
+    rb_grn_object->need_close = GRN_TRUE;
+    rb_grn_object->have_finalizer = GRN_FALSE;
 
     user_data = grn_obj_user_data(context, object);
     if (user_data) {
@@ -300,17 +300,17 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 	      object->header.type);
 	user_data->ptr = rb_grn_object;
 	grn_obj_set_finalizer(context, object, rb_grn_object_finalizer);
-	rb_grn_object->have_finalizer = RB_GRN_TRUE;
+	rb_grn_object->have_finalizer = GRN_TRUE;
     }
 
     switch (object->header.type) {
       case GRN_PROC:
       case GRN_TYPE:
-	rb_grn_object->need_close = RB_GRN_FALSE;
+	rb_grn_object->need_close = GRN_FALSE;
 	break;
       default:
 	if (klass == rb_cGrnVariable)
-	    rb_grn_object->need_close = RB_GRN_FALSE;
+	    rb_grn_object->need_close = GRN_FALSE;
 	break;
     }
 
@@ -331,7 +331,6 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 	rb_grn_object->range = grn_ctx_at(context, rb_grn_object->range_id);
 
     DATA_PTR(self) = rb_grn_object;
-    rb_iv_set(self, "@context", rb_context);
 }
 
 void
@@ -398,6 +397,8 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
 		 object->header.type);
     }
 
+    rb_iv_set(self, "@context", rb_context);
+
     debug("assign: %p:%p:%p 0x%x\n", context, object, rb_grn_object,
 	   object->header.type);
 }
@@ -528,7 +529,7 @@ rb_grn_object_inspect_object (VALUE inspected, grn_ctx *context, grn_obj *object
 {
     VALUE rb_object;
 
-    rb_object = GRNOBJECT2RVAL(Qnil, context, object, RB_GRN_FALSE);
+    rb_object = GRNOBJECT2RVAL(Qnil, context, object, GRN_FALSE);
     rb_str_concat(inspected, rb_inspect(rb_object));
 
     return inspected;
@@ -829,7 +830,9 @@ rb_grn_object_inspect_content (VALUE self, VALUE inspected)
     object = rb_grn_object->object;
 
     rb_str_cat2(inspected, " ");
-    if (object) {
+    if (rb_grn_exited) {
+	rb_str_cat2(inspected, "(finished)");
+    } else if (object) {
 	rb_grn_object_inspect_object_content(inspected, context, object);
     } else {
 	rb_str_cat2(inspected, "(closed)");
@@ -994,7 +997,7 @@ rb_grn_object_get_domain (VALUE self)
 
 	domain_object = grn_ctx_at(context, domain);
 	if (domain_object)
-	    return GRNOBJECT2RVAL(Qnil, context, domain_object, RB_GRN_FALSE);
+	    return GRNOBJECT2RVAL(Qnil, context, domain_object, GRN_FALSE);
 	else
 	    return UINT2NUM(domain);
     }
@@ -1068,7 +1071,7 @@ rb_grn_object_get_range (VALUE self)
 
 	range_object = grn_ctx_at(context, range);
 	if (range_object)
-	    return GRNOBJECT2RVAL(Qnil, context, range_object, RB_GRN_FALSE);
+	    return GRNOBJECT2RVAL(Qnil, context, range_object, GRN_FALSE);
 	else
 	    return UINT2NUM(range);
     }
@@ -1178,7 +1181,7 @@ rb_grn_object_array_reference (VALUE self, VALUE rb_id)
     return rb_value;
 }
 
-static rb_grn_boolean
+static grn_bool
 rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
 {
     VALUE first_element;
@@ -1188,7 +1191,7 @@ rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
 	/* TODO: support not sizeof(grn_id) uvector. */
 	/*
 	if (!(rb_grn_object->range->header.flags | GRN_OBJ_KEY_VAR_SIZE)) {
-	    return RB_GRN_TRUE;
+	    return GRN_TRUE;
 	}
 	*/
 	break;
@@ -1197,15 +1200,15 @@ rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
       case GRN_TABLE_NO_KEY:
       case GRN_TABLE_VIEW:
 	first_element = rb_ary_entry(rb_value, 0);
-	if (RVAL2CBOOL(rb_obj_is_kind_of(first_element, rb_cGrnRecord))) {
-	    return RB_GRN_TRUE;
+	if (rb_respond_to(first_element, rb_intern("record_raw_id"))) {
+	    return GRN_TRUE;
 	}
 	break;
       default:
 	break;
     }
 
-    return RB_GRN_FALSE;
+    return GRN_FALSE;
 }
 
 VALUE
@@ -1215,25 +1218,26 @@ rb_grn_object_set_raw (RbGrnObject *rb_grn_object, grn_id id,
     grn_ctx *context;
     grn_obj value;
     grn_rc rc;
-    VALUE exception;
+    VALUE exception, rb_values;
 
     context = rb_grn_object->context;
-    if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cArray))) {
-	if (rb_uvector_value_p(rb_grn_object, rb_value)) {
-	    GRN_OBJ_INIT(&value, GRN_UVECTOR, 0,
-			 rb_grn_object->object->header.domain);
-	    RVAL2GRNUVECTOR(rb_value, context, &value, related_object);
-	} else {
-	    GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL);
-	    RVAL2GRNVECTOR(rb_value, context, &value);
-	}
-    } else {
+    rb_values = rb_check_array_type(rb_value);
+    if (NIL_P(rb_values)) {
 	if (NIL_P(rb_value)) {
 	    GRN_OBJ_INIT(&value, GRN_BULK, 0, GRN_ID_NIL);
 	} else {
 	    GRN_OBJ_INIT(&value, GRN_BULK, 0, GRN_ID_NIL);
 	    RVAL2GRNBULK(rb_value, context, &value);
 	}
+    } else {
+	if (rb_uvector_value_p(rb_grn_object, rb_values)) {
+	    GRN_OBJ_INIT(&value, GRN_UVECTOR, 0,
+			 rb_grn_object->object->header.domain);
+	    RVAL2GRNUVECTOR(rb_values, context, &value, related_object);
+	} else {
+	    GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL);
+	    RVAL2GRNVECTOR(rb_values, context, &value);
+	}
     }
     rc = grn_obj_set_value(context, rb_grn_object->object, id,
 			   &value, flags);
@@ -1341,7 +1345,7 @@ rb_grn_init_object (VALUE mGrn)
     rb_cGrnObject = rb_define_class_under(mGrn, "Object", rb_cObject);
     rb_define_alloc_func(rb_cGrnObject, rb_grn_object_alloc);
 
-    rb_define_attr(rb_cGrnObject, "context", RB_GRN_TRUE, RB_GRN_FALSE);
+    rb_define_attr(rb_cGrnObject, "context", GRN_TRUE, GRN_FALSE);
 
     rb_define_method(rb_cGrnObject, "inspect", rb_grn_object_inspect, 0);
 

data/ext/groonga/{rb-grn-operation.c → rb-grn-operator.c}

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -18,181 +18,183 @@
 
 #include "rb-grn.h"
 
-VALUE rb_mGrnOperation;
+VALUE rb_mGrnOperator;
 
 void
-rb_grn_init_operation (VALUE mGrn)
+rb_grn_init_operator (VALUE mGrn)
 {
-    rb_mGrnOperation = rb_define_module_under(mGrn, "Operation");
+    rb_mGrnOperator = rb_define_module_under(mGrn, "Operator");
+    /* deprecated: backward compatibility. */
+    rb_define_const(mGrn, "Operation", rb_mGrnOperator);
 
-    rb_define_const(rb_mGrnOperation, "PUSH",
+    rb_define_const(rb_mGrnOperator, "PUSH",
                     UINT2NUM(GRN_OP_PUSH));
-    rb_define_const(rb_mGrnOperation, "POP",
+    rb_define_const(rb_mGrnOperator, "POP",
                     UINT2NUM(GRN_OP_POP));
-    rb_define_const(rb_mGrnOperation, "NO_OPERATION",
+    rb_define_const(rb_mGrnOperator, "NO_OPERATION",
                     UINT2NUM(GRN_OP_NOP));
-    rb_define_const(rb_mGrnOperation, "CALL",
+    rb_define_const(rb_mGrnOperator, "CALL",
                     UINT2NUM(GRN_OP_CALL));
-    rb_define_const(rb_mGrnOperation, "INTERN",
+    rb_define_const(rb_mGrnOperator, "INTERN",
                     UINT2NUM(GRN_OP_INTERN));
-    rb_define_const(rb_mGrnOperation, "GET_REFERENCE",
+    rb_define_const(rb_mGrnOperator, "GET_REFERENCE",
                     UINT2NUM(GRN_OP_GET_REF));
-    rb_define_const(rb_mGrnOperation, "GET_VALUE",
+    rb_define_const(rb_mGrnOperator, "GET_VALUE",
                     UINT2NUM(GRN_OP_GET_VALUE));
-    rb_define_const(rb_mGrnOperation, "AND",
+    rb_define_const(rb_mGrnOperator, "AND",
                     UINT2NUM(GRN_OP_AND));
-    rb_define_const(rb_mGrnOperation, "BUT",
+    rb_define_const(rb_mGrnOperator, "BUT",
                     UINT2NUM(GRN_OP_BUT));
-    rb_define_const(rb_mGrnOperation, "OR",
+    rb_define_const(rb_mGrnOperator, "OR",
                     UINT2NUM(GRN_OP_OR));
-    rb_define_const(rb_mGrnOperation, "ASSIGN",
+    rb_define_const(rb_mGrnOperator, "ASSIGN",
                     UINT2NUM(GRN_OP_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "STAR_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "STAR_ASSIGN",
                     UINT2NUM(GRN_OP_STAR_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "SLASH_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "SLASH_ASSIGN",
                     UINT2NUM(GRN_OP_SLASH_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "MODULO_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "MODULO_ASSIGN",
                     UINT2NUM(GRN_OP_MOD_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "PLUS_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "PLUS_ASSIGN",
                     UINT2NUM(GRN_OP_PLUS_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "MINUS_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "MINUS_ASSIGN",
                     UINT2NUM(GRN_OP_MINUS_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "SHIFTL_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "SHIFTL_ASSIGN",
                     UINT2NUM(GRN_OP_SHIFTL_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "SHIRTR_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "SHIRTR_ASSIGN",
                     UINT2NUM(GRN_OP_SHIFTR_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "SHIFTRR_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "SHIFTRR_ASSIGN",
                     UINT2NUM(GRN_OP_SHIFTRR_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "AND_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "AND_ASSIGN",
                     UINT2NUM(GRN_OP_AND_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "XOR_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "XOR_ASSIGN",
                     UINT2NUM(GRN_OP_XOR_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "OR_ASSIGN",
+    rb_define_const(rb_mGrnOperator, "OR_ASSIGN",
                     UINT2NUM(GRN_OP_OR_ASSIGN));
-    rb_define_const(rb_mGrnOperation, "JUMP",
+    rb_define_const(rb_mGrnOperator, "JUMP",
                     UINT2NUM(GRN_OP_JUMP));
-    rb_define_const(rb_mGrnOperation, "CJUMP",
+    rb_define_const(rb_mGrnOperator, "CJUMP",
                     UINT2NUM(GRN_OP_CJUMP));
-    rb_define_const(rb_mGrnOperation, "COMMA",
+    rb_define_const(rb_mGrnOperator, "COMMA",
                     UINT2NUM(GRN_OP_COMMA));
-    rb_define_const(rb_mGrnOperation, "BITWISE_OR",
+    rb_define_const(rb_mGrnOperator, "BITWISE_OR",
                     UINT2NUM(GRN_OP_BITWISE_OR));
-    rb_define_const(rb_mGrnOperation, "BITWISE_XOR",
+    rb_define_const(rb_mGrnOperator, "BITWISE_XOR",
                     UINT2NUM(GRN_OP_BITWISE_XOR));
-    rb_define_const(rb_mGrnOperation, "BITWISE_AND",
+    rb_define_const(rb_mGrnOperator, "BITWISE_AND",
                     UINT2NUM(GRN_OP_BITWISE_AND));
-    rb_define_const(rb_mGrnOperation, "BITWISE_NOT",
+    rb_define_const(rb_mGrnOperator, "BITWISE_NOT",
                     UINT2NUM(GRN_OP_BITWISE_NOT));
-    rb_define_const(rb_mGrnOperation, "EQUAL",
+    rb_define_const(rb_mGrnOperator, "EQUAL",
                     UINT2NUM(GRN_OP_EQUAL));
-    rb_define_const(rb_mGrnOperation, "NOT_EQUAL",
+    rb_define_const(rb_mGrnOperator, "NOT_EQUAL",
                     UINT2NUM(GRN_OP_NOT_EQUAL));
-    rb_define_const(rb_mGrnOperation, "LESS",
+    rb_define_const(rb_mGrnOperator, "LESS",
                     UINT2NUM(GRN_OP_LESS));
-    rb_define_const(rb_mGrnOperation, "GREATER",
+    rb_define_const(rb_mGrnOperator, "GREATER",
                     UINT2NUM(GRN_OP_GREATER));
-    rb_define_const(rb_mGrnOperation, "LESS_EQUAL",
+    rb_define_const(rb_mGrnOperator, "LESS_EQUAL",
                     UINT2NUM(GRN_OP_LESS_EQUAL));
-    rb_define_const(rb_mGrnOperation, "GREATER_EQUAL",
+    rb_define_const(rb_mGrnOperator, "GREATER_EQUAL",
                     UINT2NUM(GRN_OP_GREATER_EQUAL));
-    rb_define_const(rb_mGrnOperation, "IN",
+    rb_define_const(rb_mGrnOperator, "IN",
                     UINT2NUM(GRN_OP_IN));
-    rb_define_const(rb_mGrnOperation, "MATCH",
+    rb_define_const(rb_mGrnOperator, "MATCH",
                     UINT2NUM(GRN_OP_MATCH));
-    rb_define_const(rb_mGrnOperation, "NEAR",
+    rb_define_const(rb_mGrnOperator, "NEAR",
                     UINT2NUM(GRN_OP_NEAR));
-    rb_define_const(rb_mGrnOperation, "NEAR2",
+    rb_define_const(rb_mGrnOperator, "NEAR2",
                     UINT2NUM(GRN_OP_NEAR2));
-    rb_define_const(rb_mGrnOperation, "SIMILAR",
+    rb_define_const(rb_mGrnOperator, "SIMILAR",
                     UINT2NUM(GRN_OP_SIMILAR));
-    rb_define_const(rb_mGrnOperation, "TERM_EXTRACT",
+    rb_define_const(rb_mGrnOperator, "TERM_EXTRACT",
                     UINT2NUM(GRN_OP_TERM_EXTRACT));
-    rb_define_const(rb_mGrnOperation, "SHIFTL",
+    rb_define_const(rb_mGrnOperator, "SHIFTL",
                     UINT2NUM(GRN_OP_SHIFTL));
-    rb_define_const(rb_mGrnOperation, "SHIFTR",
+    rb_define_const(rb_mGrnOperator, "SHIFTR",
                     UINT2NUM(GRN_OP_SHIFTR));
-    rb_define_const(rb_mGrnOperation, "SHIFTRR",
+    rb_define_const(rb_mGrnOperator, "SHIFTRR",
                     UINT2NUM(GRN_OP_SHIFTRR));
-    rb_define_const(rb_mGrnOperation, "PLUS",
+    rb_define_const(rb_mGrnOperator, "PLUS",
                     UINT2NUM(GRN_OP_PLUS));
-    rb_define_const(rb_mGrnOperation, "MINUS",
+    rb_define_const(rb_mGrnOperator, "MINUS",
                     UINT2NUM(GRN_OP_MINUS));
-    rb_define_const(rb_mGrnOperation, "STAR",
+    rb_define_const(rb_mGrnOperator, "STAR",
                     UINT2NUM(GRN_OP_STAR));
-    rb_define_const(rb_mGrnOperation, "SLASH",
+    rb_define_const(rb_mGrnOperator, "SLASH",
                     UINT2NUM(GRN_OP_SLASH));
-    rb_define_const(rb_mGrnOperation, "MODULO",
+    rb_define_const(rb_mGrnOperator, "MODULO",
                     UINT2NUM(GRN_OP_MOD));
-    rb_define_const(rb_mGrnOperation, "DELETE",
+    rb_define_const(rb_mGrnOperator, "DELETE",
                     UINT2NUM(GRN_OP_DELETE));
-    rb_define_const(rb_mGrnOperation, "INCREMENT",
+    rb_define_const(rb_mGrnOperator, "INCREMENT",
                     UINT2NUM(GRN_OP_INCR));
-    rb_define_const(rb_mGrnOperation, "DECREMENT",
+    rb_define_const(rb_mGrnOperator, "DECREMENT",
                     UINT2NUM(GRN_OP_DECR));
-    rb_define_const(rb_mGrnOperation, "INCREMENT_POST",
+    rb_define_const(rb_mGrnOperator, "INCREMENT_POST",
                     UINT2NUM(GRN_OP_INCR_POST));
-    rb_define_const(rb_mGrnOperation, "DECREMENT_POST",
+    rb_define_const(rb_mGrnOperator, "DECREMENT_POST",
                     UINT2NUM(GRN_OP_DECR_POST));
-    rb_define_const(rb_mGrnOperation, "NOT",
+    rb_define_const(rb_mGrnOperator, "NOT",
                     UINT2NUM(GRN_OP_NOT));
-    rb_define_const(rb_mGrnOperation, "ADJUST",
+    rb_define_const(rb_mGrnOperator, "ADJUST",
                     UINT2NUM(GRN_OP_ADJUST));
-    rb_define_const(rb_mGrnOperation, "EXACT",
+    rb_define_const(rb_mGrnOperator, "EXACT",
                     UINT2NUM(GRN_OP_EXACT));
-    rb_define_const(rb_mGrnOperation, "LONGEST_COMMON_PREFIX",
+    rb_define_const(rb_mGrnOperator, "LONGEST_COMMON_PREFIX",
                     UINT2NUM(GRN_OP_LCP));
-    rb_define_const(rb_mGrnOperation, "PARTIAL",
+    rb_define_const(rb_mGrnOperator, "PARTIAL",
                     UINT2NUM(GRN_OP_PARTIAL));
-    rb_define_const(rb_mGrnOperation, "UNSPLIT",
+    rb_define_const(rb_mGrnOperator, "UNSPLIT",
                     UINT2NUM(GRN_OP_UNSPLIT));
-    rb_define_const(rb_mGrnOperation, "PREFIX",
+    rb_define_const(rb_mGrnOperator, "PREFIX",
                     UINT2NUM(GRN_OP_PREFIX));
-    rb_define_const(rb_mGrnOperation, "SUFFIX",
+    rb_define_const(rb_mGrnOperator, "SUFFIX",
                     UINT2NUM(GRN_OP_SUFFIX));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE1",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE1",
                     UINT2NUM(GRN_OP_GEO_DISTANCE1));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE2",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE2",
                     UINT2NUM(GRN_OP_GEO_DISTANCE2));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE3",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE3",
                     UINT2NUM(GRN_OP_GEO_DISTANCE3));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE4",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE4",
                     UINT2NUM(GRN_OP_GEO_DISTANCE4));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP5",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP5",
                     UINT2NUM(GRN_OP_GEO_WITHINP5));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP6",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP6",
                     UINT2NUM(GRN_OP_GEO_WITHINP6));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP8",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP8",
                     UINT2NUM(GRN_OP_GEO_WITHINP8));
-    rb_define_const(rb_mGrnOperation, "OBJECT_SEARCH",
+    rb_define_const(rb_mGrnOperator, "OBJECT_SEARCH",
                     UINT2NUM(GRN_OP_OBJ_SEARCH));
-    rb_define_const(rb_mGrnOperation, "EXPRESSION_GET_VARIABLE",
+    rb_define_const(rb_mGrnOperator, "EXPRESSION_GET_VARIABLE",
                     UINT2NUM(GRN_OP_EXPR_GET_VAR));
-    rb_define_const(rb_mGrnOperation, "TABLE_CREATE",
+    rb_define_const(rb_mGrnOperator, "TABLE_CREATE",
                     UINT2NUM(GRN_OP_TABLE_CREATE));
-    rb_define_const(rb_mGrnOperation, "TABLE_SELECT",
+    rb_define_const(rb_mGrnOperator, "TABLE_SELECT",
                     UINT2NUM(GRN_OP_TABLE_SELECT));
-    rb_define_const(rb_mGrnOperation, "TABLE_SORT",
+    rb_define_const(rb_mGrnOperator, "TABLE_SORT",
                     UINT2NUM(GRN_OP_TABLE_SORT));
-    rb_define_const(rb_mGrnOperation, "TABLE_GROUP",
+    rb_define_const(rb_mGrnOperator, "TABLE_GROUP",
                     UINT2NUM(GRN_OP_TABLE_GROUP));
-    rb_define_const(rb_mGrnOperation, "JSON_PUT",
+    rb_define_const(rb_mGrnOperator, "JSON_PUT",
                     UINT2NUM(GRN_OP_JSON_PUT));
 
 
 /*
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE1",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE1",
                     UINT2NUM(GRN_OP_GEO_DISTANCE1));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE2",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE2",
                     UINT2NUM(GRN_OP_GEO_DISTANCE2));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE3",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE3",
                     UINT2NUM(GRN_OP_GEO_DISTANCE3));
-    rb_define_const(rb_mGrnOperation, "GEO_DISTANCE4",
+    rb_define_const(rb_mGrnOperator, "GEO_DISTANCE4",
                     UINT2NUM(GRN_OP_GEO_DISTANCE4));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP5",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP5",
                     UINT2NUM(GRN_OP_GEO_WITHINP5));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP6",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP6",
                     UINT2NUM(GRN_OP_GEO_WITHINP6));
-    rb_define_const(rb_mGrnOperation, "GEO_WITHINP8",
+    rb_define_const(rb_mGrnOperator, "GEO_WITHINP8",
                     UINT2NUM(GRN_OP_GEO_WITHINP8));
 */
 }