Mercurial > hg > octave-lyh
comparison src/variables.cc @ 191:b6b4d8c513fe
[project @ 1993-10-29 23:41:39 by jwe]
author | jwe |
---|---|
date | Fri, 29 Oct 1993 23:41:39 +0000 |
parents | 31bd3f646964 |
children | 13c6086c325c |
comparison
equal
deleted
inserted
replaced
190:edfb6cafe85d | 191:b6b4d8c513fe |
---|---|
187 | 187 |
188 tree *defn = sr->def (); | 188 tree *defn = sr->def (); |
189 if (defn != NULL_TREE) | 189 if (defn != NULL_TREE) |
190 { | 190 { |
191 tree_constant val = defn->eval (0); | 191 tree_constant val = defn->eval (0); |
192 if (val.is_string_type ()) | 192 if (error_state) |
193 return retval; | |
194 else if (val.is_string_type ()) | |
193 { | 195 { |
194 char *s = val.string_value (); | 196 char *s = val.string_value (); |
195 if (s != (char *) NULL) | 197 if (s != (char *) NULL) |
196 retval = strsave (s); | 198 retval = strsave (s); |
197 } | 199 } |
220 | 222 |
221 tree *defn = sr->def (); | 223 tree *defn = sr->def (); |
222 if (defn != NULL_TREE) | 224 if (defn != NULL_TREE) |
223 { | 225 { |
224 tree_constant val = defn->eval (0); | 226 tree_constant val = defn->eval (0); |
225 if (val.const_type () == tree_constant_rep::scalar_constant) | 227 if (error_state) |
228 return status; | |
229 else if (val.const_type () == tree_constant_rep::scalar_constant) | |
226 { | 230 { |
227 d = val.double_value (); | 231 d = val.double_value (); |
228 status = 0; | 232 status = 0; |
229 } | 233 } |
230 } | 234 } |