diff options
| author | chrysn <chrysn@fsfe.org> | 2013-06-26 16:06:00 (GMT) |
|---|---|---|
| committer | chrysn <chrysn@fsfe.org> | 2013-06-26 16:06:00 (GMT) |
| commit | ad1a11a28edd85354c3ef5386961d5cee6a19185 (patch) | |
| tree | 5d6ccb417cfc35126cfad8e3b35bc261f8456a4c /src/expr.cc | |
| parent | d532a17cb8316957e490b5589b08fa423eb4c843 (diff) | |
| parent | 1b7cc41a7f454e005ca07815ba463a7fac5e1f8e (diff) | |
Merge branch 'master' into no-testprograms
Conflicts:
tests/CMakeLists.txt
tests/regression/csgtermtest/assign-expected.term
tests/regression/csgtermtest/child-expected.term
tests/regression/csgtermtest/circle-expected.term
tests/regression/csgtermtest/color-expected.term
tests/regression/csgtermtest/cube-expected.term
tests/regression/csgtermtest/cylinder-expected.term
tests/regression/csgtermtest/difference-expected.term
tests/regression/csgtermtest/dxf_linear_extrude-expected.term
tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
tests/regression/csgtermtest/echo-expected.term
tests/regression/csgtermtest/for-expected.term
tests/regression/csgtermtest/glide-expected.term
tests/regression/csgtermtest/group-expected.term
tests/regression/csgtermtest/hull-expected.term
tests/regression/csgtermtest/if-expected.term
tests/regression/csgtermtest/import-expected.term
tests/regression/csgtermtest/import_dxf-expected.term
tests/regression/csgtermtest/import_off-expected.term
tests/regression/csgtermtest/import_stl-expected.term
tests/regression/csgtermtest/intersection-expected.term
tests/regression/csgtermtest/intersection_for-expected.term
tests/regression/csgtermtest/linear_extrude-expected.term
tests/regression/csgtermtest/minkowski-expected.term
tests/regression/csgtermtest/mirror-expected.term
tests/regression/csgtermtest/multmatrix-expected.term
tests/regression/csgtermtest/polygon-expected.term
tests/regression/csgtermtest/polyhedron-expected.term
tests/regression/csgtermtest/projection-expected.term
tests/regression/csgtermtest/render-expected.term
tests/regression/csgtermtest/rotate-expected.term
tests/regression/csgtermtest/rotate_extrude-expected.term
tests/regression/csgtermtest/scale-expected.term
tests/regression/csgtermtest/sphere-expected.term
tests/regression/csgtermtest/square-expected.term
tests/regression/csgtermtest/subdiv-expected.term
tests/regression/csgtermtest/surface-expected.term
tests/regression/csgtermtest/translate-expected.term
tests/regression/csgtermtest/union-expected.term
tests/regression/dumptest/circle-expected.csg
tests/regression/dumptest/color-expected.csg
tests/regression/dumptest/cube-expected.csg
tests/regression/dumptest/cylinder-expected.csg
tests/regression/dumptest/difference-expected.csg
tests/regression/dumptest/dxf_linear_extrude-expected.csg
tests/regression/dumptest/dxf_rotate_extrude-expected.csg
tests/regression/dumptest/glide-expected.csg
tests/regression/dumptest/import-expected.csg
tests/regression/dumptest/import_dxf-expected.csg
tests/regression/dumptest/import_off-expected.csg
tests/regression/dumptest/import_stl-expected.csg
tests/regression/dumptest/intersection-expected.csg
tests/regression/dumptest/intersection_for-expected.csg
tests/regression/dumptest/linear_extrude-expected.csg
tests/regression/dumptest/minkowski-expected.csg
tests/regression/dumptest/mirror-expected.csg
tests/regression/dumptest/multmatrix-expected.csg
tests/regression/dumptest/polygon-expected.csg
tests/regression/dumptest/polyhedron-expected.csg
tests/regression/dumptest/projection-expected.csg
tests/regression/dumptest/render-expected.csg
tests/regression/dumptest/rotate-expected.csg
tests/regression/dumptest/rotate_extrude-expected.csg
tests/regression/dumptest/scale-expected.csg
tests/regression/dumptest/sphere-expected.csg
tests/regression/dumptest/square-expected.csg
tests/regression/dumptest/subdiv-expected.csg
tests/regression/dumptest/surface-expected.csg
tests/regression/dumptest/translate-expected.csg
Diffstat (limited to 'src/expr.cc')
| -rw-r--r-- | src/expr.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/expr.cc b/src/expr.cc index 2e069f0..8500d13 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -105,8 +105,7 @@ Value Expression::evaluate(const Context *context) const if (this->type == ">") return this->children[0]->evaluate(context) > this->children[1]->evaluate(context); if (this->type == "?:") { - Value v = this->children[0]->evaluate(context); - return this->children[v.toBool() ? 1 : 2]->evaluate(context); + return this->children[this->children[0]->evaluate(context) ? 1 : 2]->evaluate(context); } if (this->type == "[]") { return this->children[0]->evaluate(context)[this->children[1]->evaluate(context)]; |