status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-01-14 16:44:50 +00:00
Code Issues Projects Releases Wiki Activity

rebase from master

Browse Source
This commit is contained in:
Ari Lazier 2016-01-05 19:33:56 -08:00
parent 66fd4ce2f7
commit 95c21dea20
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
impl/transact_log_handler.cpp
View File

@ -306,8 +306,6 @@ public:
bool set_link(size_t col, size_t row, size_t, size_t) { return mark_dirty(row, col); } bool set_link(size_t col, size_t row, size_t, size_t) { return mark_dirty(row, col); }
bool set_null(size_t col, size_t row) { return mark_dirty(row, col); } bool set_null(size_t col, size_t row) { return mark_dirty(row, col); }
bool nullify_link(size_t col, size_t row, size_t) { return mark_dirty(row, col); } bool nullify_link(size_t col, size_t row, size_t) { return mark_dirty(row, col); }
bool set_int_unique(size_t col, size_t row, int_fast64_t) { return mark_dirty(row, col); }
bool set_string_unique(size_t col, size_t row, StringData) { return mark_dirty(row, col); }
// Doesn't change any data // Doesn't change any data
bool optimize_table() { return true; } bool optimize_table() { return true; }

2
parser/parser.cpp
View File

@ -227,7 +227,7 @@ template<> struct action< or_op >
template<> struct action< rule > { \ template<> struct action< rule > { \
static void apply( const input & in, ParserState & state ) { \ static void apply( const input & in, ParserState & state ) { \
DEBUG_PRINT_TOKEN(in.string()); \ DEBUG_PRINT_TOKEN(in.string()); \
state.add_expression(Expression{type, in.string()}); }}; state.add_expression(Expression(type, in.string())); }};
EXPRESSION_ACTION(dq_string_content, Expression::Type::String) EXPRESSION_ACTION(dq_string_content, Expression::Type::String)
EXPRESSION_ACTION(sq_string_content, Expression::Type::String) EXPRESSION_ACTION(sq_string_content, Expression::Type::String)

1
parser/parser.hpp
View File

@ -30,6 +30,7 @@ struct Expression
{ {
enum class Type { None, Number, String, KeyPath, Argument, True, False } type = Type::None; enum class Type { None, Number, String, KeyPath, Argument, True, False } type = Type::None;
std::string s; std::string s;
Expression(Type t = Type::None, std::string s = "") : type(t), s(s) {}
}; };
struct Predicate struct Predicate

2
parser/query_builder.hpp
View File

@ -75,8 +75,6 @@ class ArgumentConverter : public Arguments
} }
}; };
} }
};
}
} }
#endif // REALM_QUERY_BUILDER_HPP #endif // REALM_QUERY_BUILDER_HPP