[Groonga-commit] ranguba/rroonga at b3b0ac4 [master] Groonga::Expression#append_object supports operator name

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Dec 24 22:49:59 JST 2013


Kouhei Sutou	2013-12-24 22:49:59 +0900 (Tue, 24 Dec 2013)

  New Revision: b3b0ac4e4bba63beacd7feb9c7ec7ff20d5bec00
  https://github.com/ranguba/rroonga/commit/b3b0ac4e4bba63beacd7feb9c7ec7ff20d5bec00

  Message:
    Groonga::Expression#append_object supports operator name

  Modified files:
    ext/groonga/rb-grn-expression.c
    test/test-expression.rb

  Modified: ext/groonga/rb-grn-expression.c (+1 -1)
===================================================================
--- ext/groonga/rb-grn-expression.c    2013-12-24 22:47:10 +0900 (9b713e0)
+++ ext/groonga/rb-grn-expression.c    2013-12-24 22:49:59 +0900 (4fe6515)
@@ -184,7 +184,7 @@ rb_grn_expression_append_object (int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "12", &rb_object, &rb_operation, &rb_n_arguments);
     if (!NIL_P(rb_operation))
-        operation = NUM2INT(rb_operation);
+        operation = RVAL2GRNOPERATOR(rb_operation);
     if (!NIL_P(rb_n_arguments))
         n_arguments = NUM2INT(rb_n_arguments);
 

  Modified: test/test-expression.rb (+23 -0)
===================================================================
--- test/test-expression.rb    2013-12-24 22:47:10 +0900 (860bfe9)
+++ test/test-expression.rb    2013-12-24 22:49:59 +0900 (14ea5cf)
@@ -132,6 +132,29 @@ class ExpressionTest < Test::Unit::TestCase
     snippet.close
   end
 
+  class AppendObjectTest < self
+    setup
+    def setup_expression
+      @expression = Groonga::Expression.new
+    end
+
+    class OperatorTest < self
+      def test_constant
+        @expression.append_object(Groonga["TokenBigram"],
+                                  Groonga::Operator::PUSH,
+                                  1)
+        assert_equal("#<Groonga::Expression noname(){0TokenBigram}>",
+                     @expression.inspect)
+      end
+
+      def test_name
+        @expression.append_object(Groonga["TokenBigram"], "push", 1)
+        assert_equal("#<Groonga::Expression noname(){0TokenBigram}>",
+                     @expression.inspect)
+      end
+    end
+  end
+
   class AppendConstantTest < self
     setup
     def setup_expression
-------------- next part --------------
HTML����������������������������...
下载 



More information about the Groonga-commit mailing list
Back to archive index