Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at aeb721a [master] Show right syntax error location

Kouhei Sutou null+****@clear*****
Sat Jul 5 00:02:35 JST 2014

• Previous message: [Groonga-commit] Errored: groonga/groonga#3194 (master - 9dc1e5b)
• Next message: [Groonga-commit] Errored: groonga/groonga#3195 (master - aeb721a)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2014-07-05 00:02:35 +0900 (Sat, 05 Jul 2014)

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

  Message:
    Show right syntax error location
    
    This change moves the current pointer after parsing a token to get the
    parsing input in syntax error logic.

  Copied files:
    test/command/suite/select/query/invalid/parenthesis_asterisk.expected
      (from test/command/suite/select/query/invalid/leading_not.expected)
    test/command/suite/select/query/invalid/parenthesis_asterisk.test
      (from test/command/suite/select/query/invalid/leading_not.expected)
  Modified files:
    lib/expr.c
    test/command/suite/select/query/invalid/leading_not.expected

  Modified: lib/expr.c (+81 -81)
===================================================================
--- lib/expr.c    2014-07-04 23:40:02 +0900 (c6e1ee7)
+++ lib/expr.c    2014-07-05 00:02:35 +0900 (702af5a)
@@ -6018,8 +6018,8 @@ parse_query(grn_ctx *ctx, efs_info *q)
       goto exit;
       break;
     case GRN_QUERY_PARENR :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_PARENR);
+      q->cur++;
       break;
     case GRN_QUERY_QUOTEL :
       q->cur++;
@@ -6057,19 +6057,18 @@ parse_query(grn_ctx *ctx, efs_info *q)
 
       break;
     case GRN_QUERY_PREFIX :
+      PARSE(GRN_EXPR_TOKEN_MATCH);
       q->cur++;
       get_op(q, op, &mode, &option);
-      PARSE(GRN_EXPR_TOKEN_MATCH);
       break;
     case GRN_QUERY_AND :
-      q->cur++;
       if (!first_token) {
         op->op = GRN_OP_AND;
         PARSE(GRN_EXPR_TOKEN_LOGICAL_AND);
       }
+      q->cur++;
       break;
     case GRN_QUERY_AND_NOT :
-      q->cur++;
       if (first_token && (q->flags & GRN_EXPR_ALLOW_LEADING_NOT)) {
         grn_obj *all_records = grn_ctx_get(ctx, "all_records", 11);
         if (all_records) {
@@ -6081,34 +6080,35 @@ parse_query(grn_ctx *ctx, efs_info *q)
       }
       op->op = GRN_OP_AND_NOT;
       PARSE(GRN_EXPR_TOKEN_LOGICAL_AND_NOT);
+      q->cur++;
       break;
     case GRN_QUERY_ADJ_INC :
-      q->cur++;
       if (op->weight < 127) { op->weight++; }
       op->op = GRN_OP_ADJUST;
       PARSE(GRN_EXPR_TOKEN_ADJUST);
+      q->cur++;
       break;
     case GRN_QUERY_ADJ_DEC :
-      q->cur++;
       if (op->weight > -128) { op->weight--; }
       op->op = GRN_OP_ADJUST;
       PARSE(GRN_EXPR_TOKEN_ADJUST);
+      q->cur++;
       break;
     case GRN_QUERY_ADJ_NEG :
-      q->cur++;
       op->op = GRN_OP_ADJUST;
       op->weight = -1;
       PARSE(GRN_EXPR_TOKEN_ADJUST);
+      q->cur++;
       break;
     case GRN_QUERY_PARENL :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_PARENL);
+      q->cur++;
       block_started = GRN_TRUE;
       break;
     case 'O' :
       if (q->cur[1] == 'R' && q->cur[2] == ' ') {
-        q->cur += 2;
         PARSE(GRN_EXPR_TOKEN_LOGICAL_OR);
+        q->cur += 2;
         break;
       }
       /* fallthru */
@@ -6311,66 +6311,66 @@ parse_script(grn_ctx *ctx, efs_info *q)
       goto exit;
       break;
     case '(' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_PARENL);
+      q->cur++;
       break;
     case ')' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_PARENR);
+      q->cur++;
       break;
     case '{' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_BRACEL);
+      q->cur++;
       break;
     case '}' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_BRACER);
+      q->cur++;
       break;
     case '[' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_BRACKETL);
+      q->cur++;
       break;
     case ']' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_BRACKETR);
+      q->cur++;
       break;
     case ',' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_COMMA);
+      q->cur++;
       break;
     case '.' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_DOT);
+      q->cur++;
       break;
     case ':' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_COLON);
+      q->cur++;
       set_tos_minor_to_curr(ctx, q);
       grn_expr_append_op(ctx, q->e, GRN_OP_JUMP, 0);
       break;
     case '@' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '^' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_PREFIX);
+        q->cur += 2;
         break;
       case '$' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_SUFFIX);
+        q->cur += 2;
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_MATCH);
+        q->cur++;
         break;
       }
       break;
     case '~' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_BITWISE_NOT);
+      q->cur++;
       break;
     case '?' :
-      q->cur++;
       PARSE(GRN_EXPR_TOKEN_QUESTION);
+      q->cur++;
       set_tos_minor_to_curr(ctx, q);
       grn_expr_append_op(ctx, q->e, GRN_OP_CJUMP, 0);
       break;
@@ -6385,36 +6385,35 @@ parse_script(grn_ctx *ctx, efs_info *q)
       grn_expr_append_const(ctx, q->e, &q->buf, GRN_OP_PUSH, 1);
       break;
     case '*' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case 'N' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_NEAR);
+        q->cur += 2;
         break;
       case 'S' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_SIMILAR);
+        q->cur += 2;
         break;
       case 'T' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_TERM_EXTRACT);
+        q->cur += 2;
         break;
       case '>' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_ADJUST);
+        q->cur += 2;
         break;
       case '<' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_ADJUST);
+        q->cur += 2;
         break;
       case '~' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_ADJUST);
+        q->cur += 2;
         break;
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_STAR_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'*=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6422,16 +6421,16 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_STAR);
+        q->cur++;
         break;
       }
       break;
     case '+' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '+' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_INCR);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'++' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6439,8 +6438,8 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_PLUS_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'+=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6448,16 +6447,16 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_PLUS);
+        q->cur++;
         break;
       }
       break;
     case '-' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '-' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_DECR);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'--' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6465,8 +6464,8 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_MINUS_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'-=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6474,20 +6473,20 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_MINUS);
+        q->cur++;
         break;
       }
       break;
     case '|' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '|' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_LOGICAL_OR);
+        q->cur += 2;
         break;
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_OR_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'|=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6495,16 +6494,16 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_BITWISE_OR);
+        q->cur++;
         break;
       }
       break;
     case '/' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_SLASH_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'/=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6512,16 +6511,16 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_SLASH);
+        q->cur++;
         break;
       }
       break;
     case '%' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_MOD_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'%%=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6529,27 +6528,27 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_MOD);
+        q->cur++;
         break;
       }
       break;
     case '!' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '=' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_NOT_EQUAL);
+        q->cur += 2;
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_NOT);
+        q->cur++;
         break;
       }
       break;
     case '^' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
+          q->cur += 2;
           PARSE(GRN_EXPR_TOKEN_XOR_ASSIGN);
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
@@ -6558,47 +6557,45 @@ parse_script(grn_ctx *ctx, efs_info *q)
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_BITWISE_XOR);
+        q->cur++;
         break;
       }
       break;
     case '&' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '&' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_LOGICAL_AND);
+        q->cur += 2;
         break;
       case '=' :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-          q->cur++;
           PARSE(GRN_EXPR_TOKEN_AND_ASSIGN);
+          q->cur += 2;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'&=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
         }
         break;
       case '!' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_LOGICAL_AND_NOT);
+        q->cur += 2;
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_BITWISE_AND);
+        q->cur++;
         break;
       }
       break;
     case '>' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '>' :
-        q->cur++;
-        switch (*q->cur) {
+        switch (q->cur[2]) {
         case '>' :
-          q->cur++;
-          switch (*q->cur) {
+          switch (q->cur[3]) {
           case '=' :
             if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-              q->cur++;
               PARSE(GRN_EXPR_TOKEN_SHIFTRR_ASSIGN);
+              q->cur += 4;
             } else {
               ERR(GRN_UPDATE_NOT_ALLOWED,
                   "'>>>=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6606,13 +6603,14 @@ parse_script(grn_ctx *ctx, efs_info *q)
             break;
           default :
             PARSE(GRN_EXPR_TOKEN_SHIFTRR);
+            q->cur += 3;
             break;
           }
           break;
         case '=' :
           if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-            q->cur++;
             PARSE(GRN_EXPR_TOKEN_SHIFTR_ASSIGN);
+            q->cur += 3;
           } else {
             ERR(GRN_UPDATE_NOT_ALLOWED,
                 "'>>=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6620,28 +6618,28 @@ parse_script(grn_ctx *ctx, efs_info *q)
           break;
         default :
           PARSE(GRN_EXPR_TOKEN_SHIFTR);
+          q->cur += 2;
           break;
         }
         break;
       case '=' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_GREATER_EQUAL);
+        q->cur += 2;
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_GREATER);
+        q->cur++;
         break;
       }
       break;
     case '<' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '<' :
-        q->cur++;
-        switch (*q->cur) {
+        switch (q->cur[2]) {
         case '=' :
           if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
-            q->cur++;
             PARSE(GRN_EXPR_TOKEN_SHIFTL_ASSIGN);
+            q->cur += 3;
           } else {
             ERR(GRN_UPDATE_NOT_ALLOWED,
                 "'<<=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6649,28 +6647,30 @@ parse_script(grn_ctx *ctx, efs_info *q)
           break;
         default :
           PARSE(GRN_EXPR_TOKEN_SHIFTL);
+          q->cur += 2;
           break;
         }
         break;
       case '=' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_LESS_EQUAL);
+        q->cur += 2;
         break;
       default :
         PARSE(GRN_EXPR_TOKEN_LESS);
+        q->cur++;
         break;
       }
       break;
     case '=' :
-      q->cur++;
-      switch (*q->cur) {
+      switch (q->cur[1]) {
       case '=' :
-        q->cur++;
         PARSE(GRN_EXPR_TOKEN_EQUAL);
+        q->cur += 2;
         break;
       default :
         if (q->flags & GRN_EXPR_ALLOW_UPDATE) {
           PARSE(GRN_EXPR_TOKEN_ASSIGN);
+          q->cur++;
         } else {
           ERR(GRN_UPDATE_NOT_ALLOWED,
               "'=' is not allowed (%.*s)", (int)(q->str_end - q->str), q->str);
@@ -6714,8 +6714,8 @@ parse_script(grn_ctx *ctx, efs_info *q)
             grn_expr_append_const(ctx, q->e, &uint32buf, GRN_OP_PUSH, 1);
           }
         }
-        q->cur = rest;
         PARSE(GRN_EXPR_TOKEN_DECIMAL);
+        q->cur = rest;
       }
       break;
     default :

  Modified: test/command/suite/select/query/invalid/leading_not.expected (+2 -2)
===================================================================
--- test/command/suite/select/query/invalid/leading_not.expected    2014-07-04 23:40:02 +0900 (56cbf50)
+++ test/command/suite/select/query/invalid/leading_not.expected    2014-07-05 00:02:35 +0900 (f1aa896)
@@ -21,5 +21,5 @@ load --table Entries
 ]
 [[0,0.0,0.0],5]
 select Entries --match_columns content --query '-fast'
-[[[-63,0.0,0.0],"Syntax error: <-|f|ast>"],[]]
-#|e| Syntax error: <-|f|ast>
+[[[-63,0.0,0.0],"Syntax error: <|-|fast>"],[]]
+#|e| Syntax error: <|-|fast>

  Copied: test/command/suite/select/query/invalid/parenthesis_asterisk.expected (+3 -3) 85%
===================================================================
--- test/command/suite/select/query/invalid/leading_not.expected    2014-07-04 23:40:02 +0900 (56cbf50)
+++ test/command/suite/select/query/invalid/parenthesis_asterisk.expected    2014-07-05 00:02:35 +0900 (e690b50)
@@ -20,6 +20,6 @@ load --table Entries
  "content": "I also migrated all Tritonn system!"}
 ]
 [[0,0.0,0.0],5]
-select Entries --match_columns content --query '-fast'
-[[[-63,0.0,0.0],"Syntax error: <-|f|ast>"],[]]
-#|e| Syntax error: <-|f|ast>
+select Entries --match_columns content --query '(star)*'
+[[[-63,0.0,0.0],"Syntax error: <(star)|*|>"],[]]
+#|e| Syntax error: <(star)|*|>

  Copied: test/command/suite/select/query/invalid/parenthesis_asterisk.test (+4 -8) 76%
===================================================================
--- test/command/suite/select/query/invalid/leading_not.expected    2014-07-04 23:40:02 +0900 (56cbf50)
+++ test/command/suite/select/query/invalid/parenthesis_asterisk.test    2014-07-05 00:02:35 +0900 (387b3a3)
@@ -1,11 +1,9 @@
 table_create Entries TABLE_PAT_KEY ShortText
-[[0,0.0,0.0],true]
 column_create Entries content COLUMN_SCALAR Text
-[[0,0.0,0.0],true]
+
 table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram
-[[0,0.0,0.0],true]
 column_create Terms entries_content_index COLUMN_INDEX|WITH_POSITION Entries content
-[[0,0.0,0.0],true]
+
 load --table Entries
 [
 {"_key":    "The first post!",
@@ -19,7 +17,5 @@ load --table Entries
 {"_key":    "Good-bye Tritonn",
  "content": "I also migrated all Tritonn system!"}
 ]
-[[0,0.0,0.0],5]
-select Entries --match_columns content --query '-fast'
-[[[-63,0.0,0.0],"Syntax error: <-|f|ast>"],[]]
-#|e| Syntax error: <-|f|ast>
+
+select Entries --match_columns content --query '(star)*'
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] Errored: groonga/groonga#3194 (master - 9dc1e5b)
• Next message: [Groonga-commit] Errored: groonga/groonga#3195 (master - aeb721a)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]