diff options
Diffstat (limited to 'src/roff/troff')
| -rw-r--r-- | src/roff/troff/env.cpp | 9 | ||||
| -rw-r--r-- | src/roff/troff/input.cpp | 10 | ||||
| -rw-r--r-- | src/roff/troff/mtsm.cpp | 15 |
3 files changed, 13 insertions, 21 deletions
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp index 6d722f5c..13672cc5 100644 --- a/src/roff/troff/env.cpp +++ b/src/roff/troff/env.cpp @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2000-2006, 2009, 2011 +/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2009 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) @@ -3210,7 +3211,7 @@ const char *sptoa(int sp) double factor = 10.0; double val = s; int decimal_point = 0; - do { + do { double v = ceil(s*factor); if (v > INT_MAX) break; @@ -3313,8 +3314,8 @@ void environment::print_env() ? "on" : margin_character_flags == MARGIN_CHARACTER_NEXT ? "next" - : margin_character_flags == (MARGIN_CHARACTER_ON - | MARGIN_CHARACTER_NEXT) + : margin_character_flags == MARGIN_CHARACTER_ON + | MARGIN_CHARACTER_NEXT ? "on, next" : "none"); errprint(" margin character distance: %1u\n", diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp index b71f27e0..7a0f46ce 100644 --- a/src/roff/troff/input.cpp +++ b/src/roff/troff/input.cpp @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2000-2011 +/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) @@ -155,9 +156,6 @@ static symbol get_delim_name(); static void init_registers(); static void trapping_blank_line(); -// this is for gcc 2.95 with old versions of libstdc++ -#define input_iterator my_input_iterator - class input_iterator; input_iterator *make_temp_iterator(const char *); const char *input_char_description(int); @@ -2358,10 +2356,6 @@ int token::delimiter(int err) return 1; } case TOKEN_NODE: - // the user doesn't know what a node is - if (err) - error("missing argument or invalid starting delimiter"); - return 0; case TOKEN_SPACE: case TOKEN_STRETCHABLE_SPACE: case TOKEN_UNSTRETCHABLE_SPACE: diff --git a/src/roff/troff/mtsm.cpp b/src/roff/troff/mtsm.cpp index f13a6be1..79e2f78f 100644 --- a/src/roff/troff/mtsm.cpp +++ b/src/roff/troff/mtsm.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 2003, 2004, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2009 Free Software Foundation, Inc. Written by Gaius Mulley (gaius@glam.ac.uk) This file is part of groff. @@ -479,24 +479,21 @@ void mtsm::flush(FILE *fp, statem *s, string tag_list) void statem::display_state() { fprintf(stderr, " <state "); - if (bool_values[MTSM_BR].is_known) { + if (bool_values[MTSM_BR].is_known) if (bool_values[MTSM_BR].value) fprintf(stderr, "[br]"); else fprintf(stderr, "[!br]"); - } - if (bool_values[MTSM_EOL].is_known) { + if (bool_values[MTSM_EOL].is_known) if (bool_values[MTSM_EOL].value) fprintf(stderr, "[eol]"); else fprintf(stderr, "[!eol]"); - } - if (int_values[MTSM_SP].is_known) { + if (int_values[MTSM_SP].is_known) if (int_values[MTSM_SP].value) fprintf(stderr, "[sp %d]", int_values[MTSM_SP].value); else fprintf(stderr, "[!sp]"); - } fprintf(stderr, ">"); fflush(stderr); } @@ -613,12 +610,12 @@ int state_set::is_in(int_value_state i) int state_set::is_in(units_value_state u) { - return (unitsset & (1 << (int)u)) != 0; + return (unitsset & (1 << (int)u) != 0); } int state_set::is_in(string_value_state s) { - return (stringset & (1 << (int)s)) != 0; + return (stringset & (1 << (int)s) != 0); } void state_set::add(units_value_state, int n) |