Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-exp.cc @ 20770:c1a6c31ac29a
eliminate more simple uses of error_state
* ov-classdef.cc: Eliminate simple uses of error_state.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Oct 2015 00:20:02 -0400 |
parents | f90c8372b7ba |
children |
rev | line source |
---|---|
1741 | 1 /* |
2 | |
19898
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
1741 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
1741 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
1741 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
24 #include <config.h> | |
25 #endif | |
26 | |
3503 | 27 #include <iostream> |
2980 | 28 #include <string> |
29 | |
1741 | 30 #include "error.h" |
2980 | 31 #include "pager.h" |
2979 | 32 #include "oct-lvalue.h" |
2388 | 33 #include "ov.h" |
1741 | 34 #include "pt-exp.h" |
35 | |
2980 | 36 // Expressions. |
2960 | 37 |
2980 | 38 bool |
39 tree_expression::is_logically_true (const char *warn_for) | |
1741 | 40 { |
2980 | 41 bool expr_value = false; |
2971 | 42 |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
43 octave_value t1 = rvalue1 (); |
2960 | 44 |
20762
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20638
diff
changeset
|
45 if (t1.is_defined ()) |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20638
diff
changeset
|
46 return t1.is_true (); |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20638
diff
changeset
|
47 else |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20638
diff
changeset
|
48 error ("%s: undefined value used in conditional expression", |
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20638
diff
changeset
|
49 warn_for); |
2388 | 50 |
2980 | 51 return expr_value; |
1741 | 52 } |
53 | |
2086 | 54 octave_value |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
55 tree_expression::rvalue1 (int) |
1741 | 56 { |
20638
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
57 error ("invalid rvalue function called in expression"); |
2980 | 58 return octave_value (); |
2971 | 59 } |
60 | |
61 octave_value_list | |
2982 | 62 tree_expression::rvalue (int) |
2971 | 63 { |
20638
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
64 error ("invalid rvalue function called in expression"); |
2980 | 65 return octave_value_list (); |
2971 | 66 } |
67 | |
10832
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
68 octave_value_list |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
69 tree_expression::rvalue (int nargout, const std::list<octave_lvalue> *) |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
70 { |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
71 return rvalue (nargout); |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
72 } |
1b2fcd122c6a
allow user detect ignored outputs in m-functions
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
73 |
2979 | 74 octave_lvalue |
2980 | 75 tree_expression::lvalue (void) |
2971 | 76 { |
20638
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
77 error ("invalid lvalue function called in expression"); |
2980 | 78 return octave_lvalue (); |
2971 | 79 } |
80 | |
3536 | 81 std::string |
2980 | 82 tree_expression::original_text (void) const |
2971 | 83 { |
3523 | 84 return std::string (); |
2958 | 85 } |