susumu.yata
null+****@clear*****
Thu Sep 25 16:55:22 JST 2014
susumu.yata 2014-09-25 16:55:22 +0900 (Thu, 25 Sep 2014) New Revision: b1c366cfe979fb80a983abbecd918bae8f1786dd https://github.com/groonga/grnxx/commit/b1c366cfe979fb80a983abbecd918bae8f1786dd Message: Rename DATUM_NODE to CONSTANT_NODE. Modified files: lib/grnxx/expression.cpp Modified: lib/grnxx/expression.cpp (+6 -6) =================================================================== --- lib/grnxx/expression.cpp 2014-09-25 16:54:15 +0900 (e5955c9) +++ lib/grnxx/expression.cpp 2014-09-25 16:55:22 +0900 (6d35406) @@ -10,7 +10,7 @@ namespace expression { // TODO: Only CONSTANT_NODE and VARIABLE_NODE are required? enum NodeType { - DATUM_NODE, + CONSTANT_NODE, ROW_ID_NODE, SCORE_NODE, COLUMN_NODE, @@ -213,7 +213,7 @@ class DatumNode : public TypedNode<T> { datum_(datum) {} NodeType node_type() const { - return DATUM_NODE; + return CONSTANT_NODE; } bool evaluate(Error *, @@ -247,7 +247,7 @@ class DatumNode<Bool> : public TypedNode<Bool> { datum_(datum) {} NodeType node_type() const { - return DATUM_NODE; + return CONSTANT_NODE; } bool filter(Error *error, @@ -304,7 +304,7 @@ class DatumNode<Float> : public TypedNode<Float> { datum_(datum) {} NodeType node_type() const { - return DATUM_NODE; + return CONSTANT_NODE; } bool adjust(Error *, ArrayRef<Record> records) { @@ -343,7 +343,7 @@ class DatumNode<Text> : public TypedNode<Text> { datum_(datum.data(), datum.size()) {} NodeType node_type() const { - return DATUM_NODE; + return CONSTANT_NODE; } bool evaluate(Error *, @@ -580,7 +580,7 @@ bool fill_node_arg_values(Error *error, ArrayCRef<Record> records, } } switch (arg->node_type()) { - case DATUM_NODE: { + case CONSTANT_NODE: { if (old_size < records.size()) { if (!arg->evaluate(error, records.ref(old_size), arg_values->ref(old_size))) { -------------- next part -------------- HTML����������������������������...Download