Mercurial > hg > octave-lyh

comparison src/oct-parse.yy @ 12483:7a5aacf65f81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rewrite error strings in src/ to use variables named in documentation.
author Rik <octave@nomad.inbox5.com>
date Sat, 26 Feb 2011 17:28:11 -0800
parents 5252f12537f8
children 002948ae5bc0 7b5bfd6a8e28
comparison
equal deleted inserted replaced
12482:3244c6e0af4a 12483:7a5aacf65f81
4267 nargout); 4267 nargout);
4268 else 4268 else
4269 error ("builtin: lookup for symbol `%s' failed", name.c_str ()); 4269 error ("builtin: lookup for symbol `%s' failed", name.c_str ());
4270 } 4270 }
4271 else 4271 else
4272 error ("builtin: expecting function name as first argument"); 4272 error ("builtin: function name (F) must be a string");
4273 } 4273 }
4274 else 4274 else
4275 print_usage (); 4275 print_usage ();
4276 4276
4277 return retval; 4277 return retval;
4607 if (context == "caller") 4607 if (context == "caller")
4608 octave_call_stack::goto_caller_frame (); 4608 octave_call_stack::goto_caller_frame ();
4609 else if (context == "base") 4609 else if (context == "base")
4610 octave_call_stack::goto_base_frame (); 4610 octave_call_stack::goto_base_frame ();
4611 else 4611 else
4612 error ("assignin: context must be \"caller\" or \"base\""); 4612 error ("assignin: CONTEXT must be \"caller\" or \"base\"");
4613 4613
4614 if (! error_state) 4614 if (! error_state)
4615 { 4615 {
4616 frame.add_fcn (octave_call_stack::pop); 4616 frame.add_fcn (octave_call_stack::pop);
4617 4617
4620 if (! error_state) 4620 if (! error_state)
4621 { 4621 {
4622 if (valid_identifier (nm)) 4622 if (valid_identifier (nm))
4623 symbol_table::varref (nm) = args(2); 4623 symbol_table::varref (nm) = args(2);
4624 else 4624 else
4625 error ("assignin: invalid variable name"); 4625 error ("assignin: invalid variable name in argument VARNAME");
4626 } 4626 }
4627 else 4627 else
4628 error ("assignin: expecting variable name as second argument"); 4628 error ("assignin: VARNAME must be a string");
4629 } 4629 }
4630 } 4630 }
4631 else 4631 else
4632 error ("assignin: expecting string as first argument"); 4632 error ("assignin: CONTEXT must be a string");
4633 } 4633 }
4634 else 4634 else
4635 print_usage (); 4635 print_usage ();
4636 4636
4637 return retval; 4637 return retval;
4660 if (context == "caller") 4660 if (context == "caller")
4661 octave_call_stack::goto_caller_frame (); 4661 octave_call_stack::goto_caller_frame ();
4662 else if (context == "base") 4662 else if (context == "base")
4663 octave_call_stack::goto_base_frame (); 4663 octave_call_stack::goto_base_frame ();
4664 else 4664 else
4665 error ("evalin: context must be \"caller\" or \"base\""); 4665 error ("evalin: CONTEXT must be \"caller\" or \"base\"");
4666 4666
4667 if (! error_state) 4667 if (! error_state)
4668 { 4668 {
4669 frame.add_fcn (octave_call_stack::pop); 4669 frame.add_fcn (octave_call_stack::pop);
4670 4670
4697 retval = (nargout > 0) ? tmp : octave_value_list (); 4697 retval = (nargout > 0) ? tmp : octave_value_list ();
4698 } 4698 }
4699 } 4699 }
4700 } 4700 }
4701 else 4701 else
4702 error ("evalin: expecting string as first argument"); 4702 error ("evalin: CONTEXT must be a string");
4703 } 4703 }
4704 else 4704 else
4705 print_usage (); 4705 print_usage ();
4706 4706
4707 return retval; 4707 return retval;