Mercurial > hg > octave-lyh

comparison src/ov-class.cc @ 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 a71c1aa9823e
children 6f3f18957851
comparison
equal deleted inserted replaced
12482:3244c6e0af4a 12483:7a5aacf65f81
1695 field_names = m.keys (); 1695 field_names = m.keys ();
1696 1696
1697 parent_class_names = obj.parent_class_name_list (); 1697 parent_class_names = obj.parent_class_name_list ();
1698 } 1698 }
1699 else 1699 else
1700 error ("invalid call to exmplar_info constructor"); 1700 error ("invalid call to exemplar_info constructor");
1701 } 1701 }
1702 1702
1703 1703
1704 // A map from class names to lists of fields. 1704 // A map from class names to lists of fields.
1705 std::map<std::string, octave_class::exemplar_info> octave_class::exemplar_map; 1705 std::map<std::string, octave_class::exemplar_info> octave_class::exemplar_map;
1824 error ("class: object of class `%s' does not match previously constructed objects", 1824 error ("class: object of class `%s' does not match previously constructed objects",
1825 id.c_str ()); 1825 id.c_str ());
1826 } 1826 }
1827 } 1827 }
1828 else 1828 else
1829 error ("class: expecting structure as first argument"); 1829 error ("class: expecting structure S as first argument");
1830 } 1830 }
1831 else 1831 else
1832 error ("class: `%s' is invalid as a class name in this context", 1832 error ("class: `%s' is invalid as a class name in this context",
1833 id.c_str ()); 1833 id.c_str ());
1834 } 1834 }
1835 else 1835 else
1836 error ("class: invalid call from outside class constructor or method"); 1836 error ("class: invalid call from outside class constructor or method");
1837 } 1837 }
1838 else 1838 else
1839 error ("class: expecting character string as second argument"); 1839 error ("class: ID (class name) must be a character string");
1840 } 1840 }
1841 1841
1842 return retval; 1842 return retval;
1843 } 1843 }
1844 1844