summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <mrgarnacho@gmail.com>2019-03-27 22:02:51 +0000
committerCarlos Garnacho <mrgarnacho@gmail.com>2019-03-27 22:02:51 +0000
commit24f753f78a9283044ddbfd0d759ad5578d90aeb1 (patch)
treeff15be239670029b500f66c9a374e315c2fc4f5d
parent890a5f820fc732aa95b4d17d50f580234f5f2639 (diff)
parent5587a87c47c36f14ddcaac9e2df84c67897720be (diff)
downloadtracker-24f753f78a9283044ddbfd0d759ad5578d90aeb1.tar.gz
Merge branch 'wip/carlosg/issue-84' into 'master'
Fix parsing of doubles with exponential part Closes #84 See merge request GNOME/tracker!77
-rw-r--r--src/libtracker-data/tracker-sparql-grammar.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libtracker-data/tracker-sparql-grammar.h b/src/libtracker-data/tracker-sparql-grammar.h
index 0a01c9066..0dbbf2e62 100644
--- a/src/libtracker-data/tracker-sparql-grammar.h
+++ b/src/libtracker-data/tracker-sparql-grammar.h
@@ -569,7 +569,7 @@ static const TrackerGrammarRule rule_BooleanLiteral[] = { OR(helper_BooleanLiter
* TRACKER EXTENSION:
* The terminal PARAMETERIZED_VAR is additionally accepted
*/
-static const TrackerGrammarRule helper_NumericLiteralNegative_or[] = { T(DECIMAL_NEGATIVE), T(DOUBLE_NEGATIVE), T(INTEGER_NEGATIVE), T(PARAMETERIZED_VAR), NIL };
+static const TrackerGrammarRule helper_NumericLiteralNegative_or[] = { T(DOUBLE_NEGATIVE), T(DECIMAL_NEGATIVE), T(INTEGER_NEGATIVE), T(PARAMETERIZED_VAR), NIL };
static const TrackerGrammarRule rule_NumericLiteralNegative[] = { OR(helper_NumericLiteralNegative_or), NIL };
/* NumericLiteralPositive ::= INTEGER_POSITIVE | DECIMAL_POSITIVE | DOUBLE_POSITIVE
@@ -577,7 +577,7 @@ static const TrackerGrammarRule rule_NumericLiteralNegative[] = { OR(helper_Nume
* TRACKER EXTENSION:
* The terminal PARAMETERIZED_VAR is additionally accepted
*/
-static const TrackerGrammarRule helper_NumericLiteralPositive_or[] = { T(DECIMAL_POSITIVE), T(DOUBLE_POSITIVE), T(INTEGER_POSITIVE), T(PARAMETERIZED_VAR), NIL };
+static const TrackerGrammarRule helper_NumericLiteralPositive_or[] = { T(DOUBLE_POSITIVE), T(DECIMAL_POSITIVE), T(INTEGER_POSITIVE), T(PARAMETERIZED_VAR), NIL };
static const TrackerGrammarRule rule_NumericLiteralPositive[] = { OR(helper_NumericLiteralPositive_or), NIL };
/* NumericLiteralUnsigned ::= INTEGER | DECIMAL | DOUBLE
@@ -585,7 +585,7 @@ static const TrackerGrammarRule rule_NumericLiteralPositive[] = { OR(helper_Nume
* TRACKER EXTENSION:
* The terminal PARAMETERIZED_VAR is additionally accepted
*/
-static const TrackerGrammarRule helper_NumericLiteralUnsigned_or[] = { T(DECIMAL), T(DOUBLE), T(INTEGER), T(PARAMETERIZED_VAR), NIL };
+static const TrackerGrammarRule helper_NumericLiteralUnsigned_or[] = { T(DOUBLE), T(DECIMAL), T(INTEGER), T(PARAMETERIZED_VAR), NIL };
static const TrackerGrammarRule rule_NumericLiteralUnsigned[] = { OR(helper_NumericLiteralUnsigned_or), NIL };
/* NumericLiteral ::= NumericLiteralUnsigned | NumericLiteralPositive | NumericLiteralNegative
@@ -1958,7 +1958,7 @@ terminal_DOUBLE_POSITIVE (const gchar *str,
const gchar **str_out)
{
ACCEPT_CHAR ((ch == '+'));
- return terminal_DOUBLE_POSITIVE (str, end, str_out);
+ return terminal_DOUBLE (str, end, str_out);
}
/* INTEGER_NEGATIVE ::= '-' INTEGER