# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1361378173 18000 # Node ID 94e95309710ce44ea2bb9d2b944e8e97c5c0bd26 # Parent e603ce23f20c3a68b5f7ca44bd5be1e327633bcc Whitespace cleanup diff -r e603ce23f20c -r 94e95309710c libinterp/interpfcn/symtab.cc --- a/libinterp/interpfcn/symtab.cc Tue Jan 29 17:55:53 2013 +0100 +++ b/libinterp/interpfcn/symtab.cc Wed Feb 20 11:36:13 2013 -0500 @@ -1016,8 +1016,8 @@ if (is_superiorto (inf_class, sup_class)) return false; - // If sup_class doesn't have an entry in the precedence table, - // this will automatically create it, and associate to it a + // If sup_class doesn't have an entry in the precedence table, + // this will automatically create it, and associate to it a // singleton set {inf_class} of inferior classes. class_precedence_table[sup_class].insert (inf_class); @@ -1040,7 +1040,7 @@ bool symbol_table::is_superiorto (const std::string& a, const std::string& b) { - class_precedence_table_const_iterator p = class_precedence_table.find (a); + class_precedence_table_const_iterator p = class_precedence_table.find (a); // If a has no entry in the precedence table, return false if (p == class_precedence_table.end ()) return false; @@ -1466,7 +1466,7 @@ { if (ours.is_global () || ours.is_persistent ()) ::error ("global and persistent may only be used in the topmost level in which a nested variable is used"); - + if (! ours.is_formal ()) { ours.invalidate (); diff -r e603ce23f20c -r 94e95309710c libinterp/octave-value/ov-class.cc --- a/libinterp/octave-value/ov-class.cc Tue Jan 29 17:55:53 2013 +0100 +++ b/libinterp/octave-value/ov-class.cc Wed Feb 20 11:36:13 2013 -0500 @@ -2196,7 +2196,7 @@ error ("superiorto: invalid call from outside class constructor"); return retval; } - + for (int i = 0; i < args.length (); i++) { std::string inf_class = args(i).string_value (); @@ -2206,7 +2206,7 @@ break; } - // User defined classes always have higher precedence + // User defined classes always have higher precedence // than built-in classes if (is_built_in_class (inf_class)) break; @@ -2218,8 +2218,8 @@ sup_class.c_str (), inf_class.c_str ()); break; } - } - + } + return retval; } @@ -2233,30 +2233,30 @@ @end deftypefn") { octave_value retval; - + octave_function *fcn = octave_call_stack::caller (); if ((! fcn) || (! fcn->is_class_constructor ())) { error ("inferiorto: invalid call from outside class constructor"); return retval; } - + for (int i = 0; i < args.length (); i++) { - std::string sup_class = args(i).string_value (); + std::string sup_class = args(i).string_value (); if (error_state) { error ("inferiorto: expecting argument to be class name"); break; } - + if (is_built_in_class (sup_class)) { error ("inferiorto: cannot give user-defined class lower " "precedence than built-in class"); break; } - + std::string inf_class = fcn->name (); if (! symbol_table::set_class_relationship (sup_class, inf_class)) {