source: git/src/readval.h @ d233de0

main
Last change on this file since d233de0 was e096a93, checked in by Olly Betts <olly@…>, 2 days ago

Reject some invalid Walls readings

Multi-component readings shouldn't allow a decimal point in anything but
the final component, and cavern now checks this.

Some examples of invalid readings which now give an error with cavern
are 12.5i3. 12.5:29, 12.5:29:30 and 12:29.5:30.

  • Property mode set to 100644
File size: 2.6 KB
RevLine 
[421b7d2]1/* readval.h
[0395657]2 * Routines to read a prefix or number from the current input file
[62be3ee]3 * Copyright (C) 1991-2025 Olly Betts
[846746e]4 *
[89231c4]5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
[846746e]9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
[89231c4]12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 * GNU General Public License for more details.
[846746e]14 *
[89231c4]15 * You should have received a copy of the GNU General Public License
[0b99107]16 * along with this program; if not, see
17 * <https://www.gnu.org/licenses/>.
[d1b1380]18 */
19
[c7c0f93]20#include "datain.h"
21
[c86cc71]22extern int root_depr_count;
23
[c458cf7]24enum {
[2cca7b87]25    /* Can the prefix be omitted?  If it is, read_prefix() returns NULL. */
[c458cf7]26    PFX_OPT = 1,
27    /* Read a survey? */
28    PFX_SURVEY = 2,
29    /* Make implicit checks */
30    PFX_SUSPECT_TYPO = 4,
31    /* Can the deprecated "root" be used? */
32    PFX_ALLOW_ROOT = 8,
[0fa7aac]33    /* Warn if the read prefix contains a separator? */
34    PFX_WARN_SEPARATOR = 16,
[710ecc1]35    /* Anonymous stations OK? */
36    PFX_ANON = 32,
[c458cf7]37    /* Read a station? */
38    PFX_STATION = 0
39};
40
41prefix *read_prefix(unsigned flags);
[2aa2f3f]42
[725d3b1]43// Read a sequence of NAMES characters.  Returns NULL if none.
[ae917b96]44// Caller is responsible for calling free() on the returned value.
[725d3b1]45char *read_walls_prefix(void);
46
[202e357]47prefix *read_walls_station(char * const walls_prefix[3],
48                           bool anon_allowed,
49                           bool *p_new);
[725d3b1]50
[e096a93]51// Like read_number() but reports if the number contains a decimal point or
52// not.
53//
54// pf_decimal_point can be NULL (but use read_numeric() instead if always
55// NULL).
56real read_number_or_int(bool f_optional, bool f_unsigned,
57                        bool *pf_decimal_point);
58
[725d3b1]59// Like read_numeric() but doesn't skipblanks() first and can be told to not
60// allow a sign.
[e096a93]61static inline real read_number(bool f_optional, bool f_unsigned)
62{
63    return read_number_or_int(f_optional, f_unsigned, NULL);
64}
[725d3b1]65
66real read_quadrant(bool f_optional);
67
[d3241e6]68real read_numeric(bool f_optional);
[61513b57]69real read_numeric_multi(bool f_optional, bool f_quadrants, int *p_n_readings);
[00b10c1]70real read_bearing_multi_or_omit(bool f_quadrants, int *p_n_readings);
[2aa2f3f]71
[f15c53d9]72/* Don't skip blanks; can specify diagnostic type and error code. */
73unsigned int read_uint_raw(int diag_type, int errmsg, const filepos *fp);
[c7c0f93]74
[0395657]75unsigned int read_uint(void);
[2aa2f3f]76
[5b9b9d4]77int read_int(int min_val, int max_val);
78
[0532954]79void read_string(string *pstr);
[950a829]80
[62be3ee]81bool read_string_warning(string *pstr);
82
[725d3b1]83void read_walls_srv_date(int *py, int *pm, int *pd);
Note: See TracBrowser for help on using the repository browser.