Mercurial > hg > octave-lyh

comparison src/ov-fcn-handle.cc @ 11461:2b8531a6a3c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change mentions of "nested function" to the less misleading "subfunction"
author David Grundberg <individ@acc.umu.se>
date Sat, 08 Jan 2011 11:53:51 +0100
parents 64e7538db12a
children fd0a3ac60b0e
comparison
equal deleted inserted replaced
11460:17936067b48f 11461:2b8531a6a3c9
1471 octave_function *fptr = f.function_value (true); 1471 octave_function *fptr = f.function_value (true);
1472 1472
1473 // Here we are just looking to see if FCN is a method or constructor 1473 // Here we are just looking to see if FCN is a method or constructor
1474 // for any class. 1474 // for any class.
1475 if (local_funcs && fptr 1475 if (local_funcs && fptr
1476 && (fptr->is_nested_function () || fptr->is_private_function () 1476 && (fptr->is_subfunction () || fptr->is_private_function ()
1477 || fptr->is_class_constructor ())) 1477 || fptr->is_class_constructor ()))
1478 { 1478 {
1479 // Locally visible function. 1479 // Locally visible function.
1480 retval = octave_value (new octave_fcn_handle (f, tnm)); 1480 retval = octave_value (new octave_fcn_handle (f, tnm));
1481 } 1481 }
1592 } 1592 }
1593 else 1593 else
1594 { 1594 {
1595 m.setfield ("function", fh_nm); 1595 m.setfield ("function", fh_nm);
1596 1596
1597 if (fcn->is_nested_function ()) 1597 if (fcn->is_subfunction ())
1598 { 1598 {
1599 m.setfield ("type", "subfunction"); 1599 m.setfield ("type", "subfunction");
1600 Cell parentage (dim_vector (1, 2)); 1600 Cell parentage (dim_vector (1, 2));
1601 parentage.elem(0) = fh_nm; 1601 parentage.elem(0) = fh_nm;
1602 parentage.elem(1) = fcn->parent_fcn_name (); 1602 parentage.elem(1) = fcn->parent_fcn_name ();