Mercurial > hg > octave-shane
changeset 13117:9bebb2322c4e
computer: accept "arch" argument
* computer.m: Accept "arch" argument.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Sep 2011 14:20:43 -0400 |
parents | 9fc95b9f8001 |
children | c6601cb63e4e |
files | scripts/miscellaneous/computer.m |
diffstat | 1 files changed, 37 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/miscellaneous/computer.m +++ b/scripts/miscellaneous/computer.m @@ -18,6 +18,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{c}, @var{maxsize}, @var{endian}] =} computer () +## @deftypefnx {Function File} {@var{arch} =} computer ("arch") ## Print or return a string of the form @var{cpu}-@var{vendor}-@var{os} ## that identifies the kind of computer Octave is running on. If invoked ## with an output argument, the value is returned instead of printed. For @@ -39,42 +40,52 @@ ## If three output arguments are requested, also return the byte order ## of the current system as a character (@code{"B"} for big-endian or ## @code{"L"} for little-endian). +## +## If the argument @code{"arch"} is specified, return a string +## indicating the architecture of the computer on which Octave is +## running. ## @end deftypefn -function [c, maxsize, endian] = computer () - - if (nargin != 0) - warning ("computer: ignoring extra arguments"); - endif +function [c, maxsize, endian] = computer (a) - msg = octave_config_info ("canonical_host_type"); + if (nargin == 1 && ischar (a) && strcmpi (a, "arch")) + tmp = strsplit (octave_config_info ("canonical_host_type"), "-"); + if (numel (tmp) == 4) + c = sprintf ("%s-%s-%s", tmp{4}, tmp{3}, tmp{1}); + else + c = sprintf ("%s-%s", tmp{3}, tmp{1}); + endif + elseif (nargin == 0) + msg = octave_config_info ("canonical_host_type"); - if (strcmp (msg, "unknown")) - msg = "Hi Dave, I'm a HAL-9000"; - endif + if (strcmp (msg, "unknown")) + msg = "Hi Dave, I'm a HAL-9000"; + endif - if (nargout == 0) - printf ("%s\n", msg); - else - c = msg; - if (strcmp (octave_config_info ("USE_64_BIT_IDX_T"), "true")) - maxsize = 2^63-1; + if (nargout == 0) + printf ("%s\n", msg); else - maxsize = 2^31-1; + c = msg; + if (strcmp (octave_config_info ("USE_64_BIT_IDX_T"), "true")) + maxsize = 2^63-1; + else + maxsize = 2^31-1; + endif + if (octave_config_info ("words_big_endian")) + endian = "B"; + elseif (octave_config_info ("words_little_endian")) + endian = "L"; + else + endian = "?"; + endif endif - if (octave_config_info ("words_big_endian")) - endian = "B"; - elseif (octave_config_info ("words_little_endian")) - endian = "L"; - else - endian = "?"; - endif + else + print_usage (); endif endfunction %!assert((ischar (computer ()) %! && computer () == octave_config_info ("canonical_host_type"))); - -%!warning a =computer(2); - +%!assert(ischar (computer ("arch"))); +%!error computer (2);