[Groonga-commit] groonga/groonga at af89750 [master] Remove needless code for error case

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Feb 20 18:46:47 JST 2016


Kouhei Sutou	2016-02-20 18:46:47 +0900 (Sat, 20 Feb 2016)

  New Revision: af89750c4b9fb7e2d9fc9729cc741d100ecff1b5
  https://github.com/groonga/groonga/commit/af89750c4b9fb7e2d9fc9729cc741d100ecff1b5

  Message:
    Remove needless code for error case

  Modified files:
    lib/grn_ecmascript.c
    lib/grn_ecmascript.lemon

  Modified: lib/grn_ecmascript.c (+1 -1)
===================================================================
--- lib/grn_ecmascript.c    2016-02-20 18:44:21 +0900 (6ab1bed)
+++ lib/grn_ecmascript.c    2016-02-20 18:46:47 +0900 (017a572)
@@ -1929,13 +1929,13 @@ static void yy_reduce(
       if (added) {
         GRN_OBJ_INIT(buf, value->header.type, 0, value->header.domain);
         GRN_TEXT_PUT(ctx, buf, GRN_TEXT_VALUE(value), GRN_TEXT_LEN(value));
+        e->codes_curr -= 3;
       } else {
         ERR(GRN_INVALID_ARGUMENT,
             "duplicated property name: <%.*s>",
             (int)GRN_TEXT_LEN(property),
             GRN_TEXT_VALUE(property));
       }
-      e->codes_curr -= 3;
     } else {
       ERR(GRN_NO_MEMORY_AVAILABLE,
           "failed to add a property to object literal: <%.*s>",

  Modified: lib/grn_ecmascript.lemon (+1 -1)
===================================================================
--- lib/grn_ecmascript.lemon    2016-02-20 18:44:21 +0900 (084f34b)
+++ lib/grn_ecmascript.lemon    2016-02-20 18:46:47 +0900 (214a74e)
@@ -420,13 +420,13 @@ property_name_and_value ::= property_name COLON assignment_expression. {
       if (added) {
         GRN_OBJ_INIT(buf, value->header.type, 0, value->header.domain);
         GRN_TEXT_PUT(ctx, buf, GRN_TEXT_VALUE(value), GRN_TEXT_LEN(value));
+        e->codes_curr -= 3;
       } else {
         ERR(GRN_INVALID_ARGUMENT,
             "duplicated property name: <%.*s>",
             (int)GRN_TEXT_LEN(property),
             GRN_TEXT_VALUE(property));
       }
-      e->codes_curr -= 3;
     } else {
       ERR(GRN_NO_MEMORY_AVAILABLE,
           "failed to add a property to object literal: <%.*s>",
-------------- next part --------------
HTML����������������������������...
Download 



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