annotate src/toplev.cc @ 14156:d5d3037cbc11 stable

don't call singleton_cleanup_list::cleanup on exit. * toplev.cc (do_octave_atexit): Don't call singleton_cleanup_list::cleanup.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Jan 2012 10:59:15 -0500
parents 834df9f10963
children eff4a5933e28 d174210ce1ec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1 /*
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14073
diff changeset
3 Copyright (C) 1995-2012 John W. Eaton
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
4
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
6
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
10 option) any later version.
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
11
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
15 for more details.
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
16
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
19 <http://www.gnu.org/licenses/>.
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
20
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
21 */
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
22
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
23 #ifdef HAVE_CONFIG_H
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
24 #include <config.h>
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
25 #endif
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
26
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
27 #include <cassert>
4489
a90c3cbded0d [project @ 2003-08-28 16:08:26 by jwe]
jwe
parents: 4440
diff changeset
28 #include <cerrno>
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
29 #include <cstdlib>
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
30 #include <cstring>
4221
a7d8e5dd87ad [project @ 2002-12-06 22:34:47 by jwe]
jwe
parents: 4217
diff changeset
31 #include <new>
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
32
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3446
diff changeset
33 #include <fstream>
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3446
diff changeset
34 #include <iostream>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5744
diff changeset
35 #include <sstream>
1728
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1704
diff changeset
36 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1704
diff changeset
37
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
38 #include <sys/types.h>
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
39 #include <unistd.h>
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
40
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2910
diff changeset
41 #include "cmd-edit.h"
12989
00235a6446da eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents: 12846
diff changeset
42 #include "cmd-hist.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2910
diff changeset
43 #include "file-ops.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
44 #include "lo-error.h"
2370
a45c7d64b5e3 [project @ 1996-10-11 23:51:15 by jwe]
jwe
parents: 2322
diff changeset
45 #include "lo-mappers.h"
3020
f491f232cb09 [project @ 1997-06-03 22:15:08 by jwe]
jwe
parents: 3014
diff changeset
46 #include "oct-env.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
47 #include "oct-locbuf.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
48 #include "quit.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
49 #include "singleton-cleanup.h"
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1751
diff changeset
50 #include "str-vec.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
51
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
52 #include "defaults.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
53 #include "defun.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
54 #include "error.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
55 #include "file-io.h"
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
56 #include "graphics.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
57 #include "input.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
58 #include "lex.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
59 #include "oct-conf.h"
1742
a02f140ed897 [project @ 1996-01-12 11:09:39 by jwe]
jwe
parents: 1728
diff changeset
60 #include "oct-hist.h"
2162
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
61 #include "oct-map.h"
2862
95e85daad148 [project @ 1997-04-15 22:00:57 by jwe]
jwe
parents: 2859
diff changeset
62 #include "oct-obj.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
63 #include "ov.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
64 #include "pager.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
65 #include "parse.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
66 #include "pathsearch.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
67 #include "procstream.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8581
diff changeset
68 #include "pt-eval.h"
2985
aa9d0c0e0458 [project @ 1997-05-16 06:54:18 by jwe]
jwe
parents: 2982
diff changeset
69 #include "pt-jump.h"
2982
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe]
jwe
parents: 2973
diff changeset
70 #include "pt-stmt.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
71 #include "sighandlers.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
72 #include "sysdep.h"
2693
f4d0604cbcc4 [project @ 1997-02-18 15:25:21 by jwe]
jwe
parents: 2692
diff changeset
73 #include "syswait.h"
1750
fd0d12493223 [project @ 1996-01-13 09:31:07 by jwe]
jwe
parents: 1742
diff changeset
74 #include "toplev.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
75 #include "unwind-prot.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
76 #include "utils.h"
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
77 #include "variables.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
78 #include "version.h"
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
79
9217
ee7cf4d963f3 smarter handling of quit()
Jaroslav Hajek <highegg@gmail.com>
parents: 9187
diff changeset
80 void (*octave_exit) (int) = ::exit;
ee7cf4d963f3 smarter handling of quit()
Jaroslav Hajek <highegg@gmail.com>
parents: 9187
diff changeset
81
9255
1c2d2c9f4a8d don't allow quit() in embedded mode by default, make configurable
Jaroslav Hajek <highegg@gmail.com>
parents: 9217
diff changeset
82 // TRUE means the quit() call is allowed.
1c2d2c9f4a8d don't allow quit() in embedded mode by default, make configurable
Jaroslav Hajek <highegg@gmail.com>
parents: 9217
diff changeset
83 bool quit_allowed = true;
1c2d2c9f4a8d don't allow quit() in embedded mode by default, make configurable
Jaroslav Hajek <highegg@gmail.com>
parents: 9217
diff changeset
84
3020
f491f232cb09 [project @ 1997-06-03 22:15:08 by jwe]
jwe
parents: 3014
diff changeset
85 // TRUE means we are exiting via the builtin exit or quit functions.
9383
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
86 bool quitting_gracefully = false;
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
87 // This stores the exit status.
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
88 int exit_status = 0;
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
89
4217
301cc4cf87e9 [project @ 2002-12-05 03:33:01 by jwe]
jwe
parents: 4214
diff changeset
90 // TRUE means we are ready to interpret commands, but not everything
301cc4cf87e9 [project @ 2002-12-05 03:33:01 by jwe]
jwe
parents: 4214
diff changeset
91 // is ready for interactive use.
301cc4cf87e9 [project @ 2002-12-05 03:33:01 by jwe]
jwe
parents: 4214
diff changeset
92 bool octave_interpreter_ready = false;
301cc4cf87e9 [project @ 2002-12-05 03:33:01 by jwe]
jwe
parents: 4214
diff changeset
93
4172
2e94b2abfe6d [project @ 2002-11-12 21:14:04 by jwe]
jwe
parents: 4171
diff changeset
94 // TRUE means we've processed all the init code and we are good to go.
2e94b2abfe6d [project @ 2002-11-12 21:14:04 by jwe]
jwe
parents: 4171
diff changeset
95 bool octave_initialized = false;
2e94b2abfe6d [project @ 2002-11-12 21:14:04 by jwe]
jwe
parents: 4171
diff changeset
96
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
97 // Current command to execute.
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
98 tree_statement_list *global_command = 0;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
99
5743
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5717
diff changeset
100 octave_call_stack *octave_call_stack::instance = 0;
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5717
diff changeset
101
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
102 void
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
103 octave_call_stack::create_instance (void)
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
104 {
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
105 instance = new octave_call_stack ();
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
106
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
107 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
108 {
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
109 instance->do_push (0, symbol_table::top_scope (), 0);
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
110
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
111 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
112 }
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
113 }
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13981
diff changeset
114
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
115 int
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
116 octave_call_stack::do_current_line (void) const
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
117 {
9484
bbe033dcfe13 make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents: 9483
diff changeset
118 tree_statement *stmt = do_current_statement ();
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
119
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
120 return stmt ? stmt->line () : -1;
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
121 }
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
122
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
123 int
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
124 octave_call_stack::do_current_column (void) const
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
125 {
9484
bbe033dcfe13 make dbwhere work when called at keyboard prompt
John W. Eaton <jwe@octave.org>
parents: 9483
diff changeset
126 tree_statement *stmt = do_current_statement ();
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
127
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
128 return stmt ? stmt->column () : -1;
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
129 }
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
130
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
131 int
7923
c3d21b9b94b6 eliminate octave_call_stack member functions caller_user_script and caller_user_function, and unused difference_type args
John W. Eaton <jwe@octave.org>
parents: 7913
diff changeset
132 octave_call_stack::do_caller_user_code_line (void) const
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
133 {
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
134 int retval = -1;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
135
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
136 const_iterator p = cs.end ();
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
137
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
138 while (p != cs.begin ())
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
139 {
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
140 const call_stack_elt& elt = *(--p);
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
141
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
142 octave_function *f = elt.fcn;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
143
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
144 if (f && f->is_user_code ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
145 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
146 tree_statement *stmt = elt.stmt;
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
147
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
148 if (stmt)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
149 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
150 retval = stmt->line ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
151 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
152 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
153 }
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
154 }
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
155
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
156 return retval;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
157 }
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
158
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
159 int
7923
c3d21b9b94b6 eliminate octave_call_stack member functions caller_user_script and caller_user_function, and unused difference_type args
John W. Eaton <jwe@octave.org>
parents: 7913
diff changeset
160 octave_call_stack::do_caller_user_code_column (void) const
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
161 {
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
162 int retval = -1;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
163
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
164 const_iterator p = cs.end ();
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
165
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
166 while (p != cs.begin ())
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
167 {
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
168 const call_stack_elt& elt = *(--p);
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
169
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
170 octave_function *f = elt.fcn;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
171
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
172 if (f && f->is_user_code ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
173 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
174 tree_statement *stmt = elt.stmt;
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
175
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
176 if (stmt)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
177 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
178 retval = stmt->column ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
179 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
180 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
181 }
7877
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
182 }
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
183
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
184 return retval;
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
185 }
59031cfe331b lasterror fixes
John W. Eaton <jwe@octave.org>
parents: 7818
diff changeset
186
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
187 size_t
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
188 octave_call_stack::do_num_user_code_frames (octave_idx_type& curr_user_frame) const
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
189 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
190 size_t retval = 0;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
191
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
192 curr_user_frame = 0;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
193
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
194 // Look for the caller of dbstack.
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
195 size_t frame = cs[curr_frame].prev;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
196
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
197 bool found = false;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
198
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
199 size_t k = cs.size ();
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
200
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
201 for (const_reverse_iterator p = cs.rbegin (); p != cs.rend (); p++)
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
202 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
203 octave_function *f = (*p).fcn;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
204
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
205 if (--k == frame)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
206 found = true;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
207
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
208 if (f && f->is_user_code ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
209 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
210 if (! found)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
211 curr_user_frame++;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
212
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
213 retval++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
214 }
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
215 }
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
216
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
217 // We counted how many user frames were not the one, in reverse.
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
218 // Now set curr_user_frame to be the index in the other direction.
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
219 curr_user_frame = retval - curr_user_frame - 1;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
220
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
221 return retval;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
222 }
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
223
7719
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents: 7552
diff changeset
224 octave_user_code *
7923
c3d21b9b94b6 eliminate octave_call_stack member functions caller_user_script and caller_user_function, and unused difference_type args
John W. Eaton <jwe@octave.org>
parents: 7913
diff changeset
225 octave_call_stack::do_caller_user_code (size_t nskip) const
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
226 {
7719
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents: 7552
diff changeset
227 octave_user_code *retval = 0;
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
228
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
229 const_iterator p = cs.end ();
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
230
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
231 while (p != cs.begin ())
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
232 {
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
233 const call_stack_elt& elt = *(--p);
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
234
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
235 octave_function *f = elt.fcn;
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
236
7719
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents: 7552
diff changeset
237 if (f && f->is_user_code ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
238 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
239 if (nskip > 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
240 nskip--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
241 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
242 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
243 retval = dynamic_cast<octave_user_code *> (f);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
244 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
245 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
246 }
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
247 }
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
248
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
249 return retval;
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
250 }
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
251
10767
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
252 // Use static fields for the best efficiency.
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
253 // NOTE: C++0x will allow these two to be merged into one.
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
254 static const char *bt_fieldnames[] = { "file", "name", "line",
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
255 "column", "scope", "context", 0 };
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
256 static const octave_fields bt_fields (bt_fieldnames);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
257
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
258 octave_map
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
259 octave_call_stack::empty_backtrace (void)
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
260 {
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
261 return octave_map (dim_vector (0, 1), bt_fields);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
262 }
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
263
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
264 octave_map
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
265 octave_call_stack::do_backtrace (size_t nskip,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
266 octave_idx_type& curr_user_frame) const
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
267 {
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
268 size_t user_code_frames = do_num_user_code_frames (curr_user_frame);
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
269
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
270 size_t nframes = nskip <= user_code_frames ? user_code_frames - nskip : 0;
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
271
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
272 // Our list is reversed.
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
273 curr_user_frame = nframes - curr_user_frame - 1;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
274
10767
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
275 octave_map retval (dim_vector (nframes, 1), bt_fields);
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
276
10767
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
277 Cell& file = retval.contents (0);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
278 Cell& name = retval.contents (1);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
279 Cell& line = retval.contents (2);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
280 Cell& column = retval.contents (3);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
281 Cell& scope = retval.contents (4);
2b041d3995a3 modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10411
diff changeset
282 Cell& context = retval.contents (5);
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
283
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
284 if (nframes > 0)
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
285 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
286 int k = 0;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
287
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
288 for (const_reverse_iterator p = cs.rbegin (); p != cs.rend (); p++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
289 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
290 const call_stack_elt& elt = *p;
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
291
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
292 octave_function *f = elt.fcn;
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
293
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
294 if (f && f->is_user_code ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
295 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
296 if (nskip > 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
297 nskip--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
298 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
299 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
300 scope(k) = elt.scope;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
301 context(k) = elt.context;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
302
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
303 file(k) = f->fcn_file_name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
304 std::string parent_fcn_name = f->parent_fcn_name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
305 if (parent_fcn_name == std::string ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
306 name(k) = f->name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
307 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
308 name(k) = f->parent_fcn_name () + Vfilemarker + f->name ();
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
309
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
310 tree_statement *stmt = elt.stmt;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
311
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
312 if (stmt)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
313 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
314 line(k) = stmt->line ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
315 column(k) = stmt->column ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
316 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
317 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
318 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
319 line(k) = -1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
320 column(k) = -1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
321 }
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
322
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
323 k++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
324 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
325 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
326 }
7734
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
327 }
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
328
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
329 return retval;
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
330 }
2dee19385d32 eliminate tree_statement_stack; handle current statement info in octave_call_stack
John W. Eaton <jwe@octave.org>
parents: 7733
diff changeset
331
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
332 bool
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
333 octave_call_stack::do_goto_frame (size_t n, bool verbose)
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
334 {
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
335 bool retval = false;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
336
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
337 if (n < cs.size ())
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
338 {
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
339 retval = true;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
340
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
341 curr_frame = n;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
342
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
343 const call_stack_elt& elt = cs[n];
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
344
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
345 symbol_table::set_scope_and_context (elt.scope, elt.context);
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
346
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
347 if (verbose)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
348 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
349 octave_function *f = elt.fcn;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
350 std::string nm = f ? f->name () : std::string ("<unknown>");
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
351
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
352 tree_statement *s = elt.stmt;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
353 int l = -1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
354 int c = -1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
355 if (s)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
356 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
357 l = s->line ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
358 c = s->column ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
359 }
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
360
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
361 octave_stdout << "stopped in " << nm
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
362 << " at line " << l << " column " << c
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
363 << " (" << elt.scope << "[" << elt.context << "])"
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
364 << std::endl;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
365 }
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
366 }
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
367
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
368 return retval;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
369 }
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
370
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
371 bool
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
372 octave_call_stack::do_goto_frame_relative (int nskip, bool verbose)
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
373 {
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
374 bool retval = false;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
375
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
376 int incr = 0;
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
377
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
378 if (nskip < 0)
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
379 incr = -1;
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
380 else if (nskip > 0)
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
381 incr = 1;
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
382
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
383 // Start looking with the caller of dbup/dbdown/keyboard.
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
384 size_t frame = cs[curr_frame].prev;
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
385
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
386 while (true)
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
387 {
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
388 if ((incr < 0 && frame == 0) || (incr > 0 && frame == cs.size () - 1))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
389 break;
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
390
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
391 frame += incr;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
392
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
393 const call_stack_elt& elt = cs[frame];
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
394
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
395 octave_function *f = elt.fcn;
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
396
9990
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
397 if (frame == 0 || (f && f->is_user_code ()))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
398 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
399 if (nskip > 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
400 nskip--;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
401 else if (nskip < 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
402 nskip++;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
403
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
404 if (nskip == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
405 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
406 curr_frame = frame;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
407 cs[cs.size () - 1].prev = curr_frame;
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
408
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
409 symbol_table::set_scope_and_context (elt.scope, elt.context);
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
410
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
411 if (verbose)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
412 {
9990
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
413 std::ostringstream buf;
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
414
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
415 if (f)
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
416 {
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
417 tree_statement *s = elt.stmt;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
418
9990
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
419 int l = s ? s->line () : -1;
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
420
10839
65bc065bec95 still more debugger fixes
John W. Eaton <jwe@octave.org>
parents: 10767
diff changeset
421 buf << "stopped in " << f->name ()
65bc065bec95 still more debugger fixes
John W. Eaton <jwe@octave.org>
parents: 10767
diff changeset
422 << " at line " << l << std::endl;
9990
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
423 }
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
424 else
2b008f1d3794 octave_call_stack::do_goto_frame_relative: stop searching at top frame
John W. Eaton <jwe@octave.org>
parents: 9981
diff changeset
425 buf << "at top level" << std::endl;
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
426
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
427 octave_stdout << buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
428 }
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
429
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
430 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
431 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
432 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
433 }
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
434
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
435 // There is no need to set scope and context here. That will
9483
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
436 // happen when the dbup/dbdown/keyboard frame is popped and we
25c2e92ee03c correctly skip frame assigned to keyboard function
John W. Eaton <jwe@octave.org>
parents: 9452
diff changeset
437 // jump to the new "prev" frame set above.
7890
73ef513855e7 dbstack fixes
John W. Eaton <jwe@octave.org>
parents: 7877
diff changeset
438 }
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
439
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
440 return retval;
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
441 }
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7736
diff changeset
442
5744
1c36a2e82266 [project @ 2006-04-06 19:38:34 by jwe]
jwe
parents: 5743
diff changeset
443 void
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
444 octave_call_stack::do_goto_caller_frame (void)
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
445 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
446 size_t frame = curr_frame;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
447
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
448 bool skipped = false;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
449
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
450 while (frame != 0)
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
451 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
452 frame = cs[frame].prev;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
453
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
454 const call_stack_elt& elt = cs[frame];
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
455
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
456 octave_function *f = elt.fcn;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
457
8581
6adcafc70c32 toplev.cc (octave_call_stack::do_goto_caller_frame): allow caller frame to be base frame
John W. Eaton <jwe@octave.org>
parents: 8574
diff changeset
458 if (frame == 0 || (f && f->is_user_code ()))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
459 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
460 if (! skipped)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
461 // We found the current user code frame, so skip it.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
462 skipped = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
463 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
464 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
465 // We found the caller user code frame.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
466 call_stack_elt tmp (elt);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
467 tmp.prev = curr_frame;
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
468
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
469 curr_frame = cs.size ();
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
470
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
471 cs.push_back (tmp);
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
472
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
473 symbol_table::set_scope_and_context (tmp.scope, tmp.context);
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
474
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
475 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
476 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
477 }
7901
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
478 }
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
479 }
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
480
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
481 void
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
482 octave_call_stack::do_goto_base_frame (void)
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
483 {
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
484 call_stack_elt tmp (cs[0]);
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
485 tmp.prev = curr_frame;
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
486
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
487 curr_frame = cs.size ();
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
488
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
489 cs.push_back (tmp);
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
490
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
491 symbol_table::set_scope_and_context (tmp.scope, tmp.context);
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
492 }
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
493
3e4c9b69069d call stack changes
John W. Eaton <jwe@octave.org>
parents: 7890
diff changeset
494 void
8013
b3e667f1ab4c call backtrace_error_message in eval functions, not when popping stack
John W. Eaton <jwe@octave.org>
parents: 8011
diff changeset
495 octave_call_stack::do_backtrace_error_message (void) const
8011
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
496 {
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
497 if (error_state > 0)
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
498 {
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
499 error_state = -1;
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
500
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
501 error ("called from:");
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
502 }
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
503
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
504 if (! cs.empty ())
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
505 {
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
506 const call_stack_elt& elt = cs.back ();
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
507
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
508 octave_function *fcn = elt.fcn;
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
509 tree_statement *stmt = elt.stmt;
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
510
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
511 std::string fcn_name = "?unknown?";
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
512
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
513 if (fcn)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
514 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
515 fcn_name = fcn->fcn_file_name ();
8011
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
516
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
517 if (fcn_name.empty ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
518 fcn_name = fcn->name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
519 }
8011
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
520
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
521 int line = stmt ? stmt->line () : -1;
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
522 int column = stmt ? stmt->column () : -1;
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
523
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
524 error (" %s at line %d, column %d",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
525 fcn_name.c_str (), line, column);
8011
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
526 }
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
527 }
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
528
3100283874d7 improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
529 void
4180
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
530 recover_from_exception (void)
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
531 {
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
532 can_interrupt = true;
4182
4d1d7c51205c [project @ 2002-11-15 20:33:47 by jwe]
jwe
parents: 4181
diff changeset
533 octave_interrupt_immediately = 0;
4180
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
534 octave_interrupt_state = 0;
5142
0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe]
jwe
parents: 5102
diff changeset
535 octave_signal_caught = 0;
7481
78f3811155f7 use exceptions in liboctave error handler
John W. Eaton <jwe@octave.org>
parents: 7409
diff changeset
536 octave_exception_state = octave_no_exception;
4180
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
537 octave_restore_signal_mask ();
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
538 octave_catch_interrupts ();
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
539 }
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
540
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
541 int
5189
85b315ad5f7d [project @ 2005-03-04 02:46:08 by jwe]
jwe
parents: 5169
diff changeset
542 main_loop (void)
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
543 {
2016
6f3428b0d2c7 [project @ 1996-03-22 09:48:38 by jwe]
jwe
parents: 1996
diff changeset
544 octave_save_signal_mask ();
6f3428b0d2c7 [project @ 1996-03-22 09:48:38 by jwe]
jwe
parents: 1996
diff changeset
545
3020
f491f232cb09 [project @ 1997-06-03 22:15:08 by jwe]
jwe
parents: 3014
diff changeset
546 can_interrupt = true;
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
547
5142
0f9108f298ab [project @ 2005-02-12 02:29:34 by jwe]
jwe
parents: 5102
diff changeset
548 octave_signal_hook = octave_signal_handler;
10066
2cd940306a06 make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents: 9990
diff changeset
549 octave_interrupt_hook = 0;
2cd940306a06 make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents: 9990
diff changeset
550 octave_bad_alloc_hook = 0;
4429
c1f6200b5f0e [project @ 2003-06-17 04:36:08 by jwe]
jwe
parents: 4399
diff changeset
551
2554
f7e3d23f0a8f [project @ 1996-11-21 01:41:57 by jwe]
jwe
parents: 2552
diff changeset
552 octave_catch_interrupts ();
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
553
4172
2e94b2abfe6d [project @ 2002-11-12 21:14:04 by jwe]
jwe
parents: 4171
diff changeset
554 octave_initialized = true;
2e94b2abfe6d [project @ 2002-11-12 21:14:04 by jwe]
jwe
parents: 4171
diff changeset
555
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
556 // The big loop.
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
557
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
558 int retval = 0;
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
559 do
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
560 {
4180
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe]
jwe
parents: 4173
diff changeset
561 try
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
562 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
563 unwind_protect frame;
9260
9c2349a51218 properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents: 9255
diff changeset
564
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
565 reset_error_handler ();
4318
115bffcecfd3 [project @ 2003-02-13 05:52:16 by jwe]
jwe
parents: 4254
diff changeset
566
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
567 reset_parser ();
2620
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe]
jwe
parents: 2614
diff changeset
568
10186
095a1e670e68 make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
569 if (symbol_table::at_top_level ())
095a1e670e68 make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
570 tree_evaluator::reset_debug_state ();
095a1e670e68 make dbstep work with keyboard function
John W. Eaton <jwe@octave.org>
parents: 10182
diff changeset
571
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
572 // Do this with an unwind-protect cleanup function so that
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
573 // the forced variables will be unmarked in the event of an
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
574 // interrupt.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
575 symbol_table::scope_id scope = symbol_table::top_scope ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
576 frame.add_fcn (symbol_table::unmark_forced_variables, scope);
9260
9c2349a51218 properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents: 9255
diff changeset
577
11258
795c97ace02c eliminate some possible memory leaks
John W. Eaton <jwe@octave.org>
parents: 11123
diff changeset
578 frame.protect_var (global_command);
795c97ace02c eliminate some possible memory leaks
John W. Eaton <jwe@octave.org>
parents: 11123
diff changeset
579
795c97ace02c eliminate some possible memory leaks
John W. Eaton <jwe@octave.org>
parents: 11123
diff changeset
580 global_command = 0;
795c97ace02c eliminate some possible memory leaks
John W. Eaton <jwe@octave.org>
parents: 11123
diff changeset
581
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
582 // This is the same as yyparse in parse.y.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
583 retval = octave_parse ();
2620
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe]
jwe
parents: 2614
diff changeset
584
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
585 if (retval == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
586 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
587 if (global_command)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
588 {
13970
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13016
diff changeset
589 // Use an unwind-protect cleanup function so that the
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13016
diff changeset
590 // global_command list will be deleted in the event of
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13016
diff changeset
591 // an interrupt.
3883
69b6bd271277 [project @ 2002-04-02 21:05:10 by jwe]
jwe
parents: 3881
diff changeset
592
13970
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13016
diff changeset
593 frame.add_fcn (cleanup_statement_list, &global_command);
3883
69b6bd271277 [project @ 2002-04-02 21:05:10 by jwe]
jwe
parents: 3881
diff changeset
594
13970
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13016
diff changeset
595 global_command->accept (*current_evaluator);
3883
69b6bd271277 [project @ 2002-04-02 21:05:10 by jwe]
jwe
parents: 3881
diff changeset
596
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
597 octave_quit ();
4171
04694e5b4239 [project @ 2002-11-12 20:27:24 by jwe]
jwe
parents: 4155
diff changeset
598
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
599 if (! (interactive || forced_interactive))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
600 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
601 bool quit = (tree_return_command::returning
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
602 || tree_break_command::breaking);
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
603
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
604 if (tree_return_command::returning)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
605 tree_return_command::returning = 0;
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
606
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
607 if (tree_break_command::breaking)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
608 tree_break_command::breaking--;
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
609
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
610 if (quit)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
611 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
612 }
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4130
diff changeset
613
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
614 if (error_state)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
615 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
616 if (! (interactive || forced_interactive))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
617 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
618 // We should exit with a non-zero status.
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
619 retval = 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
620 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
621 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
622 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
623 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
624 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
625 if (octave_completion_matches_called)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
626 octave_completion_matches_called = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
627 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
628 command_editor::increment_current_command_number ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
629 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
630 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
631 else if (parser_end_of_input)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
632 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
633 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
634 }
4182
4d1d7c51205c [project @ 2002-11-15 20:33:47 by jwe]
jwe
parents: 4181
diff changeset
635 catch (octave_interrupt_exception)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
636 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
637 recover_from_exception ();
9383
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
638 octave_stdout << "\n";
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
639 if (quitting_gracefully)
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
640 {
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
641 clean_up_and_exit (exit_status);
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
642 break; // If user has overriden the exit func.
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
643 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
644 }
8704
236ff50db90f load-path.cc: catch execution exception in getcwd
John W. Eaton <jwe@octave.org>
parents: 8669
diff changeset
645 catch (octave_execution_exception)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
646 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
647 recover_from_exception ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
648 std::cerr
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
649 << "error: unhandled execution exception -- trying to return to prompt"
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
650 << std::endl;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
651 }
4181
dd2abf428f5d [project @ 2002-11-15 18:33:41 by jwe]
jwe
parents: 4180
diff changeset
652 catch (std::bad_alloc)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
653 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
654 recover_from_exception ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
655 std::cerr
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
656 << "error: memory exhausted or requested size too large for range of Octave's index type -- trying to return to prompt"
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
657 << std::endl;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
658 }
1907
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
659 }
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
660 while (retval == 0);
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
661
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
662 return retval;
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
663 }
8c6cea97eb80 [project @ 1996-02-10 01:12:46 by jwe]
jwe
parents: 1884
diff changeset
664
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
665 // Fix up things before exiting.
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
666
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
667 void
3162
7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe]
jwe
parents: 3147
diff changeset
668 clean_up_and_exit (int retval)
7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe]
jwe
parents: 3147
diff changeset
669 {
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
670 do_octave_atexit ();
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
671
9217
ee7cf4d963f3 smarter handling of quit()
Jaroslav Hajek <highegg@gmail.com>
parents: 9187
diff changeset
672 if (octave_exit)
ee7cf4d963f3 smarter handling of quit()
Jaroslav Hajek <highegg@gmail.com>
parents: 9187
diff changeset
673 (*octave_exit) (retval == EOF ? 0 : retval);
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
674 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
675
11023
cb62c7401ea2 toplev.cc (Fquit): allow any number of output paramters
John W. Eaton <jwe@octave.org>
parents: 10890
diff changeset
676 DEFUN (quit, args, ,
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
677 "-*- texinfo -*-\n\
10840
89f4d7e294cc Grammarcheck .cc files
Rik <octave@nomad.inbox5.com>
parents: 10839
diff changeset
678 @deftypefn {Built-in Function} {} exit (@var{status})\n\
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
679 @deftypefnx {Built-in Function} {} quit (@var{status})\n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
680 Exit the current Octave session. If the optional integer value\n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
681 @var{status} is supplied, pass that value to the operating system as the\n\
6615
687ae48b2253 [project @ 2007-05-13 06:24:57 by jwe]
jwe
parents: 6556
diff changeset
682 Octave's exit status. The default value is zero.\n\
3333
15cddaacbc2d [project @ 1999-11-03 19:53:59 by jwe]
jwe
parents: 3332
diff changeset
683 @end deftypefn")
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
684 {
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
685 octave_value_list retval;
2068
18365b6332a8 [project @ 1996-04-17 23:37:35 by jwe]
jwe
parents: 2016
diff changeset
686
9255
1c2d2c9f4a8d don't allow quit() in embedded mode by default, make configurable
Jaroslav Hajek <highegg@gmail.com>
parents: 9217
diff changeset
687 if (! quit_allowed)
11590
4ced6b90fffb style fixes for warning and error messages in source files
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
688 error ("quit: not supported in embedded mode");
11023
cb62c7401ea2 toplev.cc (Fquit): allow any number of output paramters
John W. Eaton <jwe@octave.org>
parents: 10890
diff changeset
689 else
2068
18365b6332a8 [project @ 1996-04-17 23:37:35 by jwe]
jwe
parents: 2016
diff changeset
690 {
3180
c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe]
jwe
parents: 3162
diff changeset
691 if (args.length () > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
692 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
693 int tmp = args(0).nint_value ();
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
694
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
695 if (! error_state)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
696 exit_status = tmp;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
697 }
3180
c17387059fd3 [project @ 1998-09-24 18:59:11 by jwe]
jwe
parents: 3162
diff changeset
698
9383
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
699 if (! error_state)
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
700 {
13981
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
701 // Instead of simply calling exit, we simulate an interrupt
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
702 // with a request to exit cleanly so that no matter where the
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
703 // call to quit occurs, we will run the unwind_protect stack,
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
704 // clear the OCTAVE_LOCAL_BUFFER allocations, etc. before
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
705 // exiting.
9383
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
706
13981
5f8bc2f145f5 clean up octave_chunk_buffer storage before exit
John W. Eaton <jwe@octave.org>
parents: 13973
diff changeset
707 quitting_gracefully = true;
9383
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
708
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
709 octave_interrupt_state = -1;
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
710
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
711 octave_throw_interrupt_exception ();
d57f0c56195f improve error handling
Jaroslav Hajek <highegg@gmail.com>
parents: 9377
diff changeset
712 }
2068
18365b6332a8 [project @ 1996-04-17 23:37:35 by jwe]
jwe
parents: 2016
diff changeset
713 }
18365b6332a8 [project @ 1996-04-17 23:37:35 by jwe]
jwe
parents: 2016
diff changeset
714
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
715 return retval;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
716 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
717
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
718 DEFALIAS (exit, quit);
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
719
1957
0e6a0a271998 [project @ 1996-02-15 01:08:15 by jwe]
jwe
parents: 1907
diff changeset
720 DEFUN (warranty, , ,
3446
5ee5afb3981a [project @ 2000-01-17 09:42:43 by jwe]
jwe
parents: 3402
diff changeset
721 "-*- texinfo -*-\n\
5ee5afb3981a [project @ 2000-01-17 09:42:43 by jwe]
jwe
parents: 3402
diff changeset
722 @deftypefn {Built-in Function} {} warranty ()\n\
5ee5afb3981a [project @ 2000-01-17 09:42:43 by jwe]
jwe
parents: 3402
diff changeset
723 Describe the conditions for copying and distributing Octave.\n\
5ee5afb3981a [project @ 2000-01-17 09:42:43 by jwe]
jwe
parents: 3402
diff changeset
724 @end deftypefn")
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
725 {
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
726 octave_value_list retval;
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
727
3922
38c61cbf086c [project @ 2002-05-01 06:48:35 by jwe]
jwe
parents: 3892
diff changeset
728 octave_stdout << "\n" \
38c61cbf086c [project @ 2002-05-01 06:48:35 by jwe]
jwe
parents: 3892
diff changeset
729 OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n\
38c61cbf086c [project @ 2002-05-01 06:48:35 by jwe]
jwe
parents: 3892
diff changeset
730 \n\
11104
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 11066
diff changeset
731 GNU Octave free software; you can redistribute it and/or modify\n\
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
732 it under the terms of the GNU General Public License as published by\n\
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
733 the Free Software Foundation; either version 3 of the License, or\n\
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
734 (at your option) any later version.\n\
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
735 \n\
11104
2c356a35d7f5 fix copyright notices
John W. Eaton <jwe@octave.org>
parents: 11066
diff changeset
736 GNU Octave is distributed in the hope that it will be useful,\n\
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
737 but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
738 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
739 GNU General Public License for more details.\n\
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
740 \n\
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
741 You should have received a copy of the GNU General Public License\n\
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7013
diff changeset
742 along with this program. If not, see <http://www.gnu.org/licenses/>.\n\
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
743 \n";
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
744
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
745 return retval;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
746 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
747
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
748 // Execute a shell command.
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
749
6316
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
750 static int
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
751 wait_for_input (int fid)
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
752 {
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
753 int retval = -1;
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
754
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
755 #if defined (HAVE_SELECT)
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
756 if (fid >= 0)
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
757 {
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
758 fd_set set;
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
759
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
760 FD_ZERO (&set);
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
761 FD_SET (fid, &set);
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
762
10411
479cc8a0a846 use gnulib namespace
John W. Eaton <jwe@octave.org>
parents: 10331
diff changeset
763 retval = gnulib::select (FD_SETSIZE, &set, 0, 0, 0);
6316
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
764 }
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
765 #else
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
766 retval = 1;
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
767 #endif
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
768
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
769 return retval;
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
770 }
a3a2580435c2 [project @ 2007-02-16 07:23:49 by jwe]
jwe
parents: 6311
diff changeset
771
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
772 static octave_value_list
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
773 run_command_and_return_output (const std::string& cmd_str)
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
774 {
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
775 octave_value_list retval;
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
776 unwind_protect frame;
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
777
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
778 iprocstream *cmd = new iprocstream (cmd_str.c_str ());
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
779
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
780 frame.add_delete (cmd);
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
781 frame.add_fcn (octave_child_list::remove, cmd->pid ());
3060
9c6cd52f3f5a [project @ 1997-06-25 18:30:40 by jwe]
jwe
parents: 3020
diff changeset
782
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
783 if (*cmd)
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
784 {
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
785 int fid = cmd->file_number ();
2095
36903d507b0e [project @ 1996-04-28 09:00:07 by jwe]
jwe
parents: 2086
diff changeset
786
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
787 std::ostringstream output_buf;
4494
93ad80b6eef6 [project @ 2003-09-03 20:27:00 by jwe]
jwe
parents: 4489
diff changeset
788
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
789 char ch;
3147
894d516b4a00 [project @ 1998-02-06 06:00:08 by jwe]
jwe
parents: 3141
diff changeset
790
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
791 for (;;)
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
792 {
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
793 if (cmd->get (ch))
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
794 output_buf.put (ch);
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
795 else
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
796 {
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
797 if (! cmd->eof () && errno == EAGAIN)
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
798 {
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
799 cmd->clear ();
3147
894d516b4a00 [project @ 1998-02-06 06:00:08 by jwe]
jwe
parents: 3141
diff changeset
800
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
801 if (wait_for_input (fid) != 1)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
802 break;
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
803 }
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
804 else
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
805 break;
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
806 }
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
807 }
3147
894d516b4a00 [project @ 1998-02-06 06:00:08 by jwe]
jwe
parents: 3141
diff changeset
808
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
809 int cmd_status = cmd->close ();
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
810
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
811 if (WIFEXITED (cmd_status))
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
812 cmd_status = WEXITSTATUS (cmd_status);
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
813 else
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
814 cmd_status = 127;
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
815
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
816 retval(1) = output_buf.str ();
10212
56f7734f5448 fix process creation failure handling in system()
Jaroslav Hajek <highegg@gmail.com>
parents: 10186
diff changeset
817 retval(0) = cmd_status;
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
818 }
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
819 else
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
820 error ("unable to start subprocess for `%s'", cmd_str.c_str ());
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
821
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
822 return retval;
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
823 }
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
824
5285
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
825 enum system_exec_type { et_sync, et_async };
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
826
1957
0e6a0a271998 [project @ 1996-02-15 01:08:15 by jwe]
jwe
parents: 1907
diff changeset
827 DEFUN (system, args, nargout,
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
828 "-*- texinfo -*-\n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
829 @deftypefn {Built-in Function} {} system (\"@var{string}\")\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
830 @deftypefnx {Built-in Function} {} system (\"@var{string}\", @var{return_output})\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
831 @deftypefnx {Built-in Function} {} system (\"@var{string}\", @var{return_output}, @var{type})\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
832 @deftypefnx {Built-in Function} {[@var{status}, @var{output}] =} system (@dots{})\n\
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
833 Execute a shell command specified by @var{string}.\n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
834 If the optional argument @var{type} is \"async\", the process\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
835 is started in the background and the process ID of the child process\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
836 is returned immediately. Otherwise, the child process is started and\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
837 Octave waits until it exits. If the @var{type} argument is omitted, it\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
838 defaults to the value \"sync\".\n\
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
839 \n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
840 If @var{system} is called with one or more output arguments, or if the\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
841 optional argument @var{return_output} is true and the subprocess is started\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
842 synchronously, then the output from the command is returned as a variable. \n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
843 Otherwise, if the subprocess is executed synchronously, its output is sent\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
844 to the standard output. To send the output of a command executed with\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
845 @code{system} through the pager, use a command like\n\
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
846 \n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
847 @example\n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
848 @group\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
849 [output, text] = system (\"cmd\");\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
850 disp (text);\n\
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
851 @end group\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
852 @end example\n\
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
853 \n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
854 @noindent\n\
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
855 or\n\
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
856 \n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
857 @example\n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
858 printf (\"%s\\n\", nthargout (2, \"system\", \"cmd\"));\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
859 @end example\n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
860 \n\
5659
960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe]
jwe
parents: 5655
diff changeset
861 The @code{system} function can return two values. The first is the\n\
960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe]
jwe
parents: 5655
diff changeset
862 exit status of the command and the second is any output from the\n\
960f4b9a26af [project @ 2006-03-10 15:35:20 by jwe]
jwe
parents: 5655
diff changeset
863 command that was written to the standard output stream. For example,\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
864 \n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
865 @example\n\
5717
34cda7d94c08 [project @ 2006-03-27 22:26:18 by jwe]
jwe
parents: 5672
diff changeset
866 [status, output] = system (\"echo foo; exit 2\");\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
867 @end example\n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
868 \n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
869 @noindent\n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
870 will set the variable @code{output} to the string @samp{foo}, and the\n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
871 variable @code{status} to the integer @samp{2}.\n\
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
872 \n\
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
873 For commands run asynchronously, @var{status} is the process id of the\n\
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
874 command shell that is started to run the command.\n\
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
875 @seealso{unix, dos}\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
876 @end deftypefn")
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
877 {
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
878 octave_value_list retval;
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
879
10066
2cd940306a06 make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents: 9990
diff changeset
880 unwind_protect frame;
3834
414e694c9e6a [project @ 2001-05-17 13:45:41 by jwe]
jwe
parents: 3822
diff changeset
881
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
882 int nargin = args.length ();
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
883
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
884 if (nargin > 0 && nargin < 4)
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
885 {
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
886 bool return_output = (nargin == 1 && nargout > 1);
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
887
5285
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
888 system_exec_type type = et_sync;
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
889
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
890 if (nargin == 3)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
891 {
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
892 std::string type_str = args(2).string_value ();
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
893
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
894 if (! error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
895 {
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
896 if (type_str == "sync")
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
897 type = et_sync;
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
898 else if (type_str == "async")
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
899 type = et_async;
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
900 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
901 {
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
902 error ("system: TYPE must be \"sync\" or \"async\"");
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
903 return retval;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
904 }
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
905 }
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
906 else
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
907 {
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
908 error ("system: TYPE must be a character string");
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
909 return retval;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
910 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
911 }
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
912
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
913 if (nargin > 1)
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
914 {
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
915 return_output = args(1).is_true ();
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
916
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
917 if (error_state)
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
918 {
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
919 error ("system: RETURN_OUTPUT must be boolean value true or false");
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
920 return retval;
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
921 }
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
922 }
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
923
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
924 if (return_output && type == et_async)
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
925 {
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
926 error ("system: can't return output from commands run asynchronously");
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
927 return retval;
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
928 }
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
929
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
930 std::string cmd_str = args(0).string_value ();
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
931
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
932 if (! error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
933 {
7104
b26d0cd10a42 [project @ 2007-11-06 17:18:41 by jwe]
jwe
parents: 7017
diff changeset
934 #if defined (__WIN32__) && ! defined (__CYGWIN__)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
935 // Work around weird double-quote handling on Windows systems.
7104
b26d0cd10a42 [project @ 2007-11-06 17:18:41 by jwe]
jwe
parents: 7017
diff changeset
936 if (type == et_sync)
b26d0cd10a42 [project @ 2007-11-06 17:18:41 by jwe]
jwe
parents: 7017
diff changeset
937 cmd_str = "\"" + cmd_str + "\"";
b26d0cd10a42 [project @ 2007-11-06 17:18:41 by jwe]
jwe
parents: 7017
diff changeset
938 #endif
b26d0cd10a42 [project @ 2007-11-06 17:18:41 by jwe]
jwe
parents: 7017
diff changeset
939
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
940 if (type == et_async)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
941 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
942 // FIXME -- maybe this should go in sysdep.cc?
4086
ddc722b38e87 [project @ 2002-10-03 19:08:45 by jwe]
jwe
parents: 4084
diff changeset
943 #ifdef HAVE_FORK
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
944 pid_t pid = fork ();
2083
679d7262a525 [project @ 1996-04-25 04:29:27 by jwe]
jwe
parents: 2078
diff changeset
945
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
946 if (pid < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
947 error ("system: fork failed -- can't create child process");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
948 else if (pid == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
949 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
950 // FIXME -- should probably replace this
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
951 // call with something portable.
3273
eb27ea9b7ff8 [project @ 1999-10-12 02:22:25 by jwe]
jwe
parents: 3258
diff changeset
952
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
953 execl ("/bin/sh", "sh", "-c", cmd_str.c_str (),
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
954 static_cast<void *> (0));
3273
eb27ea9b7ff8 [project @ 1999-10-12 02:22:25 by jwe]
jwe
parents: 3258
diff changeset
955
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
956 panic_impossible ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
957 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
958 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
959 retval(0) = pid;
6222
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
960 #elif defined (__WIN32__)
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
961 STARTUPINFO si;
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
962 PROCESS_INFORMATION pi;
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
963 ZeroMemory (&si, sizeof (si));
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
964 ZeroMemory (&pi, sizeof (pi));
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
965 OCTAVE_LOCAL_BUFFER (char, xcmd_str, cmd_str.length()+1);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
966 strcpy (xcmd_str, cmd_str.c_str ());
6222
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
967
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
968 if (! CreateProcess (0, xcmd_str, 0, 0, FALSE, 0, 0, 0, &si, &pi))
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
969 error ("system: CreateProcess failed -- can't create child process");
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
970 else
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
971 {
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
972 retval(0) = pi.dwProcessId;
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
973 CloseHandle (pi.hProcess);
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
974 CloseHandle (pi.hThread);
07d967f75dba [project @ 2007-01-03 20:15:15 by jwe]
jwe
parents: 6124
diff changeset
975 }
4086
ddc722b38e87 [project @ 2002-10-03 19:08:45 by jwe]
jwe
parents: 4084
diff changeset
976 #else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
977 error ("asynchronous system calls are not supported");
4086
ddc722b38e87 [project @ 2002-10-03 19:08:45 by jwe]
jwe
parents: 4084
diff changeset
978 #endif
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
979 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
980 else if (return_output)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
981 retval = run_command_and_return_output (cmd_str);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
982 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
983 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
984 int status = system (cmd_str.c_str ());
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
985
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
986 // The value in status is as returned by waitpid. If
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
987 // the process exited normally, extract the actual exit
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
988 // status of the command. Otherwise, return 127 as a
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
989 // failure code.
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
990
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
991 if (WIFEXITED (status))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
992 status = WEXITSTATUS (status);
2321
dac9933079e6 [project @ 1996-07-15 21:08:05 by jwe]
jwe
parents: 2299
diff changeset
993
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
994 retval(0) = status;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
995 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
996 }
11123
fbec4b3be59f toplev.cc (Fsystem): allow optional return_output and type arguments to be specified independently
John W. Eaton <jwe@octave.org>
parents: 11104
diff changeset
997 else
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
998 error ("system: expecting string as first argument");
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
999 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1000 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5814
diff changeset
1001 print_usage ();
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1002
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1003 return retval;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1004 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1005
12846
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1006 /*
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1007 %!test
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
1008 %! cmd = ls_command ();
12846
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1009 %! [status, output] = system (cmd);
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
1010 %! assert (status, 0);
12846
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1011 %! assert (ischar (output));
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1012 %! assert (! isempty (output));
14018
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
1013
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
1014 %!error system ()
5d5685216876 Deprecate shell_cmd function and update system, dos, unix commands
Rik <octave@nomad.inbox5.com>
parents: 14016
diff changeset
1015 %!error system (1, 2, 3)
12846
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1016 */
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1017
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
1018 // FIXME -- this should really be static, but that causes
2614
ae47b0911863 [project @ 1997-01-21 03:57:46 by jwe]
jwe
parents: 2554
diff changeset
1019 // problems on some systems.
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1020 std::list<std::string> octave_atexit_functions;
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1021
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1022 void
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1023 do_octave_atexit (void)
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1024 {
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1025 static bool deja_vu = false;
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1026
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1027 while (! octave_atexit_functions.empty ())
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1028 {
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1029 std::string fcn = octave_atexit_functions.front ();
4214
b9317f3973ec [project @ 2002-12-04 04:57:01 by jwe]
jwe
parents: 4208
diff changeset
1030
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1031 octave_atexit_functions.pop_front ();
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1032
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1033 OCTAVE_SAFE_CALL (reset_error_handler, ());
5237
652e8aa49fa7 [project @ 2005-03-23 21:28:45 by jwe]
jwe
parents: 5235
diff changeset
1034
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1035 OCTAVE_SAFE_CALL (feval, (fcn, octave_value_list (), 0));
3215
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe]
jwe
parents: 3202
diff changeset
1036
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1037 OCTAVE_SAFE_CALL (flush_octave_stdout, ());
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1038 }
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1039
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1040 if (! deja_vu)
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1041 {
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1042 deja_vu = true;
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1043
6068
c9f0839c583f [project @ 2006-10-20 16:54:30 by jwe]
jwe
parents: 6043
diff changeset
1044 // Do this explicitly so that destructors for mex file objects
c9f0839c583f [project @ 2006-10-20 16:54:30 by jwe]
jwe
parents: 6043
diff changeset
1045 // are called, so that functions registered with mexAtExit are
c9f0839c583f [project @ 2006-10-20 16:54:30 by jwe]
jwe
parents: 6043
diff changeset
1046 // called.
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1047 OCTAVE_SAFE_CALL (clear_mex_functions, ());
6068
c9f0839c583f [project @ 2006-10-20 16:54:30 by jwe]
jwe
parents: 6043
diff changeset
1048
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1049 OCTAVE_SAFE_CALL (command_editor::restore_terminal_state, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1050
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
1051 // FIXME -- is this needed? Can it cause any trouble?
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1052 OCTAVE_SAFE_CALL (raw_mode, (0));
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1053
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1054 OCTAVE_SAFE_CALL (octave_history_write_timestamp, ());
5305
539428e4606a [project @ 2005-04-26 02:59:08 by jwe]
jwe
parents: 5285
diff changeset
1055
12989
00235a6446da eliminate duplication of internal variables controlling command history
John W. Eaton <jwe@octave.org>
parents: 12846
diff changeset
1056 if (! command_history::ignoring_entries ())
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1057 OCTAVE_SAFE_CALL (command_history::clean_up_and_save, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1058
14073
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1059 OCTAVE_SAFE_CALL (gh_manager::close_all_figures, ());
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1060
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1061 OCTAVE_SAFE_CALL (gtk_manager::unload_all_toolkits, ());
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1062
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1063 OCTAVE_SAFE_CALL (close_files, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1064
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1065 OCTAVE_SAFE_CALL (cleanup_tmp_files, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1066
14073
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1067 OCTAVE_SAFE_CALL (symbol_table::cleanup, ());
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1068
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1069 OCTAVE_SAFE_CALL (cleanup_parser, ());
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1070
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1071 OCTAVE_SAFE_CALL (sysdep_cleanup, ());
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1072
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1073 OCTAVE_SAFE_CALL (flush_octave_stdout, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1074
5305
539428e4606a [project @ 2005-04-26 02:59:08 by jwe]
jwe
parents: 5285
diff changeset
1075 if (! quitting_gracefully && (interactive || forced_interactive))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1076 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1077 octave_stdout << "\n";
5629
489a475073d7 [project @ 2006-02-20 21:47:12 by jwe]
jwe
parents: 5510
diff changeset
1078
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1079 // Yes, we want this to be separate from the call to
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1080 // flush_octave_stdout above.
5629
489a475073d7 [project @ 2006-02-20 21:47:12 by jwe]
jwe
parents: 5510
diff changeset
1081
14014
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function
John W. Eaton <jwe@octave.org>
parents: 13983
diff changeset
1082 OCTAVE_SAFE_CALL (flush_octave_stdout, ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1083 }
14073
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1084
14156
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1085 // Don't call singleton_cleanup_list::cleanup until we have the
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1086 // problems with registering/unregistering types worked out. For
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1087 // example, uncomment the following line, then use the make_int
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1088 // function from the examples directory to create an integer
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1089 // object and then exit Octave. Octave should crash with a
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1090 // segfault when cleaning up the typinfo singleton. We need some
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1091 // way to force new octave_value_X types that are created in
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1092 // .oct files to be unregistered when the .oct file shared library
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1093 // is unloaded.
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1094 //
d5d3037cbc11 don't call singleton_cleanup_list::cleanup on exit.
John W. Eaton <jwe@octave.org>
parents: 14144
diff changeset
1095 // OCTAVE_SAFE_CALL (singleton_cleanup_list::cleanup, ());
14073
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1096
5cbc978a27e8 close all figures before closing all files (bug #35064)
John W. Eaton <jwe@octave.org>
parents: 14021
diff changeset
1097 OCTAVE_SAFE_CALL (octave_chunk_buffer::clear, ());
3216
60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe]
jwe
parents: 3215
diff changeset
1098 }
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1099 }
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1100
7409
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1101 void
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1102 octave_add_atexit_function (const std::string& fname)
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1103 {
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1104 octave_atexit_functions.push_front (fname);
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1105 }
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1106
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1107 bool
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1108 octave_remove_atexit_function (const std::string& fname)
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1109 {
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1110 bool found = false;
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1111
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1112 for (std::list<std::string>::iterator p = octave_atexit_functions.begin ();
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1113 p != octave_atexit_functions.end (); p++)
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1114 {
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1115 if (*p == fname)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1116 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1117 octave_atexit_functions.erase (p);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1118 found = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1119 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1120 }
7409
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1121 }
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1122
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1123 return found;
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1124 }
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1125
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe]
jwe
parents: 7361
diff changeset
1126
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1127 DEFUN (atexit, args, nargout,
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1128 "-*- texinfo -*-\n\
10840
89f4d7e294cc Grammarcheck .cc files
Rik <octave@nomad.inbox5.com>
parents: 10839
diff changeset
1129 @deftypefn {Built-in Function} {} atexit (@var{fcn})\n\
9133
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1130 @deftypefnx {Built-in Function} {} atexit (@var{fcn}, @var{flag})\n\
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1131 Register a function to be called when Octave exits. For example,\n\
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1132 \n\
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1133 @example\n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1134 @group\n\
9035
57649dcecb55 Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents: 8920
diff changeset
1135 function last_words ()\n\
6620
bf4bdc21dc8d [project @ 2007-05-14 17:35:46 by jwe]
jwe
parents: 6615
diff changeset
1136 disp (\"Bye bye\");\n\
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1137 endfunction\n\
9035
57649dcecb55 Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents: 8920
diff changeset
1138 atexit (\"last_words\");\n\
3332
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1139 @end group\n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1140 @end example\n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1141 \n\
7c03933635c6 [project @ 1999-11-02 06:57:12 by jwe]
jwe
parents: 3325
diff changeset
1142 @noindent\n\
6620
bf4bdc21dc8d [project @ 2007-05-14 17:35:46 by jwe]
jwe
parents: 6615
diff changeset
1143 will print the message \"Bye bye\" when Octave exits.\n\
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1144 \n\
9133
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1145 The additional argument @var{flag} will register or unregister\n\
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1146 @var{fcn} from the list of functions to be called when Octave\n\
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1147 exits. If @var{flag} is true, the function is registered, and if\n\
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1148 @var{flag} is false, it is unregistered. For example,\n\
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1149 after registering the function @code{last_words} above,\n\
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1150 \n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1151 @example\n\
9035
57649dcecb55 Documentation cleanup of basics.texi
Rik <rdrider0-list@yahoo.com>
parents: 8920
diff changeset
1152 atexit (\"last_words\", false);\n\
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1153 @end example\n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1154 \n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1155 @noindent\n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1156 will remove the function from the list and Octave will not call\n\
9133
c0cef1436788 Update help text for sections 2.2 and 2.3 of basics.txi
Rik <rdrider0-list@yahoo.com>
parents: 9079
diff changeset
1157 @code{last_words} when it exits.\n\
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1158 \n\
7001
8b0cfeb06365 [project @ 2007-10-10 18:02:59 by jwe]
jwe
parents: 6789
diff changeset
1159 Note that @code{atexit} only removes the first occurrence of a function\n\
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1160 from the list, so if a function was placed in the list multiple\n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1161 times with @code{atexit}, it must also be removed from the list\n\
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1162 multiple times.\n\
3333
15cddaacbc2d [project @ 1999-11-03 19:53:59 by jwe]
jwe
parents: 3332
diff changeset
1163 @end deftypefn")
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1164 {
2086
bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe]
jwe
parents: 2084
diff changeset
1165 octave_value_list retval;
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1166
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1167 int nargin = args.length ();
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1168
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1169 if (nargin == 1 || nargin == 2)
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1170 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
1171 std::string arg = args(0).string_value ();
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1172
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1173 if (! error_state)
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1174 {
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1175 bool add_mode = true;
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1176
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1177 if (nargin == 2)
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1178 {
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1179 add_mode = args(1).bool_value ();
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1180
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1181 if (error_state)
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
1182 error ("atexit: FLAG argument must be a logical value");
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1183 }
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1184
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1185 if (! error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1186 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1187 if (add_mode)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1188 octave_add_atexit_function (arg);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1189 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1190 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1191 bool found = octave_remove_atexit_function (arg);
6680
cd39d4a0b671 [project @ 2007-05-31 20:23:45 by jwe]
jwe
parents: 6676
diff changeset
1192
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1193 if (nargout > 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1194 retval(0) = found;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1195 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1196 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1197 }
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1198 else
12483
7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents: 12208
diff changeset
1199 error ("atexit: FCN argument must be a string");
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1200 }
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1201 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5814
diff changeset
1202 print_usage ();
2077
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1203
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1204 return retval;
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1205 }
2d03b8eb891d [project @ 1996-04-24 00:21:21 by jwe]
jwe
parents: 2068
diff changeset
1206
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1207 DEFUN (octave_config_info, args, ,
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
1208 "-*- texinfo -*-\n\
12208
9611014e7cf1 Add function compare_versions to documentation.
Rik <octave@nomad.inbox5.com>
parents: 12195
diff changeset
1209 @deftypefn {Built-in Function} {} octave_config_info ()\n\
9611014e7cf1 Add function compare_versions to documentation.
Rik <octave@nomad.inbox5.com>
parents: 12195
diff changeset
1210 @deftypefnx {Built-in Function} {} octave_config_info (@var{option})\n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
1211 Return a structure containing configuration and installation\n\
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
1212 information for Octave.\n\
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1213 \n\
12208
9611014e7cf1 Add function compare_versions to documentation.
Rik <octave@nomad.inbox5.com>
parents: 12195
diff changeset
1214 If @var{option} is a string, return the configuration information for the\n\
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1215 specified option.\n\
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1216 \n\
3301
02866242d3ae [project @ 1999-10-20 04:10:46 by jwe]
jwe
parents: 3273
diff changeset
1217 @end deftypefn")
2162
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
1218 {
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1219 octave_value retval;
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1220
4128
919b2f6573ee [project @ 2002-10-25 20:36:14 by jwe]
jwe
parents: 4111
diff changeset
1221 #if defined (ENABLE_DYNAMIC_LINKING)
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1222 bool octave_supports_dynamic_linking = true;
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1223 #else
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1224 bool octave_supports_dynamic_linking = false;
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1225 #endif
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1226
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1227 static bool initialized = false;
11066
e678346a47d9 toplev.cc, sighandlers.cc, utils.cc, octave.cc, pt-eval.cc pt-idx.cc: Octave_map to octave_map and octave_scalar_map conversion
John W. Eaton <jwe@octave.org>
parents: 11023
diff changeset
1228 static octave_scalar_map m;
2162
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
1229
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1230 struct conf_info_struct
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1231 {
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1232 bool subst_home;
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1233 const char *key;
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1234 const char *val;
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1235 };
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1236
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1237 static const conf_info_struct conf_info[] =
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1238 {
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1239 { false, "ALL_CFLAGS", OCTAVE_CONF_ALL_CFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1240 { false, "ALL_CXXFLAGS", OCTAVE_CONF_ALL_CXXFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1241 { false, "ALL_FFLAGS", OCTAVE_CONF_ALL_FFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1242 { false, "ALL_LDFLAGS", OCTAVE_CONF_ALL_LDFLAGS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1243 { false, "AMD_CPPFLAGS", OCTAVE_CONF_AMD_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1244 { false, "AMD_LDFLAGS", OCTAVE_CONF_AMD_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1245 { false, "AMD_LIBS", OCTAVE_CONF_AMD_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1246 { false, "AR", OCTAVE_CONF_AR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1247 { false, "ARFLAGS", OCTAVE_CONF_ARFLAGS },
14144
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
1248 { false, "ARPACK_CPPFLAGS", OCTAVE_CONF_ARPACK_CPPFLAGS },
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
1249 { false, "ARPACK_LDFLAGS", OCTAVE_CONF_ARPACK_LDFLAGS },
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
1250 { false, "ARPACK_LIBS", OCTAVE_CONF_ARPACK_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1251 { false, "BLAS_LIBS", OCTAVE_CONF_BLAS_LIBS },
8772
aeedc045cfe3 toplev.cc (Foctave_config_info): add CARBON_LIBS, X11_INCFLAGS, and X11_LIBS to the struct
John W. Eaton <jwe@octave.org>
parents: 8735
diff changeset
1252 { false, "CARBON_LIBS", OCTAVE_CONF_CARBON_LIBS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1253 { false, "CAMD_CPPFLAGS", OCTAVE_CONF_CAMD_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1254 { false, "CAMD_LDFLAGS", OCTAVE_CONF_CAMD_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1255 { false, "CAMD_LIBS", OCTAVE_CONF_CAMD_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1256 { false, "CC", OCTAVE_CONF_CC },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1257 { false, "CC_VERSION", OCTAVE_CONF_CC_VERSION },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1258 { false, "CCOLAMD_CPPFLAGS", OCTAVE_CONF_CCOLAMD_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1259 { false, "CCOLAMD_LDFLAGS", OCTAVE_CONF_CCOLAMD_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1260 { false, "CCOLAMD_LIBS", OCTAVE_CONF_CCOLAMD_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1261 { false, "CFLAGS", OCTAVE_CONF_CFLAGS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1262 { false, "CHOLMOD_CPPFLAGS", OCTAVE_CONF_CHOLMOD_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1263 { false, "CHOLMOD_LDFLAGS", OCTAVE_CONF_CHOLMOD_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1264 { false, "CHOLMOD_LIBS", OCTAVE_CONF_CHOLMOD_LIBS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1265 { false, "COLAMD_CPPFLAGS", OCTAVE_CONF_COLAMD_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1266 { false, "COLAMD_LDFLAGS", OCTAVE_CONF_COLAMD_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1267 { false, "COLAMD_LIBS", OCTAVE_CONF_COLAMD_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1268 { false, "CPICFLAG", OCTAVE_CONF_CPICFLAG },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1269 { false, "CPPFLAGS", OCTAVE_CONF_CPPFLAGS },
9519
ee99f9f37505 improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents: 9515
diff changeset
1270 { false, "CURL_CPPFLAGS", OCTAVE_CONF_CURL_CPPFLAGS },
ee99f9f37505 improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents: 9515
diff changeset
1271 { false, "CURL_LDFLAGS", OCTAVE_CONF_CURL_LDFLAGS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1272 { false, "CURL_LIBS", OCTAVE_CONF_CURL_LIBS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1273 { false, "CXSPARSE_CPPFLAGS", OCTAVE_CONF_CXSPARSE_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1274 { false, "CXSPARSE_LDFLAGS", OCTAVE_CONF_CXSPARSE_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1275 { false, "CXSPARSE_LIBS", OCTAVE_CONF_CXSPARSE_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1276 { false, "CXX", OCTAVE_CONF_CXX },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1277 { false, "CXXCPP", OCTAVE_CONF_CXXCPP },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1278 { false, "CXXFLAGS", OCTAVE_CONF_CXXFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1279 { false, "CXXPICFLAG", OCTAVE_CONF_CXXPICFLAG },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1280 { false, "CXX_VERSION", OCTAVE_CONF_CXX_VERSION },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1281 { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1282 { false, "DEFS", OCTAVE_CONF_DEFS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1283 { false, "DL_LD", OCTAVE_CONF_DL_LD },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1284 { false, "DL_LDFLAGS", OCTAVE_CONF_DL_LDFLAGS },
9515
eee9b3150446 more configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9514
diff changeset
1285 { false, "DL_LIBS", OCTAVE_CONF_DL_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1286 { false, "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1287 { false, "EXEEXT", OCTAVE_CONF_EXEEXT },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1288 { false, "F77", OCTAVE_CONF_F77 },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1289 { false, "F77_FLOAT_STORE_FLAG", OCTAVE_CONF_F77_FLOAT_STORE_FLAG },
10331
6a50aa2cdf00 never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
1290 { false, "F77_INTEGER_8_FLAG", OCTAVE_CONF_F77_INTEGER_8_FLAG },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1291 { false, "FC", OCTAVE_CONF_FC },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1292 { false, "FFLAGS", OCTAVE_CONF_FFLAGS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1293 { false, "FFTW3_CPPFLAGS", OCTAVE_CONF_FFTW3_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1294 { false, "FFTW3_LDFLAGS", OCTAVE_CONF_FFTW3_LDFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1295 { false, "FFTW3_LIBS", OCTAVE_CONF_FFTW3_LIBS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1296 { false, "FFTW3F_CPPFLAGS", OCTAVE_CONF_FFTW3F_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1297 { false, "FFTW3F_LDFLAGS", OCTAVE_CONF_FFTW3F_LDFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1298 { false, "FFTW3F_LIBS", OCTAVE_CONF_FFTW3F_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1299 { false, "FLIBS", OCTAVE_CONF_FLIBS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1300 { false, "FPICFLAG", OCTAVE_CONF_FPICFLAG },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1301 { false, "FT2_LIBS", OCTAVE_CONF_FT2_LIBS },
9523
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1302 { false, "GLPK_CPPFLAGS", OCTAVE_CONF_GLPK_CPPFLAGS },
0ce82753dd72 more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents: 9519
diff changeset
1303 { false, "GLPK_LDFLAGS", OCTAVE_CONF_GLPK_LDFLAGS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1304 { false, "GLPK_LIBS", OCTAVE_CONF_GLPK_LIBS },
7361
a2870fd8ac58 [project @ 2008-01-12 07:50:54 by jwe]
jwe
parents: 7336
diff changeset
1305 { false, "GNUPLOT", OCTAVE_CONF_GNUPLOT },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1306 { false, "GRAPHICS_LIBS", OCTAVE_CONF_GRAPHICS_LIBS },
9542
f5ec5dc66824 use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents: 9538
diff changeset
1307 { false, "HDF5_CPPFLAGS", OCTAVE_CONF_HDF5_CPPFLAGS },
f5ec5dc66824 use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents: 9538
diff changeset
1308 { false, "HDF5_LDFLAGS", OCTAVE_CONF_HDF5_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1309 { false, "HDF5_LIBS", OCTAVE_CONF_HDF5_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1310 { false, "INCFLAGS", OCTAVE_CONF_INCFLAGS },
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents: 9575
diff changeset
1311 { false, "LAPACK_LIBS", OCTAVE_CONF_LAPACK_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1312 { false, "LDFLAGS", OCTAVE_CONF_LDFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1313 { false, "LD_CXX", OCTAVE_CONF_LD_CXX },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1314 { false, "LD_STATIC_FLAG", OCTAVE_CONF_LD_STATIC_FLAG },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1315 { false, "LEX", OCTAVE_CONF_LEX },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1316 { false, "LEXLIB", OCTAVE_CONF_LEXLIB },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1317 { false, "LFLAGS", OCTAVE_CONF_LFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1318 { false, "LIBCRUFT", OCTAVE_CONF_LIBCRUFT },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1319 { false, "LIBEXT", OCTAVE_CONF_LIBEXT },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1320 { false, "LIBFLAGS", OCTAVE_CONF_LIBFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1321 { false, "LIBOCTAVE", OCTAVE_CONF_LIBOCTAVE },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1322 { false, "LIBOCTINTERP", OCTAVE_CONF_LIBOCTINTERP },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1323 { false, "LIBS", OCTAVE_CONF_LIBS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1324 { false, "LN_S", OCTAVE_CONF_LN_S },
9575
55ecaefb7d0f Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents: 9572
diff changeset
1325 { false, "MAGICK_CPPFLAGS", OCTAVE_CONF_MAGICK_CPPFLAGS },
55ecaefb7d0f Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents: 9572
diff changeset
1326 { false, "MAGICK_LDFLAGS", OCTAVE_CONF_MAGICK_LDFLAGS },
7926
d74f996e005d __magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents: 7923
diff changeset
1327 { false, "MAGICK_LIBS", OCTAVE_CONF_MAGICK_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1328 { false, "MKOCTFILE_DL_LDFLAGS", OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS },
13010
edc5ec6e949b maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents: 12989
diff changeset
1329 { false, "OCTAVE_LINK_DEPS", OCTAVE_CONF_OCTAVE_LINK_DEPS },
edc5ec6e949b maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents: 12989
diff changeset
1330 { false, "OCTAVE_LINK_OPTS", OCTAVE_CONF_OCTAVE_LINK_OPTS },
edc5ec6e949b maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents: 12989
diff changeset
1331 { false, "OCT_LINK_DEPS", OCTAVE_CONF_OCT_LINK_DEPS },
edc5ec6e949b maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents: 12989
diff changeset
1332 { false, "OCT_LINK_OPTS", OCTAVE_CONF_OCT_LINK_OPTS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1333 { false, "OPENGL_LIBS", OCTAVE_CONF_OPENGL_LIBS },
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1334 { false, "PTHREAD_CFLAGS", OCTAVE_CONF_PTHREAD_CFLAGS },
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1335 { false, "PTHREAD_LIBS", OCTAVE_CONF_PTHREAD_LIBS },
9519
ee99f9f37505 improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents: 9515
diff changeset
1336 { false, "QHULL_CPPFLAGS", OCTAVE_CONF_QHULL_CPPFLAGS },
ee99f9f37505 improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents: 9515
diff changeset
1337 { false, "QHULL_LDFLAGS", OCTAVE_CONF_QHULL_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1338 { false, "QHULL_LIBS", OCTAVE_CONF_QHULL_LIBS },
9570
1ab56c73ec7c use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents: 9568
diff changeset
1339 { false, "QRUPDATE_CPPFLAGS", OCTAVE_CONF_QRUPDATE_CPPFLAGS },
1ab56c73ec7c use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents: 9568
diff changeset
1340 { false, "QRUPDATE_LDFLAGS", OCTAVE_CONF_QRUPDATE_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1341 { false, "QRUPDATE_LIBS", OCTAVE_CONF_QRUPDATE_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1342 { false, "RANLIB", OCTAVE_CONF_RANLIB },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1343 { false, "RDYNAMIC_FLAG", OCTAVE_CONF_RDYNAMIC_FLAG },
9515
eee9b3150446 more configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9514
diff changeset
1344 { false, "READLINE_LIBS", OCTAVE_CONF_READLINE_LIBS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1345 { false, "REGEX_LIBS", OCTAVE_CONF_REGEX_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1346 { false, "SED", OCTAVE_CONF_SED },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1347 { false, "SHARED_LIBS", OCTAVE_CONF_SHARED_LIBS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1348 { false, "SHLEXT", OCTAVE_CONF_SHLEXT },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1349 { false, "SHLEXT_VER", OCTAVE_CONF_SHLEXT_VER },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1350 { false, "SH_LD", OCTAVE_CONF_SH_LD },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1351 { false, "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1352 { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1353 { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS },
9515
eee9b3150446 more configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9514
diff changeset
1354 { false, "TERM_LIBS", OCTAVE_CONF_TERM_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1355 { false, "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS },
9572
ab8a163f2052 use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents: 9570
diff changeset
1356 { false, "UMFPACK_CPPFLAGS", OCTAVE_CONF_UMFPACK_CPPFLAGS },
ab8a163f2052 use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents: 9570
diff changeset
1357 { false, "UMFPACK_LDFLAGS", OCTAVE_CONF_UMFPACK_LDFLAGS },
9514
af86991d8d47 configure tweaks
John W. Eaton <jwe@octave.org>
parents: 9484
diff changeset
1358 { false, "UMFPACK_LIBS", OCTAVE_CONF_UMFPACK_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1359 { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T },
8772
aeedc045cfe3 toplev.cc (Foctave_config_info): add CARBON_LIBS, X11_INCFLAGS, and X11_LIBS to the struct
John W. Eaton <jwe@octave.org>
parents: 8735
diff changeset
1360 { false, "X11_INCFLAGS", OCTAVE_CONF_X11_INCFLAGS },
aeedc045cfe3 toplev.cc (Foctave_config_info): add CARBON_LIBS, X11_INCFLAGS, and X11_LIBS to the struct
John W. Eaton <jwe@octave.org>
parents: 8735
diff changeset
1361 { false, "X11_LIBS", OCTAVE_CONF_X11_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1362 { false, "XTRA_CFLAGS", OCTAVE_CONF_XTRA_CFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1363 { false, "XTRA_CXXFLAGS", OCTAVE_CONF_XTRA_CXXFLAGS },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1364 { false, "YACC", OCTAVE_CONF_YACC },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1365 { false, "YFLAGS", OCTAVE_CONF_YFLAGS },
9538
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents: 9523
diff changeset
1366 { false, "Z_CPPFLAGS", OCTAVE_CONF_Z_CPPFLAGS },
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents: 9523
diff changeset
1367 { false, "Z_LDFLAGS", OCTAVE_CONF_Z_LDFLAGS },
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents: 9523
diff changeset
1368 { false, "Z_LIBS", OCTAVE_CONF_Z_LIBS },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1369 { false, "api_version", OCTAVE_API_VERSION },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1370 { true, "archlibdir", OCTAVE_ARCHLIBDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1371 { true, "bindir", OCTAVE_BINDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1372 { false, "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1373 { false, "config_opts", OCTAVE_CONF_config_opts },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1374 { true, "datadir", OCTAVE_DATADIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1375 { true, "datarootdir", OCTAVE_DATAROOTDIR },
6276
d26c558691cd [project @ 2007-02-07 09:01:24 by jwe]
jwe
parents: 6274
diff changeset
1376 { true, "exec_prefix", OCTAVE_EXEC_PREFIX },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1377 { true, "fcnfiledir", OCTAVE_FCNFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1378 { true, "imagedir", OCTAVE_IMAGEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1379 { true, "includedir", OCTAVE_INCLUDEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1380 { true, "infodir", OCTAVE_INFODIR },
6276
d26c558691cd [project @ 2007-02-07 09:01:24 by jwe]
jwe
parents: 6274
diff changeset
1381 { true, "infofile", OCTAVE_INFOFILE },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1382 { true, "libdir", OCTAVE_LIBDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1383 { true, "libexecdir", OCTAVE_LIBEXECDIR },
6311
e2a1aca62551 [project @ 2007-02-15 21:18:34 by jwe]
jwe
parents: 6276
diff changeset
1384 { true, "localapiarchlibdir", OCTAVE_LOCALAPIARCHLIBDIR },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1385 { true, "localapifcnfiledir", OCTAVE_LOCALAPIFCNFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1386 { true, "localapioctfiledir", OCTAVE_LOCALAPIOCTFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1387 { true, "localarchlibdir", OCTAVE_LOCALARCHLIBDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1388 { true, "localfcnfiledir", OCTAVE_LOCALFCNFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1389 { true, "localoctfiledir", OCTAVE_LOCALOCTFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1390 { true, "localstartupfiledir", OCTAVE_LOCALSTARTUPFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1391 { true, "localverarchlibdir", OCTAVE_LOCALVERARCHLIBDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1392 { true, "localverfcnfiledir", OCTAVE_LOCALVERFCNFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1393 { true, "localveroctfiledir", OCTAVE_LOCALVEROCTFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1394 { true, "man1dir", OCTAVE_MAN1DIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1395 { false, "man1ext", OCTAVE_MAN1EXT },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1396 { true, "mandir", OCTAVE_MANDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1397 { true, "octfiledir", OCTAVE_OCTFILEDIR },
8719
679c270b7584 install DOC and NEWS in $octetcdir
John W. Eaton <jwe@octave.org>
parents: 8704
diff changeset
1398 { true, "octetcdir", OCTAVE_OCTETCDIR },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1399 { true, "octincludedir", OCTAVE_OCTINCLUDEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1400 { true, "octlibdir", OCTAVE_OCTLIBDIR },
6276
d26c558691cd [project @ 2007-02-07 09:01:24 by jwe]
jwe
parents: 6274
diff changeset
1401 { true, "prefix", OCTAVE_PREFIX },
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1402 { true, "startupfiledir", OCTAVE_STARTUPFILEDIR },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1403 { false, "version", OCTAVE_VERSION },
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1404 { false, 0, 0 }
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1405 };
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1406
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1407 if (! initialized)
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1408 {
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4494
diff changeset
1409 m.assign ("dld", octave_value (octave_supports_dynamic_linking));
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1410
4697
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1411 oct_mach_info::float_format ff = oct_mach_info::native_float_format ();
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1412 m.assign ("float_format",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1413 octave_value (oct_mach_info::float_format_as_string (ff)));
4697
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1414
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1415 m.assign ("words_big_endian",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1416 octave_value (oct_mach_info::words_big_endian ()));
4697
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1417
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1418 m.assign ("words_little_endian",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1419 octave_value (oct_mach_info::words_little_endian ()));
4697
c26904f532f1 [project @ 2004-01-16 17:49:20 by jwe]
jwe
parents: 4691
diff changeset
1420
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1421 int i = 0;
4440
0bca8443db39 [project @ 2003-07-02 22:45:29 by jwe]
jwe
parents: 4429
diff changeset
1422
0bca8443db39 [project @ 2003-07-02 22:45:29 by jwe]
jwe
parents: 4429
diff changeset
1423 while (true)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1424 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1425 const conf_info_struct& elt = conf_info[i++];
6274
d42abdfcb8e9 [project @ 2007-02-07 07:22:02 by jwe]
jwe
parents: 6222
diff changeset
1426
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1427 const char *key = elt.key;
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1428
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1429 if (key)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1430 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1431 if (elt.subst_home)
11066
e678346a47d9 toplev.cc, sighandlers.cc, utils.cc, octave.cc, pt-eval.cc pt-idx.cc: Octave_map to octave_map and octave_scalar_map conversion
John W. Eaton <jwe@octave.org>
parents: 11023
diff changeset
1432 m.assign (key, subst_octave_home (elt.val));
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1433 else
11066
e678346a47d9 toplev.cc, sighandlers.cc, utils.cc, octave.cc, pt-eval.cc pt-idx.cc: Octave_map to octave_map and octave_scalar_map conversion
John W. Eaton <jwe@octave.org>
parents: 11023
diff changeset
1434 m.assign (key, elt.val);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1435 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1436 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1437 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1438 }
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1439
4691
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1440 bool unix_system = true;
7013
f943e9635115 [project @ 2007-10-11 19:39:02 by jwe]
jwe
parents: 7010
diff changeset
1441 bool mac_system = false;
4691
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1442 bool windows_system = false;
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1443
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1444 #if defined (WIN32)
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1445 windows_system = true;
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1446 #if !defined (__CYGWIN__)
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1447 unix_system = false;
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1448 #endif
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1449 #endif
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1450
8574
83b8c739d626 toplev.cc: check OCTAVE_USE_OS_X_API instead of __APPLE__ && __MACH__
John W. Eaton <jwe@octave.org>
parents: 8377
diff changeset
1451 #if defined (OCTAVE_USE_OS_X_API)
7010
f7d2f54008f5 [project @ 2007-10-11 17:50:34 by jwe]
jwe
parents: 7001
diff changeset
1452 mac_system = true;
f7d2f54008f5 [project @ 2007-10-11 17:50:34 by jwe]
jwe
parents: 7001
diff changeset
1453 #endif
f7d2f54008f5 [project @ 2007-10-11 17:50:34 by jwe]
jwe
parents: 7001
diff changeset
1454
4691
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1455 m.assign ("unix", octave_value (unix_system));
7010
f7d2f54008f5 [project @ 2007-10-11 17:50:34 by jwe]
jwe
parents: 7001
diff changeset
1456 m.assign ("mac", octave_value (mac_system));
4691
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1457 m.assign ("windows", octave_value (windows_system));
bdc51b369a78 [project @ 2004-01-10 18:16:02 by jwe]
jwe
parents: 4675
diff changeset
1458
4357
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1459 initialized = true;
d700cfed902a [project @ 2003-02-22 18:48:18 by jwe]
jwe
parents: 4356
diff changeset
1460 }
2162
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
1461
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1462 int nargin = args.length ();
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1463
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1464 if (nargin == 1)
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1465 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
1466 std::string arg = args(0).string_value ();
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1467
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1468 if (! error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1469 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1470 Cell c = m.contents (arg.c_str ());
5199
16a6247730d9 [project @ 2005-03-10 20:24:45 by jwe]
jwe
parents: 5189
diff changeset
1471
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1472 if (c.is_empty ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1473 error ("octave_config_info: no info for `%s'", arg.c_str ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1474 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1475 retval = c(0);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10212
diff changeset
1476 }
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1477 }
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1478 else if (nargin == 0)
4233
ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe]
jwe
parents: 4221
diff changeset
1479 retval = m;
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1480 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5814
diff changeset
1481 print_usage ();
2689
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1482
8c7955a8d49f [project @ 1997-02-18 09:06:10 by jwe]
jwe
parents: 2675
diff changeset
1483 return retval;
2162
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
1484 }
a940dcdfe9de [project @ 1996-05-13 10:31:51 by jwe]
jwe
parents: 2145
diff changeset
1485
12846
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1486 /*
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1487 %!error octave_config_info (1, 2);
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1488 %!assert (ischar (octave_config_info ("version")));
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1489 %!test
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1490 %! x = octave_config_info ();
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1491 %! assert (isstruct (x));
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1492 %! assert (! isempty (x));
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1493 */
9ce9e1e2d2c8 codesprint: new tests for toplev.cc
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
1494
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1495 #if defined (__GNUG__) && defined (DEBUG_NEW_DELETE)
2806
187d5321cfa3 [project @ 1997-03-11 05:13:15 by jwe]
jwe
parents: 2802
diff changeset
1496
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1497 int debug_new_delete = 0;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1498
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1499 typedef void (*vfp)(void);
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1500 extern vfp __new_handler;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1501
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1502 void *
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1503 __builtin_new (size_t sz)
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1504 {
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1505 void *p;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1506
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1507 /* malloc (0) is unpredictable; avoid it. */
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1508 if (sz == 0)
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1509 sz = 1;
2800
9aeba8e006a4 [project @ 1997-03-09 09:50:20 by jwe]
jwe
parents: 2796
diff changeset
1510 p = malloc (sz);
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1511 while (p == 0)
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1512 {
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1513 (*__new_handler) ();
2800
9aeba8e006a4 [project @ 1997-03-09 09:50:20 by jwe]
jwe
parents: 2796
diff changeset
1514 p = malloc (sz);
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1515 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1516
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1517 if (debug_new_delete)
5629
489a475073d7 [project @ 2006-02-20 21:47:12 by jwe]
jwe
parents: 5510
diff changeset
1518 std::cerr << "__builtin_new: " << p << std::endl;
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1519
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1520 return p;
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1521 }
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1522
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1523 void
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1524 __builtin_delete (void *ptr)
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1525 {
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1526 if (debug_new_delete)
5629
489a475073d7 [project @ 2006-02-20 21:47:12 by jwe]
jwe
parents: 5510
diff changeset
1527 std::cerr << "__builtin_delete: " << ptr << std::endl;
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1528
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1529 if (ptr)
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1530 free (ptr);
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1531 }
2806
187d5321cfa3 [project @ 1997-03-11 05:13:15 by jwe]
jwe
parents: 2802
diff changeset
1532
1683
5282f171363d [project @ 1995-12-30 03:46:07 by jwe]
jwe
parents:
diff changeset
1533 #endif