<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">susumu.yata <susum****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-10-07 11:17:21 +0900 (Wed, 07 Oct 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff">e257c13cabd4430a5692cc6f38862af8e3a1feff</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">grn_ts: add error handling in number literal tokenization
Name characters must not appear immediately after a number literal.
GitHub: <a href="https://github.com/groonga/groonga/issues/412">#412</a></pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509">lib/ts.c</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/ts.c (+9 -1)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4878">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4879">4879</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4880">4880</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4881">4881</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4882">4882</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4883">4883</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4884">4884</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4889">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4890">4890</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4891">4891</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4892">4892</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4893">4893</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4894">4894</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4895">4895</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509L4896">4896</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4878">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4879">4879</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4880">4880</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4881">4881</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4882">4882</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4883">4883</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4884">4884</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4885">4885</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4886">4886</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4887">4887</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4888">4888</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4893">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4894">4894</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4895">4895</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4896">4896</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4897">4897</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4898">4898</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4899">4899</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4900">4900</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4901">4901</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4902">4902</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4903">4903</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/e257c13cabd4430a5692cc6f38862af8e3a1feff#diff-365890a8d043b1a031138e28b4da8509R4904">4904</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4879,6 +4879,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_ts_expr_parser_tokenize_number(grn_ctx *ctx, grn_ts_expr_parser *parser,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int_value = strtol(str.ptr, &end, 0);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if ((end != str.ptr) && (*end != '.')) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (grn_ts_byte_is_name_char(*end)) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ GRN_TS_ERR_RETURN(GRN_INVALID_FORMAT, "unterminated Int literal: %.*s",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (int)str.size, str.ptr);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> token_str.ptr = str.ptr;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> token_str.size = end - str.ptr;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> rc = grn_ts_expr_const_token_open(ctx, token_str, &new_token);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4890,7 +4894,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">grn_ts_expr_parser_tokenize_number(grn_ctx *ctx, grn_ts_expr_parser *parser,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_ts_float float_value = strtod(str.ptr, &end);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (end == str.ptr) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- return GRN_INVALID_FORMAT;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ GRN_TS_ERR_RETURN(GRN_INVALID_FORMAT, "invalid number");</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (grn_ts_byte_is_name_char(*end)) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ GRN_TS_ERR_RETURN(GRN_INVALID_FORMAT, "unterminated Float literal: %.*s",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (int)str.size, str.ptr);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> token_str.ptr = str.ptr;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> token_str.size = end - str.ptr;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>