Mercurial > hg > octave-lyh
diff src/pt-pr-code.cc @ 10315:57a59eae83cc
untabify src C++ source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 11 Feb 2010 12:41:46 -0500 |
parents | cd96d29c5efa |
children | 64e7538db12a |
line wrap: on
line diff
--- a/src/pt-pr-code.cc +++ b/src/pt-pr-code.cc @@ -69,12 +69,12 @@ tree_expression *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << ", "; - } + if (p != lst.end ()) + os << ", "; + } } } @@ -202,12 +202,12 @@ tree_decl_elt *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << ", "; - } + if (p != lst.end ()) + os << ", "; + } } } @@ -351,26 +351,26 @@ int len = ret_list->length (); if (len > 1 || takes_var_return) - { - os << "["; - nesting.push ('['); - } + { + os << "["; + nesting.push ('['); + } ret_list->accept (*this); if (takes_var_return) - { - if (len > 0) - os << ", "; + { + if (len > 0) + os << ", "; - os << "varargout"; - } + os << "varargout"; + } if (len > 1 || takes_var_return) - { - nesting.pop (); - os << "]"; - } + { + nesting.pop (); + os << "]"; + } os << " = "; } @@ -388,27 +388,27 @@ int len = param_list->length (); if (len > 0 || takes_varargs) - { - os << "("; - nesting.push ('('); - } + { + os << "("; + nesting.push ('('); + } param_list->accept (*this); if (takes_varargs) - { - if (len > 0) - os << ", "; + { + if (len > 0) + os << ", "; - os << "varargin"; - } + os << "varargin"; + } if (len > 0 || takes_varargs) - { - nesting.pop (); - os << ")"; - newline (); - } + { + nesting.pop (); + os << ")"; + newline (); + } } else { @@ -510,21 +510,21 @@ tree_if_clause *elt = *p++; if (elt) - { - if (! first_elt) - { - print_indented_comment (elt->leading_comment ()); + { + if (! first_elt) + { + print_indented_comment (elt->leading_comment ()); - indent (); + indent (); - if (elt->is_else_clause ()) - os << "else"; - else - os << "elseif "; - } + if (elt->is_else_clause ()) + os << "else"; + else + os << "elseif "; + } - elt->accept (*this); - } + elt->accept (*this); + } first_elt = false; } @@ -560,56 +560,56 @@ for (int i = 0; i < n; i++) { switch (type_tags[i]) - { - case '(': - { - char nc = nesting.top (); - if ((nc == '[' || nc == '{') && expr.paren_count () == 0) - os << "("; - else - os << " ("; - nesting.push ('('); + { + case '(': + { + char nc = nesting.top (); + if ((nc == '[' || nc == '{') && expr.paren_count () == 0) + os << "("; + else + os << " ("; + nesting.push ('('); - tree_argument_list *l = *p_arg_lists; - if (l) - l->accept (*this); + tree_argument_list *l = *p_arg_lists; + if (l) + l->accept (*this); - nesting.pop (); - os << ")"; - } - break; - - case '{': - { - char nc = nesting.top (); - if ((nc == '[' || nc == '{') && expr.paren_count () == 0) - os << "{"; - else - os << " {"; - // We only care about whitespace inside [] and {} when we - // are defining matrix and cell objects, not when indexing. - nesting.push ('('); + nesting.pop (); + os << ")"; + } + break; + + case '{': + { + char nc = nesting.top (); + if ((nc == '[' || nc == '{') && expr.paren_count () == 0) + os << "{"; + else + os << " {"; + // We only care about whitespace inside [] and {} when we + // are defining matrix and cell objects, not when indexing. + nesting.push ('('); - tree_argument_list *l = *p_arg_lists; - if (l) - l->accept (*this); + tree_argument_list *l = *p_arg_lists; + if (l) + l->accept (*this); - nesting.pop (); - os << "}"; - } - break; - - case '.': - { - string_vector nm = *p_arg_names; - assert (nm.length () == 1); - os << "." << nm(0); - } - break; + nesting.pop (); + os << "}"; + } + break; + + case '.': + { + string_vector nm = *p_arg_names; + assert (nm.length () == 1); + os << "." << nm(0); + } + break; - default: - panic_impossible (); - } + default: + panic_impossible (); + } p_arg_lists++; p_arg_names++; @@ -635,12 +635,12 @@ tree_argument_list *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << "; "; - } + if (p != lst.end ()) + os << "; "; + } } nesting.pop (); @@ -666,12 +666,12 @@ tree_argument_list *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << "; "; - } + if (p != lst.end ()) + os << "; "; + } } nesting.pop (); @@ -694,18 +694,18 @@ int len = lhs->length (); if (len > 1) - { - os << "["; - nesting.push ('['); - } + { + os << "["; + nesting.push ('['); + } lhs->accept (*this); if (len > 1) - { - nesting.pop (); - os << "]"; - } + { + nesting.pop (); + os << "]"; + } } os << " " << expr.oper () << " "; @@ -760,12 +760,12 @@ tree_decl_elt *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << ", "; - } + if (p != lst.end ()) + os << ", "; + } } } @@ -821,12 +821,12 @@ tree_index_expression *elt = *p++; if (elt) - { - elt->accept (*this); + { + elt->accept (*this); - if (p != lst.end ()) - os << ", "; - } + if (p != lst.end ()) + os << ", "; + } } } @@ -864,29 +864,29 @@ cmd->accept (*this); if (! stmt.print_result ()) - { - os << ";"; - newline (" "); - } + { + os << ";"; + newline (" "); + } else - newline (); + newline (); } else { tree_expression *expr = stmt.expression (); if (expr) - { - expr->accept (*this); + { + expr->accept (*this); - if (! stmt.print_result ()) - { - os << ";"; - newline (" "); - } - else - newline (); - } + if (! stmt.print_result ()) + { + os << ";"; + newline (" "); + } + else + newline (); + } } } @@ -898,7 +898,7 @@ tree_statement *elt = *p; if (elt) - elt->accept (*this); + elt->accept (*this); } } @@ -945,7 +945,7 @@ tree_switch_case *elt = *p++; if (elt) - elt->accept (*this); + elt->accept (*this); } } @@ -1163,14 +1163,14 @@ if (printing_newlines) { if (beginning_of_line) - { - os << prefix; + { + os << prefix; - for (int i = 0; i < curr_print_indent_level; i++) - os << " "; + for (int i = 0; i < curr_print_indent_level; i++) + os << " "; - beginning_of_line = false; - } + beginning_of_line = false; + } } } @@ -1226,32 +1226,32 @@ char c = comment[i++]; if (c == '\n') - { - if (prev_char_was_newline) - os << "##"; + { + if (prev_char_was_newline) + os << "##"; - newline (); + newline (); - prev_char_was_newline = true; - } + prev_char_was_newline = true; + } else - { - if (beginning_of_line) - { - printed_something = true; + { + if (beginning_of_line) + { + printed_something = true; - indent (); + indent (); - os << "##"; + os << "##"; - if (! (isspace (c) || c == '!')) - os << " "; - } + if (! (isspace (c) || c == '!')) + os << " "; + } - os << static_cast<char> (c); + os << static_cast<char> (c); - prev_char_was_newline = false; - } + prev_char_was_newline = false; + } } if (printed_something && ! beginning_of_line) @@ -1266,14 +1266,14 @@ octave_comment_list::iterator p = comment_list->begin (); while (p != comment_list->end ()) - { - octave_comment_elt elt = *p++; + { + octave_comment_elt elt = *p++; - print_comment_elt (elt); + print_comment_elt (elt); - if (p != comment_list->end ()) - newline (); - } + if (p != comment_list->end ()) + newline (); + } } }