Mercurial > octave
changeset 4203:ffa7148af6ee
[project @ 2002-11-25 06:19:46 by jwe]
| author | jwe |
|---|---|
| date | Mon, 25 Nov 2002 06:20:20 +0000 |
| parents | df4f83ee8ac3 |
| children | a9c76557a005 |
| files | doc/interpreter/Makefile.in src/Makefile.in src/pt-stmt.cc |
| diffstat | 3 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/Makefile.in Sun Nov 24 19:11:11 2002 +0000 +++ b/doc/interpreter/Makefile.in Mon Nov 25 06:20:20 2002 +0000 @@ -190,9 +190,9 @@ rm -f Makefile .PHONY: distclean -maintainer-clean: distclean +maintainer-clean: distclean clean-texi rm -f tags TAGS octave.info octave.info-* octave.dvi octave.ps - rm -f octave_*.html $(TEXINFO) + rm -f octave_*.html .PHONY: maintainer-clean clean-texi:
--- a/src/Makefile.in Sun Nov 24 19:11:11 2002 +0000 +++ b/src/Makefile.in Mon Nov 25 06:20:20 2002 +0000 @@ -202,7 +202,8 @@ endif ifeq ($(INCLUDE_LINK_DEPS),true) - OCTINTERP_LINK_DEPS = -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) + OCTINTERP_LINK_DEPS = \ + -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(FLIBS) OCT_LINK_DEPS = \ -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ -L. $(LIBOCTINTERP) $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS)
--- a/src/pt-stmt.cc Sun Nov 24 19:11:11 2002 +0000 +++ b/src/pt-stmt.cc Mon Nov 25 06:20:20 2002 +0000 @@ -111,25 +111,32 @@ // or not the expression will take care of binding ans and // printing the result. + // XXX FIXME XXX -- it seems that we should just have to + // call expr->rvalue () and that should take care of + // everything, binding ans as necessary? + bool do_bind_ans = false; + bool script_file_executed = false; + if (expr->is_identifier ()) { - bool script_file_executed = false; - tree_identifier *id = static_cast<tree_identifier *> (expr); - id->do_lookup (script_file_executed, false); + id->do_lookup (script_file_executed, true); do_bind_ans = id->is_function (); } else do_bind_ans = (! expr->is_assignment_expression ()); - retval = expr->rvalue (nargout); + if (! script_file_executed) + { + retval = expr->rvalue (nargout); - if (do_bind_ans && ! (error_state || retval.empty ())) - bind_ans (retval(0), pf); + if (do_bind_ans && ! (error_state || retval.empty ())) + bind_ans (retval(0), pf); + } } unwind_protect::run ();