/[m4]/m4/m4/utility.c
ViewVC logotype

Diff of /m4/m4/utility.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11 by akim, Wed Sep 5 07:49:45 2001 UTC revision 1.12 by akim, Wed Sep 5 07:51:41 2001 UTC
# Line 112  m4_token_data_func_traced (m4_token_data Line 112  m4_token_data_func_traced (m4_token_data
112  boolean  boolean
113  m4_bad_argc (m4_token_data *name, int argc, int min, int max)  m4_bad_argc (m4_token_data *name, int argc, int min, int max)
114  {  {
   boolean isbad = FALSE;  
   
115    if (min > 0 && argc < min)    if (min > 0 && argc < min)
116      {      {
117        if (!suppress_warnings)        M4WARN ((warning_status, 0,
118          M4ERROR ((warning_status, 0,                 _("Warning: %s: too few arguments"),
119                    _("Warning: Too few arguments to builtin `%s'"),                 M4_TOKEN_DATA_TEXT (name)));
120                    M4_TOKEN_DATA_TEXT (name)));        return TRUE;
121        isbad = TRUE;      }
122      }  
123    else if (max > 0 && argc > max && !suppress_warnings)    if (max > 0 && argc > max)
124      M4ERROR ((warning_status, 0,      {
125                _("Warning: Excess arguments to builtin `%s' ignored"),        M4WARN ((warning_status, 0,
126                M4_TOKEN_DATA_TEXT (name)));                 _("Warning: %s: too many arguments (ignored)"),
127                   M4_TOKEN_DATA_TEXT (name)));
128          /* Return FALSE, otherwise it is not exactly `ignored'. */
129          return FALSE;
130        }
131    
132    return isbad;    return FALSE;
133  }  }
134    
135  const char *  const char *
# Line 149  m4_numeric_arg (m4_token_data *macro, co Line 151  m4_numeric_arg (m4_token_data *macro, co
151    if (*arg == 0 || (*valuep = strtol (m4_skip_space (arg), &endp, 10),    if (*arg == 0 || (*valuep = strtol (m4_skip_space (arg), &endp, 10),
152                      *m4_skip_space (endp) != 0))                      *m4_skip_space (endp) != 0))
153      {      {
154        M4ERROR ((warning_status, 0,        M4WARN ((warning_status, 0,
155                  _("Non-numeric argument to `%s': %s"),                 _("Warning: %s: non-numeric argument: %s"),
156                  M4_TOKEN_DATA_TEXT (macro), arg));                 M4_TOKEN_DATA_TEXT (macro), arg));
157        return FALSE;        return FALSE;
158      }      }
159    return TRUE;    return TRUE;
# Line 267  m4_dump_symbols (struct m4_dump_symbol_d Line 269  m4_dump_symbols (struct m4_dump_symbol_d
269            if (symbol != NULL && M4_SYMBOL_TYPE (symbol) != M4_TOKEN_VOID)            if (symbol != NULL && M4_SYMBOL_TYPE (symbol) != M4_TOKEN_VOID)
270              m4_dump_symbol (M4_TOKEN_DATA_TEXT (argv[i]), symbol, data);              m4_dump_symbol (M4_TOKEN_DATA_TEXT (argv[i]), symbol, data);
271            else if (complain)            else if (complain)
272              M4ERROR ((warning_status, 0,              M4WARN ((warning_status, 0,
273                        _("Undefined name %s"), M4_TOKEN_DATA_TEXT (argv[i])));                       _("Warning: %s: undefined name: %s"),
274                         M4ARG (0), M4ARG (i)));
275          }          }
276      }      }
277    

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26