diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
| commit | a2cb549b1dff9024e3f700203e424e496b25fd91 (patch) | |
| tree | 1c03e9eb6f649a1446021dfb2a5d93a697f81feb /src/op.cc | |
| parent | 349fc5d175bc5c4acbc478b4d78c12dc507c4f58 (diff) | |
| parent | a88a4c55b2b11d58d3b9e49bf785be42afe63510 (diff) | |
| download | fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.gz fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.bz2 fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.zip | |
Merge branch 'next'
Diffstat (limited to 'src/op.cc')
| -rw-r--r-- | src/op.cc | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -172,12 +172,12 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth) left()->left() && left()->left()->is_function()) { call_scope_t call_args(scope); if (value_t obj = left()->left()->as_function()(call_args)) { - if (obj.is_pointer()) { - if (obj.as_pointer_lval<scope_t>() == NULL) { + if (obj.is_scope()) { + if (obj.as_scope() == NULL) { throw_(calc_error, _("Left operand of . operator is NULL")); } else { - scope_t& objscope(obj.as_ref_lval<scope_t>()); + scope_t& objscope(*obj.as_scope()); if (ptr_op_t member = objscope.lookup(right()->as_ident())) { result = member->calc(objscope, NULL, depth + 1); break; |