strgen/strgen.c
author peter1138
Sun, 01 Oct 2006 12:00:32 +0000
changeset 4694 c917a3ad0dd2
parent 4464 08e89a8faa09
child 4922 dec2c076d5a7
permissions -rw-r--r--
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
2186
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2107
diff changeset
     1
/* $Id$ */
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2107
diff changeset
     2
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     3
#include "../stdafx.h"
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
     4
#include "../macros.h"
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
     5
#include "../string.h"
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     6
#include <stdio.h>
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     7
#include <string.h>
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     8
#include <stdlib.h>
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     9
#include <stdarg.h>
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    10
2482
374f6395847d (svn r3008) [ 1247535 ] Native Support for Win64 (compile&run only) (michi_cc)
Darkvater
parents: 2459
diff changeset
    11
#if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    12
#include <unistd.h>
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    13
#endif
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    14
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    15
#if defined WIN32 || defined __WATCOMC__
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    16
#include <direct.h>
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    17
#endif /* WIN32 || __WATCOMC__ */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    18
181
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    19
#ifdef __MORPHOS__
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    20
#ifdef stderr
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    21
#undef stderr
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    22
#endif
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    23
#define stderr stdout
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    24
#endif /* __MORPHOS__ */
181
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
    25
3395
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    26
#ifdef __WATCOMC__
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    27
	uint _map_log_x;     // an unpleasant hack required because Watcom is insisting on
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    28
	uint _map_size_x;    // these variables being valid references in map.h
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    29
	uint _map_size_y;
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    30
	uint _map_tile_mask;
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    31
	uint _map_size;
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
    32
#endif /* __WATCOMC__ */
3395
edfd22fd92c9 (svn r4204) - Get trunk compiling again on OS/2
orudge
parents: 3342
diff changeset
    33
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    34
/* Compiles a list of strings into a compiled string list */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    35
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    36
typedef void (*ParseCmdProc)(char *buf, int value);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    37
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
    38
typedef struct LanguagePackHeader {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    39
	uint32 ident;
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    40
	uint32 version;     // 32-bits of auto generated version info which is basically a hash of strings.h
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    41
	char name[32];      // the international name of this language
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4379
diff changeset
    42
	char own_name[32];  // the localized name of this language
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    43
	char isocode[16];   // the ISO code for the language (not country code)
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    44
	uint16 offsets[32]; // the offsets
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    45
	byte plural_form;   // plural form index
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    46
	byte pad[3];        // pad header to be a multiple of 4
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    47
} LanguagePackHeader;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    48
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    49
typedef struct CmdStruct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    50
	const char *cmd;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    51
	ParseCmdProc proc;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    52
	long value;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    53
	int8 consumes;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    54
	byte flags;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    55
} CmdStruct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    56
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    57
enum {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    58
	C_DONTCOUNT = 1,
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    59
	C_CASE      = 2,
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    60
};
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    61
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    62
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    63
typedef struct Case {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    64
	int caseidx;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    65
	char *string;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    66
	struct Case *next;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    67
} Case;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    68
2586
1c0f0b67a70d (svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
Darkvater
parents: 2585
diff changeset
    69
static bool _masterlang;
2585
fa2f94aa9de2 (svn r3122) - Fix (regression): recent change to strgen which 'fixed' all strings with wrong plural forms. Thanks for glx for pointing this out (after I changed his original patch which was correct..whohoo braindeadness; here I come)
Darkvater
parents: 2566
diff changeset
    70
static bool _translated;
2459
a2f63b331830 (svn r2985) Print warnings and errors in the canonical file:line: form to make life for IDEs easier (ln-)
tron
parents: 2418
diff changeset
    71
static const char* _file = "(unknown file)";
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
    72
static int _cur_line;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    73
static int _errors, _warnings;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    74
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    75
typedef struct LangString {
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    76
	char *name;            // Name of the string
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    77
	char *english;         // English text
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    78
	char *translated;      // Translated text
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    79
	uint16 hash_next;      // next hash entry
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    80
	uint16 index;
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    81
	int line;              // line of string in source-file
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    82
	Case *english_case;    // cases for english
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
    83
	Case *translated_case; // cases for foreign
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    84
} LangString;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    85
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    86
static LangString *_strings[65536];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    87
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    88
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    89
#define HASH_SIZE 32767
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    90
static uint16 _hash_head[HASH_SIZE];
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    91
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    92
static byte _put_buf[4096];
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    93
static int _put_pos;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    94
static int _next_string_id;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    95
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
    96
static uint32 _hash;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
    97
static char _lang_name[32], _lang_ownname[32], _lang_isocode[16];
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
    98
static byte _lang_pluralform;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
    99
#define MAX_NUM_GENDER 8
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   100
static char _genders[MAX_NUM_GENDER][8];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   101
static int _numgenders;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   102
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   103
// contains the name of all cases.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   104
#define MAX_NUM_CASES 50
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   105
static char _cases[MAX_NUM_CASES][16];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   106
static int _numcases;
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   107
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   108
// for each plural value, this is the number of plural forms.
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4077
diff changeset
   109
static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4 };
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   110
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   111
static const char *_cur_ident;
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   112
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   113
typedef struct CmdPair {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   114
	const CmdStruct *a;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   115
	char *v;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   116
} CmdPair;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   117
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   118
typedef struct ParsedCommandStruct {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   119
	int np;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   120
	CmdPair pairs[32];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   121
	const CmdStruct *cmd[32]; // ordered by param #
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   122
} ParsedCommandStruct;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   123
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   124
// Used when generating some advanced commands.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   125
static ParsedCommandStruct _cur_pcs;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   126
static int _cur_argidx;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   127
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   128
static uint HashStr(const char *s)
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   129
{
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   130
	uint hash = 0;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   131
	for (; *s != '\0'; s++) hash = ROL(hash, 3) ^ *s;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   132
	return hash % HASH_SIZE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   133
}
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   134
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   135
static void HashAdd(const char *s, LangString *ls)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   136
{
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   137
	uint hash = HashStr(s);
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   138
	ls->hash_next = _hash_head[hash];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   139
	_hash_head[hash] = ls->index + 1;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   140
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   141
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   142
static LangString *HashFind(const char *s)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   143
{
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   144
	int idx = _hash_head[HashStr(s)];
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   145
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   146
	while (--idx >= 0) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   147
		LangString* ls = _strings[idx];
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   148
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   149
		if (strcmp(ls->name, s) == 0) return ls;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   150
		idx = ls->hash_next;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   151
	}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   152
	return NULL;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   153
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   154
3900
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   155
#ifdef _MSC_VER
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   156
# define LINE_NUM_FMT "(%d)"
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   157
#else
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   158
# define LINE_NUM_FMT ":%d"
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   159
#endif
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   160
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   161
static void CDECL Warning(const char *s, ...)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   162
{
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   163
	char buf[1024];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   164
	va_list va;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   165
	va_start(va, s);
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
   166
	vsnprintf(buf, lengthof(buf), s, va);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   167
	va_end(va);
4447
486395ec1e06 (svn r6225) -Codechange: change the warning/error format of strgen to show up
Darkvater
parents: 4434
diff changeset
   168
	fprintf(stderr, "%s" LINE_NUM_FMT ": warning: %s\n", _file, _cur_line, buf);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   169
	_warnings++;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   170
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   171
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   172
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   173
static void CDECL Error(const char *s, ...)
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   174
{
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   175
	char buf[1024];
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   176
	va_list va;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   177
	va_start(va, s);
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
   178
	vsnprintf(buf, lengthof(buf), s, va);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   179
	va_end(va);
4447
486395ec1e06 (svn r6225) -Codechange: change the warning/error format of strgen to show up
Darkvater
parents: 4434
diff changeset
   180
	fprintf(stderr, "%s" LINE_NUM_FMT ": error: %s\n", _file, _cur_line, buf);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   181
	_errors++;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   182
}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   183
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   184
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   185
static void NORETURN CDECL Fatal(const char *s, ...)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   186
{
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   187
	char buf[1024];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   188
	va_list va;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   189
	va_start(va, s);
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
   190
	vsnprintf(buf, lengthof(buf), s, va);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   191
	va_end(va);
3900
2c84ed52709d (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents: 3718
diff changeset
   192
	fprintf(stderr, "%s" LINE_NUM_FMT ": FATAL: %s\n", _file, _cur_line, buf);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   193
	exit(1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   194
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   195
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   196
static void PutByte(byte c)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   197
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   198
	if (_put_pos == lengthof(_put_buf)) Fatal("Put buffer too small");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   199
	_put_buf[_put_pos++] = c;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   200
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   201
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   202
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   203
static void EmitSingleByte(char *buf, int value)
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   204
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   205
	if (*buf != '\0') Warning("Ignoring trailing letters in command");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   206
	PutByte((byte)value);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   207
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   208
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   209
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   210
static void EmitEscapedByte(char *buf, int value)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   211
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   212
	if (*buf != '\0') Warning("Ignoring trailing letters in command");
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   213
	PutByte(0x85);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   214
	PutByte((byte)value);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   215
}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   216
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   217
static void EmitSetX(char *buf, int value)
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   218
{
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   219
	char *err;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   220
	int x = strtol(buf, &err, 0);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   221
	if (*err != 0) Fatal("SetX param invalid");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   222
	PutByte(1);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   223
	PutByte((byte)x);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   224
}
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   225
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   226
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   227
static void EmitSetXY(char *buf, int value)
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   228
{
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   229
	char *err;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   230
	int x;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   231
	int y;
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   232
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   233
	x = strtol(buf, &err, 0);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   234
	if (*err != ' ') Fatal("SetXY param invalid");
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   235
	y = strtol(err + 1, &err, 0);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   236
	if (*err != 0) Fatal("SetXY param invalid");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   237
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   238
	PutByte(2);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   239
	PutByte((byte)x);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   240
	PutByte((byte)y);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   241
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   242
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   243
// The plural specifier looks like
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   244
// {NUM} {PLURAL -1 passenger passengers} then it picks either passenger/passengers depending on the count in NUM
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   245
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   246
// This is encoded like
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   247
//  CommandByte <ARG#> <NUM> {Length of each string} {each string}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   248
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   249
bool ParseRelNum(char **buf, int *value)
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   250
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   251
	const char* s = *buf;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   252
	char* end;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   253
	bool rel = false;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   254
	int v;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   255
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   256
	while (*s == ' ' || *s == '\t') s++;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   257
	if (*s == '+') {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   258
		rel = true;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   259
		s++;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   260
	}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   261
	v = strtol(s, &end, 0);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   262
	if (end == s) return false;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   263
	if (rel || v < 0) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   264
		*value += v;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   265
	} else {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   266
		*value = v;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   267
	}
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   268
	*buf = end;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   269
	return true;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   270
}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   271
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   272
// Parse out the next word, or NULL
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   273
char *ParseWord(char **buf)
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   274
{
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   275
	char *s = *buf, *r;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   276
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   277
	while (*s == ' ' || *s == '\t') s++;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   278
	if (*s == '\0') return NULL;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   279
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   280
	if (*s == '"') {
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   281
		r = ++s;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   282
		// parse until next " or NUL
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   283
		for (;;) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   284
			if (*s == '\0') break;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   285
			if (*s == '"') {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   286
				*s++ = '\0';
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   287
				break;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   288
			}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   289
			s++;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   290
		}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   291
	} else {
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   292
		// proceed until whitespace or NUL
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   293
		r = s;
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   294
		for (;;) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   295
			if (*s == '\0') break;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   296
			if (*s == ' ' || *s == '\t') {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   297
				*s++ = '\0';
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   298
				break;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   299
			}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   300
			s++;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   301
		}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   302
	}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   303
	*buf = s;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   304
	return r;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   305
}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   306
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   307
// Forward declaration
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   308
static int TranslateArgumentIdx(int arg);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   309
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   310
static void EmitWordList(const char* const* words, uint nw)
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   311
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   312
	uint i;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   313
	uint j;
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   314
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   315
	PutByte(nw);
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   316
	for (i = 0; i < nw; i++) PutByte(strlen(words[i]));
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   317
	for (i = 0; i < nw; i++) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   318
		for (j = 0; words[i][j] != '\0'; j++) PutByte(words[i][j]);
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   319
	}
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   320
}
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   321
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   322
static void EmitPlural(char *buf, int value)
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   323
{
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   324
	int argidx = _cur_argidx;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   325
	const char* words[5];
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   326
	int nw = 0;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   327
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   328
	// Parse out the number, if one exists. Otherwise default to prev arg.
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   329
	if (!ParseRelNum(&buf, &argidx)) argidx--;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   330
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   331
	// Parse each string
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   332
	for (nw = 0; nw < 5; nw++) {
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   333
		words[nw] = ParseWord(&buf);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   334
		if (words[nw] == NULL) break;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   335
	}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   336
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   337
	if (nw == 0)
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   338
		Fatal("%s: No plural words", _cur_ident);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   339
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   340
	if (_plural_form_counts[_lang_pluralform] != nw) {
2585
fa2f94aa9de2 (svn r3122) - Fix (regression): recent change to strgen which 'fixed' all strings with wrong plural forms. Thanks for glx for pointing this out (after I changed his original patch which was correct..whohoo braindeadness; here I come)
Darkvater
parents: 2566
diff changeset
   341
		if (_translated) {
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   342
			Fatal("%s: Invalid number of plural forms. Expecting %d, found %d.", _cur_ident,
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   343
				_plural_form_counts[_lang_pluralform], nw);
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   344
		} else {
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   345
			Warning("'%s' is untranslated. Tweaking english string to allow compilation for plural forms", _cur_ident);
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   346
			if (nw > _plural_form_counts[_lang_pluralform]) {
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   347
				nw = _plural_form_counts[_lang_pluralform];
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   348
			} else {
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   349
				for (; nw < _plural_form_counts[_lang_pluralform]; nw++) {
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   350
					words[nw] = words[nw - 1];
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   351
				}
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   352
			}
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   353
		}
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   354
	}
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   355
2410
795225af3c72 (svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents: 2407
diff changeset
   356
	PutByte(0x8D);
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   357
	PutByte(TranslateArgumentIdx(argidx));
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   358
	EmitWordList(words, nw);
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   359
}
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   360
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   361
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   362
static void EmitGender(char *buf, int value)
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   363
{
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   364
	int argidx = _cur_argidx;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   365
	uint nw;
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   366
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   367
	if (buf[0] == '=') {
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   368
		buf++;
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   369
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   370
		// This is a {G=DER} command
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   371
		for (nw = 0; ; nw++) {
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   372
			if (nw >= 8) Fatal("G argument '%s' invalid", buf);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   373
			if (strcmp(buf, _genders[nw]) == 0) break;
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   374
		}
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   375
		// now nw contains the gender index
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   376
		PutByte(0x87);
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   377
		PutByte(nw);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   378
	} else {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   379
		const char* words[8];
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   380
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   381
		// This is a {G 0 foo bar two} command.
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   382
		// If no relative number exists, default to +0
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   383
		if (!ParseRelNum(&buf, &argidx)) {}
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   384
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   385
		for (nw = 0; nw < 8; nw++) {
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   386
			words[nw] = ParseWord(&buf);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   387
			if (words[nw] == NULL) break;
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   388
		}
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   389
		if (nw != _numgenders) Fatal("Bad # of arguments for gender command");
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   390
		PutByte(0x85);
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   391
		PutByte(13);
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   392
		PutByte(TranslateArgumentIdx(argidx));
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   393
		EmitWordList(words, nw);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   394
	}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   395
}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   396
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   397
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   398
static const CmdStruct _cmd_structs[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   399
	// Update position
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   400
	{"SETX",  EmitSetX,  1, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   401
	{"SETXY", EmitSetXY, 2, 0, 0},
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   402
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   403
	// Font size
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   404
	{"TINYFONT", EmitSingleByte, 8, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   405
	{"BIGFONT",  EmitSingleByte, 9, 0, 0},
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   406
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   407
	// Colors
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   408
	{"BLUE",    EmitSingleByte, 15, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   409
	{"SILVER",  EmitSingleByte, 16, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   410
	{"GOLD",    EmitSingleByte, 17, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   411
	{"RED",     EmitSingleByte, 18, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   412
	{"PURPLE",  EmitSingleByte, 19, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   413
	{"LTBROWN", EmitSingleByte, 20, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   414
	{"ORANGE",  EmitSingleByte, 21, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   415
	{"GREEN",   EmitSingleByte, 22, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   416
	{"YELLOW",  EmitSingleByte, 23, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   417
	{"DKGREEN", EmitSingleByte, 24, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   418
	{"CREAM",   EmitSingleByte, 25, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   419
	{"BROWN",   EmitSingleByte, 26, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   420
	{"WHITE",   EmitSingleByte, 27, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   421
	{"LTBLUE",  EmitSingleByte, 28, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   422
	{"GRAY",    EmitSingleByte, 29, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   423
	{"DKBLUE",  EmitSingleByte, 30, 0, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   424
	{"BLACK",   EmitSingleByte, 31, 0, 0},
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
   425
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   426
	{"CURRCOMPACT",   EmitEscapedByte, 0, 1, 0}, // compact currency (32 bits)
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   427
	{"REV",           EmitEscapedByte, 2, 0, 0}, // openttd revision string
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   428
	{"SHORTCARGO",    EmitEscapedByte, 3, 2, 0}, // short cargo description, only ### tons, or ### litres
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   429
	{"CURRCOMPACT64", EmitEscapedByte, 4, 2, 0}, // compact currency 64 bits
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   430
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   431
	// These are special versions of {STRING1}
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   432
	// The first string includes the second string.
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   433
	{"COMPANY",    EmitEscapedByte, 5, 1, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   434
	{"PLAYERNAME", EmitEscapedByte, 5, 1, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   435
	{"VEHICLE",    EmitEscapedByte, 5, 1, 0},
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   436
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   437
	{"STRING1", EmitEscapedByte, 5, 1, C_CASE}, // included string that consumes ONE argument
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   438
	{"STRING2", EmitEscapedByte, 6, 2, C_CASE}, // included string that consumes TWO arguments
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   439
	{"STRING3", EmitEscapedByte, 7, 3, C_CASE}, // included string that consumes THREE arguments
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   440
	{"STRING4", EmitEscapedByte, 8, 4, C_CASE}, // included string that consumes FOUR arguments
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   441
	{"STRING5", EmitEscapedByte, 9, 5, C_CASE}, // included string that consumes FIVE arguments
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   442
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   443
	{"STATIONFEATURES", EmitEscapedByte, 10, 1, 0}, // station features string, icons of the features
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   444
	{"INDUSTRY",        EmitEscapedByte, 11, 1, 0}, // industry, takes an industry #
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   445
	{"VOLUME",          EmitEscapedByte, 12, 1, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   446
	{"DATE_TINY",       EmitEscapedByte, 14, 1, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   447
	{"CARGO",           EmitEscapedByte, 15, 2, 0},
3342
cb9b5c6dd74c (svn r4126) - Feature: A new multi-lingual multi-measuring-unit system:
peter1138
parents: 3015
diff changeset
   448
	{"POWER",           EmitEscapedByte, 16, 1, 0},
cb9b5c6dd74c (svn r4126) - Feature: A new multi-lingual multi-measuring-unit system:
peter1138
parents: 3015
diff changeset
   449
	{"VOLUME_S",        EmitEscapedByte, 17, 1, 0},
cb9b5c6dd74c (svn r4126) - Feature: A new multi-lingual multi-measuring-unit system:
peter1138
parents: 3015
diff changeset
   450
	{"WEIGHT",          EmitEscapedByte, 18, 1, 0},
cb9b5c6dd74c (svn r4126) - Feature: A new multi-lingual multi-measuring-unit system:
peter1138
parents: 3015
diff changeset
   451
	{"WEIGHT_S",        EmitEscapedByte, 19, 1, 0},
3489
497361c60b90 (svn r4340) Add force {FORCE} to the units system. This is currently unused.
peter1138
parents: 3395
diff changeset
   452
	{"FORCE",           EmitEscapedByte, 20, 1, 0},
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   453
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4379
diff changeset
   454
	{"P", EmitPlural, 0, 0, C_DONTCOUNT}, // plural specifier
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4379
diff changeset
   455
	{"G", EmitGender, 0, 0, C_DONTCOUNT}, // gender specifier
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   456
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   457
	{"DATE_LONG",  EmitSingleByte, 0x82, 1, 0},
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   458
	{"DATE_SHORT", EmitSingleByte, 0x83, 1, 0},
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   459
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   460
	{"VELOCITY", EmitSingleByte, 0x84, 1, 0},
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   461
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   462
	// 0x85 is the marker for escaped commands
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   463
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   464
	{"SKIP", EmitSingleByte, 0x86, 1, 0},
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   465
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   466
	{"STRING", EmitSingleByte, 0x88, 1, C_CASE},
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   467
2410
795225af3c72 (svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents: 2407
diff changeset
   468
	// Numbers
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   469
	{"COMMA", EmitSingleByte, 0x8B, 1, 0}, // Number with comma
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   470
	{"NUM",   EmitSingleByte, 0x8E, 1, 0}, // Signed number
2410
795225af3c72 (svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents: 2407
diff changeset
   471
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   472
	{"CURRENCY",   EmitSingleByte, 0x8F, 1, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   473
	{"CURRENCY64", EmitSingleByte, 0x9C, 2, 0},
2410
795225af3c72 (svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents: 2407
diff changeset
   474
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   475
	{"WAYPOINT", EmitSingleByte, 0x99, 1, 0}, // waypoint name
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   476
	{"STATION",  EmitSingleByte, 0x9A, 1, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   477
	{"TOWN",     EmitSingleByte, 0x9B, 1, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   478
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   479
	// 0x9D is used for the pseudo command SETCASE
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   480
	// 0x9E is used for case switching
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   481
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   482
	{"",               EmitSingleByte, '\n', 0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   483
	{"{",              EmitSingleByte, '{',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   484
	{"UPARROW",        EmitSingleByte, 0x80, 0, 0},
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   485
	{"SMALLUPARROW",   EmitSingleByte, 0x90, 0, 0},
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   486
	{"SMALLDOWNARROW", EmitSingleByte, 0x91, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   487
	{"TRAIN",          EmitSingleByte, 0x94, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   488
	{"LORRY",          EmitSingleByte, 0x95, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   489
	{"BUS",            EmitSingleByte, 0x96, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   490
	{"PLANE",          EmitSingleByte, 0x97, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   491
	{"SHIP",           EmitSingleByte, 0x98, 0, 0},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   492
	{"NBSP",           EmitSingleByte, 0xA0, 0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   493
	{"CENT",           EmitSingleByte, '¢',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   494
	{"POUNDSIGN",      EmitSingleByte, '£',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   495
	{"EURO",           EmitSingleByte, '¤',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   496
	{"YENSIGN",        EmitSingleByte, '¥',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   497
	{"COPYRIGHT",      EmitSingleByte, '©',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   498
	{"DOWNARROW",      EmitSingleByte, 0xAA, 0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   499
	{"CHECKMARK",      EmitSingleByte, 0xAC, 0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   500
	{"CROSS",          EmitSingleByte, 0xAD, 0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   501
	{"REGISTERED",     EmitSingleByte, '®',  0, C_DONTCOUNT},
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   502
	{"RIGHTARROW",     EmitSingleByte, 0xAF, 0, C_DONTCOUNT},
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   503
};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   504
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   505
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   506
static const CmdStruct *FindCmd(const char *s, int len)
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   507
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   508
	const CmdStruct* cs;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   509
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   510
	for (cs = _cmd_structs; cs != endof(_cmd_structs); cs++) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   511
		if (strncmp(cs->cmd, s, len) == 0 && cs->cmd[len] == '\0') return cs;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   512
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   513
	return NULL;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   514
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   515
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   516
static uint ResolveCaseName(const char *str, uint len)
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   517
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   518
	uint i;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   519
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   520
	for (i = 0; i < MAX_NUM_CASES; i++) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   521
		if (memcmp(_cases[i], str, len) == 0 && _cases[i][len] == 0) return i + 1;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   522
	}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   523
	Fatal("Invalid case-name '%s'", str);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   524
}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   525
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   526
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   527
// returns NULL on eof
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   528
// else returns command struct
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   529
static const CmdStruct *ParseCommandString(const char **str, char *param, int *argno, int *casei)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   530
{
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   531
	const char *s = *str, *start;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   532
	const CmdStruct *cmd;
2060
9f3855e81f4b (svn r2569) Get rid of some dubious casts and thus warnings on 64bit machines
tron
parents: 2059
diff changeset
   533
	byte c;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   534
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   535
	*argno = -1;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   536
	*casei = -1;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   537
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   538
	// Scan to the next command, exit if there's no next command.
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   539
	for (; *s != '{'; s++) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   540
		if (*s == '\0') return NULL;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   541
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   542
	s++; // Skip past the {
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   543
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   544
	if (*s >= '0' && *s <= '9') {
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   545
		char *end;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   546
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   547
		*argno = strtoul(s, &end, 0);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   548
		if (*end != ':') Fatal("missing arg #");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   549
		s = end + 1;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   550
	}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   551
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   552
	// parse command name
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   553
	start = s;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   554
	do {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   555
		c = *s++;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   556
	} while (c != '}' && c != ' ' && c != '=' && c != '.' && c != 0);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   557
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   558
	cmd = FindCmd(start, s - start - 1);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   559
	if (cmd == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   560
		Error("Undefined command '%.*s'", s - start - 1, start);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   561
		return NULL;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   562
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   563
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   564
	if (c == '.') {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   565
		const char *casep = s;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   566
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   567
		if (!(cmd->flags & C_CASE))
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   568
			Fatal("Command '%s' can't have a case", cmd->cmd);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   569
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   570
		do c = *s++; while (c != '}' && c != ' ' && c != '\0');
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   571
		*casei = ResolveCaseName(casep, s - casep - 1);
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   572
	}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   573
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   574
	if (c == '\0') {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   575
		Error("Missing } from command '%s'", start);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   576
		return NULL;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   577
	}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   578
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   579
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   580
	if (c != '}') {
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   581
		if (c == '=') s--;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   582
		// copy params
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   583
		start = s;
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   584
		for (;;) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   585
			c = *s++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   586
			if (c == '}') break;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   587
			if (c == '\0') {
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   588
				Error("Missing } from command '%s'", start);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   589
				return NULL;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   590
			}
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   591
			if (s - start == 250) Fatal("param command too long");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   592
			*param++ = c;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   593
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   594
	}
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   595
	*param = '\0';
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   596
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   597
	*str = s;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   598
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   599
	return cmd;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   600
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   601
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   602
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   603
static void HandlePragma(char *str)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   604
{
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   605
	if (!memcmp(str, "id ", 3)) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   606
		_next_string_id = strtoul(str + 3, NULL, 0);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   607
	} else if (!memcmp(str, "name ", 5)) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   608
		ttd_strlcpy(_lang_name, str + 5, sizeof(_lang_name));
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   609
	} else if (!memcmp(str, "ownname ", 8)) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   610
		ttd_strlcpy(_lang_ownname, str + 8, sizeof(_lang_ownname));
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   611
	} else if (!memcmp(str, "isocode ", 8)) {
1376
d4e1dd8eb7e5 (svn r1880) [Codechange] Added isocodes to langfiles and support code to strgen (Lauri Nurmi)
miham
parents: 1097
diff changeset
   612
		ttd_strlcpy(_lang_isocode, str + 8, sizeof(_lang_isocode));
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   613
	} else if (!memcmp(str, "plural ", 7)) {
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   614
		_lang_pluralform = atoi(str + 7);
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   615
		if (_lang_pluralform >= lengthof(_plural_form_counts))
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
   616
			Fatal("Invalid pluralform %d", _lang_pluralform);
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   617
	} else if (!memcmp(str, "gender ", 7)) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   618
		char* buf = str + 7;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   619
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   620
		for (;;) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   621
			const char* s = ParseWord(&buf);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   622
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   623
			if (s == NULL) break;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   624
			if (_numgenders >= MAX_NUM_GENDER) Fatal("Too many genders, max %d", MAX_NUM_GENDER);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   625
			ttd_strlcpy(_genders[_numgenders], s, sizeof(_genders[_numgenders]));
2084
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   626
			_numgenders++;
65639f898a50 (svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents: 2082
diff changeset
   627
		}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   628
	} else if (!memcmp(str, "case ", 5)) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   629
		char* buf = str + 5;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   630
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   631
		for (;;) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   632
			const char* s = ParseWord(&buf);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   633
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   634
			if (s == NULL) break;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   635
			if (_numcases >= MAX_NUM_CASES) Fatal("Too many cases, max %d", MAX_NUM_CASES);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   636
			ttd_strlcpy(_cases[_numcases], s, sizeof(_cases[_numcases]));
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   637
			_numcases++;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   638
		}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   639
	} else {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   640
		Fatal("unknown pragma '%s'", str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   641
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   642
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   643
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   644
static void ExtractCommandString(ParsedCommandStruct* p, const char* s, bool warnings)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   645
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   646
	char param[100];
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   647
	int argno;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   648
	int argidx = 0;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   649
	int casei;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   650
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   651
	memset(p, 0, sizeof(*p));
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   652
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   653
	for (;;) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   654
		// read until next command from a.
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   655
		const CmdStruct* ar = ParseCommandString(&s, param, &argno, &casei);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   656
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   657
		if (ar == NULL) break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   658
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   659
		// Sanity checking
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   660
		if (argno != -1 && ar->consumes == 0) Fatal("Non consumer param can't have a paramindex");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   661
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   662
		if (ar->consumes) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   663
			if (argno != -1) argidx = argno;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   664
			if (argidx < 0 || argidx >= lengthof(p->cmd)) Fatal("invalid param idx %d", argidx);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   665
			if (p->cmd[argidx] != NULL && p->cmd[argidx] != ar) Fatal("duplicate param idx %d", argidx);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   666
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   667
			p->cmd[argidx++] = ar;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   668
		} else if (!(ar->flags & C_DONTCOUNT)) { // Ignore some of them
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   669
			if (p->np >= lengthof(p->pairs)) Fatal("too many commands in string, max %d", lengthof(p->pairs));
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   670
			p->pairs[p->np].a = ar;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   671
			p->pairs[p->np].v = param[0] != '\0' ? strdup(param) : "";
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   672
			p->np++;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   673
		}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   674
	}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   675
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   676
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   677
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   678
static const CmdStruct *TranslateCmdForCompare(const CmdStruct *a)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   679
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   680
	if (a == NULL) return NULL;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   681
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   682
	if (strcmp(a->cmd, "STRING1") == 0 ||
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   683
			strcmp(a->cmd, "STRING2") == 0 ||
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   684
			strcmp(a->cmd, "STRING3") == 0 ||
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   685
			strcmp(a->cmd, "STRING4") == 0 ||
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   686
			strcmp(a->cmd, "STRING5") == 0) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   687
		return FindCmd("STRING", 6);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   688
	}
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   689
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   690
	if (strcmp(a->cmd, "SKIP") == 0) return NULL;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   691
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   692
	return a;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   693
}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   694
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   695
2069
30294fb11fc1 (svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents: 2063
diff changeset
   696
static bool CheckCommandsMatch(char *a, char *b, const char *name)
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   697
{
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   698
	ParsedCommandStruct templ;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   699
	ParsedCommandStruct lang;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   700
	int i,j;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   701
	bool result = true;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   702
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   703
	ExtractCommandString(&templ, b, true);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   704
	ExtractCommandString(&lang, a, true);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   705
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   706
	// For each string in templ, see if we find it in lang
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   707
	if (templ.np != lang.np) {
2069
30294fb11fc1 (svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents: 2063
diff changeset
   708
		Warning("%s: template string and language string have a different # of commands", name);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   709
		result = false;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   710
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   711
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   712
	for (i = 0; i < templ.np; i++) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   713
		// see if we find it in lang, and zero it out
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   714
		bool found = false;
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   715
		for (j = 0; j < lang.np; j++) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   716
			if (templ.pairs[i].a == lang.pairs[j].a &&
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   717
					strcmp(templ.pairs[i].v, lang.pairs[j].v) == 0) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   718
				// it was found in both. zero it out from lang so we don't find it again
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   719
				lang.pairs[j].a = NULL;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   720
				found = true;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   721
				break;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   722
			}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   723
		}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   724
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   725
		if (!found) {
2069
30294fb11fc1 (svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents: 2063
diff changeset
   726
			Warning("%s: command '%s' exists in template file but not in language file", name, templ.pairs[i].a->cmd);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   727
			result = false;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   728
		}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   729
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   730
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   731
	// if we reach here, all non consumer commands match up.
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   732
	// Check if the non consumer commands match up also.
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
   733
	for (i = 0; i < lengthof(templ.cmd); i++) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   734
		if (TranslateCmdForCompare(templ.cmd[i]) != TranslateCmdForCompare(lang.cmd[i])) {
2069
30294fb11fc1 (svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents: 2063
diff changeset
   735
			Warning("%s: Param idx #%d '%s' doesn't match with template command '%s'", name, i,
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   736
				lang.cmd[i]  == NULL ? "<empty>" : lang.cmd[i]->cmd,
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   737
				templ.cmd[i] == NULL ? "<empty>" : templ.cmd[i]->cmd);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   738
			result = false;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   739
		}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   740
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   741
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   742
	return result;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   743
}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   744
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   745
static void HandleString(char *str, bool master)
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   746
{
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   747
	char *s,*t;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   748
	LangString *ent;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   749
	char *casep;
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
   750
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   751
	if (*str == '#') {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   752
		if (str[1] == '#' && str[2] != '#') HandlePragma(str + 2);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   753
		return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   754
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   755
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   756
	// Ignore comments & blank lines
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   757
	if (*str == ';' || *str == ' ' || *str == '\0') return;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   758
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   759
	s = strchr(str, ':');
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   760
	if (s == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   761
		Error("Line has no ':' delimiter");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   762
		return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   763
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   764
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   765
	// Trim spaces.
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   766
	// After this str points to the command name, and s points to the command contents
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   767
	for (t = s; t > str && (t[-1] == ' ' || t[-1] == '\t'); t--);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   768
	*t = 0;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   769
	s++;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   770
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   771
	// Check if the string has a case..
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   772
	// The syntax for cases is IDENTNAME.case
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   773
	casep = strchr(str, '.');
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   774
	if (casep) *casep++ = 0;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   775
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   776
	// Check if this string already exists..
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   777
	ent = HashFind(str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   778
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   779
	if (master) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   780
		if (ent != NULL && casep == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   781
			Error("String name '%s' is used multiple times", str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   782
			return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   783
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   784
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   785
		if (ent == NULL && casep != NULL) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   786
			Error("Base string name '%s' doesn't exist yet. Define it before defining a case.", str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   787
			return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   788
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   789
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   790
		if (ent == NULL) {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   791
			if (_strings[_next_string_id]) {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   792
				Error("String ID 0x%X for '%s' already in use by '%s'", ent, str, _strings[_next_string_id]->name);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   793
				return;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   794
			}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   795
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   796
			// Allocate a new LangString
3718
7e99107bbe2f (svn r4689) - Codechange: correct parameter order or calloc, and use the sizeof the variable rather than a struct
peter1138
parents: 3489
diff changeset
   797
			ent = calloc(1, sizeof(*ent));
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   798
			_strings[_next_string_id] = ent;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   799
			ent->index = _next_string_id++;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   800
			ent->name = strdup(str);
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
   801
			ent->line = _cur_line;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   802
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   803
			HashAdd(str, ent);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   804
		}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   805
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   806
		if (casep != NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   807
			Case* c = malloc(sizeof(*c));
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   808
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   809
			c->caseidx = ResolveCaseName(casep, strlen(casep));
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   810
			c->string = strdup(s);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   811
			c->next = ent->english_case;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   812
			ent->english_case = c;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   813
		} else {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   814
			ent->english = strdup(s);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   815
		}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   816
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   817
	} else {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   818
		if (ent == NULL) {
2069
30294fb11fc1 (svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents: 2063
diff changeset
   819
			Warning("String name '%s' does not exist in master file", str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   820
			return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   821
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   822
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   823
		if (ent->translated && casep == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   824
			Error("String name '%s' is used multiple times", str);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   825
			return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   826
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   827
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   828
		if (s[0] == ':' && s[1] == '\0' && casep == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   829
			// Special syntax :: means we should just inherit the master string
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   830
			ent->translated = strdup(ent->english);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   831
		} else {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   832
			// make sure that the commands match
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   833
			if (!CheckCommandsMatch(s, ent->english, str)) return;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   834
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   835
			if (casep != NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   836
				Case* c = malloc(sizeof(*c));
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   837
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   838
				c->caseidx = ResolveCaseName(casep, strlen(casep));
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   839
				c->string = strdup(s);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   840
				c->next = ent->translated_case;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   841
				ent->translated_case = c;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   842
			} else {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   843
				ent->translated = strdup(s);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   844
			}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   845
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   846
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   847
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   848
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   849
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   850
static void rstrip(char *buf)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   851
{
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   852
	int i = strlen(buf);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   853
	while (i > 0 && (buf[i - 1] == '\r' || buf[i - 1] == '\n' || buf[i - 1] == ' ')) i--;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   854
	buf[i] = '\0';
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   855
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   856
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   857
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   858
static void ParseFile(const char *file, bool english)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   859
{
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   860
	FILE *in;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   861
	char buf[2048];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   862
2459
a2f63b331830 (svn r2985) Print warnings and errors in the canonical file:line: form to make life for IDEs easier (ln-)
tron
parents: 2418
diff changeset
   863
	_file = file;
a2f63b331830 (svn r2985) Print warnings and errors in the canonical file:line: form to make life for IDEs easier (ln-)
tron
parents: 2418
diff changeset
   864
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   865
	// For each new file we parse, reset the genders.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   866
	_numgenders = 0;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   867
	// TODO:!! We can't reset the cases. In case the translated strings
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   868
	// derive some strings from english....
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   869
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   870
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   871
	in = fopen(file, "r");
2459
a2f63b331830 (svn r2985) Print warnings and errors in the canonical file:line: form to make life for IDEs easier (ln-)
tron
parents: 2418
diff changeset
   872
	if (in == NULL) Fatal("Cannot open file");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   873
	_cur_line = 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   874
	while (fgets(buf, sizeof(buf),in) != NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   875
		rstrip(buf);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   876
		HandleString(buf, english);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   877
		_cur_line++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   878
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   879
	fclose(in);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   880
}
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   881
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   882
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   883
static uint32 MyHashStr(uint32 hash, const char *s)
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   884
{
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   885
	for (; *s != '\0'; s++) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   886
		hash = ROL(hash, 3) ^ *s;
4077
d4d440dd8925 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents: 3900
diff changeset
   887
		hash = (hash & 1 ? hash >> 1 ^ 0xDEADBEEF : hash >> 1);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   888
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   889
	return hash;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   890
}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   891
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   892
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   893
// make a hash of the file to get a unique "version number"
2765
8fa792b6e525 (svn r3310) Fix a couple of warnings: Initialise all struct members, disambiguate cascaded if/else, remove an unused variable, use (void) for empty parameter lists
tron
parents: 2586
diff changeset
   894
static void MakeHashOfStrings(void)
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   895
{
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   896
	uint32 hash = 0;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   897
	uint i;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   898
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   899
	for (i = 0; i != lengthof(_strings); i++) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   900
		const LangString* ls = _strings[i];
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   901
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   902
		if (ls != NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   903
			const CmdStruct* cs;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   904
			const char* s;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   905
			char buf[256];
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   906
			int argno;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   907
			int casei;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   908
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   909
			s = ls->name;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   910
			hash ^= i * 0x717239;
4077
d4d440dd8925 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents: 3900
diff changeset
   911
			hash = (hash & 1 ? hash >> 1 ^ 0xDEADBEEF : hash >> 1);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   912
			hash = MyHashStr(hash, s + 1);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   913
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   914
			s = ls->english;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   915
			while ((cs = ParseCommandString(&s, buf, &argno, &casei)) != NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   916
				if (cs->flags & C_DONTCOUNT) continue;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
   917
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   918
				hash ^= (cs - _cmd_structs) * 0x1234567;
4077
d4d440dd8925 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents: 3900
diff changeset
   919
				hash = (hash & 1 ? hash >> 1 ^ 0xF00BAA4 : hash >> 1);
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
   920
			}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   921
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   922
	}
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   923
	_hash = hash;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   924
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   925
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   926
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   927
static uint CountInUse(uint grp)
2059
6446d0b23ddc (svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents: 2057
diff changeset
   928
{
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   929
	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   930
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   931
	for (i = 0x800; --i >= 0;) if (_strings[(grp << 11) + i] != NULL) break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   932
	return i + 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   933
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   934
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   935
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   936
bool CompareFiles(const char *n1, const char *n2)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   937
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   938
	FILE *f1, *f2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   939
	char b1[4096];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   940
	char b2[4096];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   941
	size_t l1, l2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   942
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   943
	f2 = fopen(n2, "rb");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   944
	if (f2 == NULL) return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   945
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   946
	f1 = fopen(n1, "rb");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   947
	if (f1 == NULL) Fatal("can't open %s", n1);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   948
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   949
	do {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   950
		l1 = fread(b1, 1, sizeof(b1), f1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   951
		l2 = fread(b2, 1, sizeof(b2), f2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   952
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   953
		if (l1 != l2 || memcmp(b1, b2, l1)) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   954
			fclose(f2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   955
			fclose(f1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   956
			return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   957
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   958
	} while (l1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   959
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   960
	fclose(f2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   961
	fclose(f1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   962
	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   963
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   964
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   965
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
   966
static void WriteStringsH(const char *filename)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   967
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   968
	FILE *out;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   969
	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   970
	int next = -1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   971
	int lastgrp;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   972
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   973
	out = fopen("tmp.xxx", "w");
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   974
	if (out == NULL) Fatal("can't open tmp.xxx");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   975
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   976
	fprintf(out, "enum {");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   977
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   978
	lastgrp = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   979
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   980
	for (i = 0; i != lengthof(_strings); i++) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   981
		if (_strings[i] != NULL) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   982
			if (lastgrp != (i >> 11)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   983
				lastgrp = (i >> 11);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   984
				fprintf(out, "};\n\nenum {");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   985
			}
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
   986
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   987
			fprintf(out, next == i ? "\t%s,\n" : "\n\t%s = 0x%X,\n", _strings[i]->name, i);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   988
			next = i + 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   989
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   990
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   991
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   992
	fprintf(out, "};\n");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   993
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
   994
	fprintf(out,
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   995
		"\nenum {\n"
181
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
   996
		"\tLANGUAGE_PACK_IDENT = 0x474E414C, // Big Endian value for 'LANG' (LE is 0x 4C 41 4E 47)\n"
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   997
		"\tLANGUAGE_PACK_VERSION = 0x%X,\n"
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   998
		"};\n", (uint)_hash
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
   999
	);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1000
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1001
	fclose(out);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1002
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1003
	if (CompareFiles("tmp.xxx", filename)) {
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1004
		// files are equal. tmp.xxx is not needed
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1005
		unlink("tmp.xxx");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1006
	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1007
		// else rename tmp.xxx into filename
2482
374f6395847d (svn r3008) [ 1247535 ] Native Support for Win64 (compile&run only) (michi_cc)
Darkvater
parents: 2459
diff changeset
  1008
#if defined(WIN32) || defined(WIN64)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1009
		unlink(filename);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1010
#endif
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1011
		if (rename("tmp.xxx", filename) == -1) Fatal("rename() failed");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1012
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1013
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1014
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1015
static int TranslateArgumentIdx(int argidx)
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1016
{
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1017
	int i, sum;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1018
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1019
	if (argidx < 0 || argidx >= lengthof(_cur_pcs.cmd))
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1020
		Fatal("invalid argidx %d", argidx);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1021
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
  1022
	for (i = sum = 0; i < argidx; i++) {
2374
e4443eab6293 (svn r2900) Fix a bug, which incremented the counter of a loop twice and therefore calculated wrong argument indices
tron
parents: 2353
diff changeset
  1023
		const CmdStruct *cs = _cur_pcs.cmd[i];
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1024
		sum += (cs != NULL) ? cs->consumes : 1;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1025
	}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1026
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1027
	return sum;
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1028
}
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1029
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1030
static void PutArgidxCommand(void)
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1031
{
2410
795225af3c72 (svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents: 2407
diff changeset
  1032
	PutByte(0x8C);
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1033
	PutByte(TranslateArgumentIdx(_cur_argidx));
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1034
}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1035
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1036
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1037
static void PutCommandString(const char *str)
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1038
{
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1039
	const CmdStruct *cs;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1040
	char param[256];
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1041
	int argno;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1042
	int casei;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1043
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1044
	_cur_argidx = 0;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1045
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1046
	while (*str != '\0') {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1047
		// Process characters as they are until we encounter a {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1048
		if (*str != '{') {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1049
			PutByte(*str++);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1050
			continue;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1051
		}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1052
		cs = ParseCommandString(&str, param, &argno, &casei);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1053
		if (cs == NULL) break;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1054
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1055
		if (casei != -1) {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1056
			PutByte(0x9D); // {SETCASE}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1057
			PutByte(casei);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1058
		}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1059
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1060
		// For params that consume values, we need to handle the argindex properly
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1061
		if (cs->consumes > 0) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1062
			// Check if we need to output a move-param command
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1063
			if (argno != -1 && argno != _cur_argidx) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1064
				_cur_argidx = argno;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1065
				PutArgidxCommand();
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1066
			}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1067
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1068
			// Output the one from the master string... it's always accurate.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1069
			cs = _cur_pcs.cmd[_cur_argidx++];
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1070
			if (cs == NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1071
				Fatal("%s: No argument exists at position %d", _cur_ident, _cur_argidx - 1);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1072
			}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1073
		}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1074
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1075
		cs->proc(param, cs->value);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1076
	}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1077
}
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1078
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1079
static void WriteLength(FILE *f, uint length)
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1080
{
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1081
	if (length < 0xC0) {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1082
		fputc(length, f);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1083
	} else if (length < 0x4000) {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1084
		fputc((length >> 8) | 0xC0, f);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1085
		fputc(length & 0xFF, f);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1086
	} else {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1087
		Fatal("string too long");
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1088
	}
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1089
}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1090
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1091
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1092
static void WriteLangfile(const char *filename, int show_todo)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1093
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1094
	FILE *f;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1095
	uint in_use[32];
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1096
	LanguagePackHeader hdr;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1097
	uint i;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1098
	uint j;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1099
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1100
	f = fopen(filename, "wb");
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1101
	if (f == NULL) Fatal("can't open %s", filename);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1102
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1103
	memset(&hdr, 0, sizeof(hdr));
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
  1104
	for (i = 0; i != 32; i++) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1105
		uint n = CountInUse(i);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1106
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1107
		in_use[i] = n;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1108
		hdr.offsets[i] = TO_LE16(n);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1109
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1110
222
b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
darkvater
parents: 181
diff changeset
  1111
	// see line 655: fprintf(..."\tLANGUAGE_PACK_IDENT = 0x474E414C,...)
181
0b95567f2d0f (svn r182) -Fix: [1024380] strgen diff (Warning fix + MorphOS fix). Removes the longest standing warning on compilation of strgen (tokai)
darkvater
parents: 0
diff changeset
  1112
	hdr.ident = TO_LE32(0x474E414C); // Big Endian value for 'LANG'
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1113
	hdr.version = TO_LE32(_hash);
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1114
	hdr.plural_form = _lang_pluralform;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1115
	strcpy(hdr.name, _lang_name);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1116
	strcpy(hdr.own_name, _lang_ownname);
1376
d4e1dd8eb7e5 (svn r1880) [Codechange] Added isocodes to langfiles and support code to strgen (Lauri Nurmi)
miham
parents: 1097
diff changeset
  1117
	strcpy(hdr.isocode, _lang_isocode);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1118
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1119
	fwrite(&hdr, sizeof(hdr), 1, f);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1120
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
  1121
	for (i = 0; i != 32; i++) {
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
  1122
		for (j = 0; j != in_use[i]; j++) {
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1123
			const LangString* ls = _strings[(i << 11) + j];
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1124
			const Case* casep;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1125
			const char* cmdp;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1126
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1127
			// For undefined strings, just set that it's an empty string
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1128
			if (ls == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1129
				WriteLength(f, 0);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1130
				continue;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1131
			}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1132
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1133
			_cur_ident = ls->name;
2566
75ae28a03460 (svn r3103) - Fix: [ 1339000 ] Fix: strgen and plural forms fatal error for untranslated strings. (glx). Also output the correct lines for these warnings, for missing strings the lines correspond with the ones in english.txt
Darkvater
parents: 2482
diff changeset
  1134
			_cur_line = ls->line;
2082
1e289843fe0b (svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents: 2069
diff changeset
  1135
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1136
			// Produce a message if a string doesn't have a translation.
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1137
			if (show_todo > 0 && ls->translated == NULL) {
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1138
				if (show_todo == 2) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1139
					Warning("'%s' is untranslated", ls->name);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1140
				} else {
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1141
					const char *s = "<TODO> ";
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1142
					while (*s != '\0') PutByte(*s++);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1143
				}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1144
			}
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1145
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1146
			// Extract the strings and stuff from the english command string
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1147
			ExtractCommandString(&_cur_pcs, ls->english, false);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1148
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1149
			if (ls->translated_case != NULL || ls->translated != NULL) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1150
				casep = ls->translated_case;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1151
				cmdp = ls->translated;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1152
			} else {
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1153
				casep = ls->english_case;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1154
				cmdp = ls->english;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1155
			}
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1156
2586
1c0f0b67a70d (svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
Darkvater
parents: 2585
diff changeset
  1157
			_translated = _masterlang || (cmdp != ls->english);
2585
fa2f94aa9de2 (svn r3122) - Fix (regression): recent change to strgen which 'fixed' all strings with wrong plural forms. Thanks for glx for pointing this out (after I changed his original patch which was correct..whohoo braindeadness; here I come)
Darkvater
parents: 2566
diff changeset
  1158
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1159
			if (casep != NULL) {
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1160
				const Case* c;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1161
				uint num;
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1162
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1163
				// Need to output a case-switch.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1164
				// It has this format
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1165
				// <0x9E> <NUM CASES> <CASE1> <LEN1> <STRING1> <CASE2> <LEN2> <STRING2> <CASE3> <LEN3> <STRING3> <STRINGDEFAULT>
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1166
				// Each LEN is printed using 2 bytes in big endian order.
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1167
				PutByte(0x9E);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1168
				// Count the number of cases
2952
58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium)
tron
parents: 2904
diff changeset
  1169
				for (num = 0, c = casep; c; c = c->next) num++;
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1170
				PutByte(num);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1171
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1172
				// Write each case
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1173
				for (c = casep; c != NULL; c = c->next) {
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1174
					int pos;
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1175
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1176
					PutByte(c->caseidx);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1177
					// Make some space for the 16-bit length
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1178
					pos = _put_pos;
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1179
					PutByte(0);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1180
					PutByte(0);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1181
					// Write string
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1182
					PutCommandString(c->string);
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1183
					PutByte(0); // terminate with a zero
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1184
					// Fill in the length
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1185
					_put_buf[pos + 0] = GB(_put_pos - (pos + 2), 8, 8);
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1186
					_put_buf[pos + 1] = GB(_put_pos - (pos + 2), 0, 8);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1187
				}
2087
a03690e33b66 (svn r2597) Feature: [string system] Support cases.
ludde
parents: 2084
diff changeset
  1188
			}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1189
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1190
			if (cmdp != NULL) PutCommandString(cmdp);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1191
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1192
			WriteLength(f, _put_pos);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1193
			fwrite(_put_buf, 1, _put_pos, f);
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1194
			_put_pos = 0;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1195
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1196
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1197
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1198
	fputc(0, f);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1199
	fclose(f);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1200
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1201
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1202
/** Multi-OS mkdirectory function */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1203
static inline void ottd_mkdir(const char *directory)
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1204
{
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1205
#if defined(WIN32) || defined(__WATCOMC__)
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1206
		mkdir(directory);
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1207
#else
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1208
		mkdir(directory, 0755);
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1209
#endif
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1210
}
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1211
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1212
/** Create a path consisting of an already existing path, a possible
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1213
 * path seperator and the filename. The seperator is only appended if the path
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1214
 * does not already end with a seperator */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1215
static inline char *mkpath(char *buf, size_t buflen, const char *path, const char *file)
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1216
{
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1217
	char *p;
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1218
	ttd_strlcpy(buf, path, buflen); // copy directory into buffer
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1219
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1220
	p = strchr(buf, '\0'); // add path seperator if necessary
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1221
	if (p[-1] != PATHSEPCHAR && (size_t)(p - buf) + 1 < buflen) *p++ = PATHSEPCHAR;
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1222
	ttd_strlcpy(p, file, buflen - (size_t)(p - buf)); // catenate filename at end of buffer
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1223
	return buf;
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1224
}
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1225
4379
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1226
#if defined(__MINGW32__) || defined(__CYGWIN__)
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1227
/**
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1228
 * On MingW, it is common that both / as \ are accepted in the
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1229
 * params. To go with those flow, we rewrite all incoming /
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1230
 * simply to \, so internally we can safely assume \.
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1231
 */
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1232
static inline char *replace_pathsep(char *s)
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1233
{
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1234
	char *c;
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1235
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1236
	for (c = s; *c != '\0'; c++) if (*c == '/') *c = '\\';
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1237
	return s;
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1238
}
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1239
#else
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1240
static inline char *replace_pathsep(char *s) { return s; }
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1241
#endif
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1242
250
733e18ca6e93 (svn r251) -Project ready for 0.3.4 release. Updated installer, readme and fileinformation
darkvater
parents: 236
diff changeset
  1243
int CDECL main(int argc, char* argv[])
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1244
{
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1245
	char pathbuf[256];
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1246
	const char *src_dir = ".";
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1247
	const char *dest_dir = NULL;
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1248
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1249
	int show_todo = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1250
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1251
	while (argc > 1 && *argv[1] == '-') {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1252
		if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1253
			puts("$Revision$");
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1254
			return 0;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1255
		}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1256
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1257
		if (strcmp(argv[1], "-t") == 0 || strcmp(argv[1], "--todo") == 0) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1258
			show_todo = 1;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1259
			argc--, argv++;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1260
			continue;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1261
		}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1262
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1263
		if (strcmp(argv[1], "-w") == 0 || strcmp(argv[1], "--warning") == 0) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1264
			show_todo = 2;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1265
			argc--, argv++;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1266
			continue;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1267
		}
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1268
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1269
		if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1270
			puts(
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1271
				"strgen - $Revision$\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1272
				" -v | --version    print version information and exit\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1273
				" -t | --todo       replace any untranslated strings with '<TODO>'\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1274
				" -w | --warning    print a warning for any untranslated strings\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1275
				" -h | -? | --help  print this help message and exit\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1276
				" -s | --source_dir search for english.txt in the specified directory\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1277
				" -d | --dest_dir   put output file in the specified directory, create if needed\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1278
				" Run without parameters and strgen will search for english.txt and parse it,\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1279
				" creating strings.h. Passing an argument, strgen will translate that language\n"
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1280
				" file using english.txt as a reference and output <language>.lng."
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1281
			);
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1282
			return 0;
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1283
		}
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1284
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1285
		if (argc > 2 && (strcmp(argv[1], "-s") == 0 || strcmp(argv[1], "--source_dir") == 0)) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1286
			src_dir = replace_pathsep(argv[2]);
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1287
			argc -= 2, argv += 2;
4464
08e89a8faa09 (svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents: 4461
diff changeset
  1288
			continue;
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1289
		}
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1290
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1291
		if (argc > 2 && (strcmp(argv[1], "-d") == 0 || strcmp(argv[1], "--dest_dir") == 0)) {
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1292
			dest_dir = replace_pathsep(argv[2]);
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1293
			argc -= 2, argv += 2;
4464
08e89a8faa09 (svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents: 4461
diff changeset
  1294
			continue;
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1295
		}
4464
08e89a8faa09 (svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents: 4461
diff changeset
  1296
08e89a8faa09 (svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents: 4461
diff changeset
  1297
		fprintf(stderr, "Invalid arguments\n");
08e89a8faa09 (svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents: 4461
diff changeset
  1298
		return 0;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1299
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1300
4461
905cb9ca6fe5 (svn r6244) -Fix: allow any order for strgen parameters
glx
parents: 4447
diff changeset
  1301
	if (dest_dir == NULL) dest_dir = src_dir; // if dest_dir is not specified, it equals src_dir
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1302
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1303
	/* strgen has two modes of operation. If no (free) arguments are passed
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1304
	 * strgen generates strings.h to the destination directory. If it is supplied
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1305
	 * with a (free) parameter the program will translate that language to destination
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1306
	 * directory. As input english.txt is parsed from the source directory */
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1307
	if (argc == 1) {
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1308
		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1309
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1310
		/* parse master file */
2586
1c0f0b67a70d (svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
Darkvater
parents: 2585
diff changeset
  1311
		_masterlang = true;
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1312
		ParseFile(pathbuf, true);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1313
		MakeHashOfStrings();
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1314
		if (_errors) return 1;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1315
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1316
		/* write strings.h */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1317
		ottd_mkdir(dest_dir);
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1318
		mkpath(pathbuf, lengthof(pathbuf), dest_dir, "strings.h");
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1319
		WriteStringsH(pathbuf);
3015
f91a1b8fba79 (svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents: 2952
diff changeset
  1320
	} else if (argc == 2) {
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1321
		char *r;
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1322
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1323
		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1324
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1325
		/* parse master file and check if target file is correct */
2586
1c0f0b67a70d (svn r3123) eh, don't press enter after typing text, previous patch wasn't finished. Now strgen really behaves correctly. Thanks again glx
Darkvater
parents: 2585
diff changeset
  1326
		_masterlang = false;
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1327
		ParseFile(pathbuf, true);
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1328
		MakeHashOfStrings();
4379
96eb926dcc1d (svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents: 4373
diff changeset
  1329
		ParseFile(replace_pathsep(argv[1]), false); // target file
2063
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1330
		if (_errors) return 1;
ae866a12f2df (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents: 2060
diff changeset
  1331
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1332
		/* get the targetfile, strip any directories and append to destination path */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1333
		r = strrchr(argv[1], PATHSEPCHAR);
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1334
		mkpath(pathbuf, lengthof(pathbuf), dest_dir, (r != NULL) ? &r[1] : argv[1]);
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1335
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1336
		/* rename the .txt (input-extension) to .lng */
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1337
		r = strrchr(pathbuf, '.');
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1338
		if (r == NULL || strcmp(r, ".txt") != 0) r = strchr(pathbuf, '\0');
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1339
		ttd_strlcpy(r, ".lng", (size_t)(r - pathbuf));
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1340
		WriteLangfile(pathbuf, show_todo);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1341
	} else {
4370
5beb8896ae3d (svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents: 4344
diff changeset
  1342
		fprintf(stderr, "Invalid arguments\n");
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1343
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1344
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1345
	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
  1346
}