author | frosch |
Wed, 20 Aug 2008 19:10:42 +0000 | |
changeset 9956 | 094d932dec8a |
parent 9648 | c79160082c0f |
child 10209 | a1e7417bf1b7 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
9111
48ce04029fe4
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
8983
diff
changeset
|
3 |
/** @file strgen.cpp Tool to create computer readable (stand-alone) translation files. */ |
48ce04029fe4
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
8983
diff
changeset
|
4 |
|
0 | 5 |
#include "../stdafx.h" |
8130
d2eb7d04f6e1
(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.
rubidium
parents:
8114
diff
changeset
|
6 |
#include "../core/alloc_func.hpp" |
8135
2373c1e0e9bc
(svn r11697) -Fix [FS#1585]: strgen did not (always) compile properly.
rubidium
parents:
8130
diff
changeset
|
7 |
#include "../core/endian_func.hpp" |
8214
971f861d5543
(svn r11777) -Codechange: split the string header and make do not include it when it's not necessary.
rubidium
parents:
8135
diff
changeset
|
8 |
#include "../string_func.h" |
8264
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8214
diff
changeset
|
9 |
#include "../table/control_codes.h" |
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8214
diff
changeset
|
10 |
|
0 | 11 |
#include <stdio.h> |
12 |
#include <string.h> |
|
13 |
#include <stdlib.h> |
|
14 |
#include <stdarg.h> |
|
15 |
||
2482
374f6395847d
(svn r3008) [ 1247535 ] Native Support for Win64 (compile&run only) (michi_cc)
Darkvater
parents:
2459
diff
changeset
|
16 |
#if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__) |
0 | 17 |
#include <unistd.h> |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
18 |
#include <sys/types.h> |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
19 |
#include <sys/stat.h> |
0 | 20 |
#endif |
21 |
||
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
22 |
#if defined WIN32 || defined __WATCOMC__ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
23 |
#include <direct.h> |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
24 |
#endif /* WIN32 || __WATCOMC__ */ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
25 |
|
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
|
26 |
#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
|
27 |
#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
|
28 |
#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
|
29 |
#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
|
30 |
#define stderr stdout |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
31 |
#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
|
32 |
|
0 | 33 |
/* Compiles a list of strings into a compiled string list */ |
34 |
||
35 |
typedef void (*ParseCmdProc)(char *buf, int value); |
|
36 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
37 |
struct LanguagePackHeader { |
0 | 38 |
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
|
39 |
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
|
40 |
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
|
41 |
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
|
42 |
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
|
43 |
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
|
44 |
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
|
45 |
byte pad[3]; // pad header to be a multiple of 4 |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
46 |
}; |
0 | 47 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
48 |
struct CmdStruct { |
0 | 49 |
const char *cmd; |
50 |
ParseCmdProc proc; |
|
51 |
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
|
52 |
int8 consumes; |
2087 | 53 |
byte flags; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
54 |
}; |
0 | 55 |
|
2087 | 56 |
enum { |
57 |
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
|
58 |
C_CASE = 2, |
2087 | 59 |
}; |
60 |
||
61 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
62 |
struct Case { |
2087 | 63 |
int caseidx; |
64 |
char *string; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
65 |
Case *next; |
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
66 |
}; |
2087 | 67 |
|
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
|
68 |
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
|
69 |
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
|
70 |
static const char* _file = "(unknown file)"; |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
71 |
static int _cur_line; |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
72 |
static int _errors, _warnings, _show_todo; |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
73 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
74 |
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
|
75 |
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
|
76 |
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
|
77 |
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
|
78 |
uint16 hash_next; // next hash entry |
2087 | 79 |
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
|
80 |
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
|
81 |
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
|
82 |
Case *translated_case; // cases for foreign |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
83 |
}; |
2087 | 84 |
|
85 |
static LangString *_strings[65536]; |
|
86 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
87 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
88 |
#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
|
89 |
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
|
90 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
91 |
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
|
92 |
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
|
93 |
static int _next_string_id; |
0 | 94 |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
95 |
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
|
96 |
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
|
97 |
static byte _lang_pluralform; |
2087 | 98 |
#define MAX_NUM_GENDER 8 |
99 |
static char _genders[MAX_NUM_GENDER][8]; |
|
100 |
static int _numgenders; |
|
0 | 101 |
|
2087 | 102 |
// contains the name of all cases. |
103 |
#define MAX_NUM_CASES 50 |
|
104 |
static char _cases[MAX_NUM_CASES][16]; |
|
105 |
static int _numcases; |
|
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
106 |
|
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
107 |
// for each plural value, this is the number of plural forms. |
8733
e60ce9c3ae47
(svn r12417) -Fix: Add a new plural rule for Icelandic.
maedhros
parents:
8264
diff
changeset
|
108 |
static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4, 2 }; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
109 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
110 |
static const char *_cur_ident; |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
111 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
112 |
struct CmdPair { |
2087 | 113 |
const CmdStruct *a; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
114 |
const char *v; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
115 |
}; |
2087 | 116 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
117 |
struct ParsedCommandStruct { |
2087 | 118 |
int np; |
119 |
CmdPair pairs[32]; |
|
120 |
const CmdStruct *cmd[32]; // ordered by param # |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
121 |
}; |
2087 | 122 |
|
123 |
// Used when generating some advanced commands. |
|
124 |
static ParsedCommandStruct _cur_pcs; |
|
125 |
static int _cur_argidx; |
|
126 |
||
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
127 |
static uint HashStr(const char *s) |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
128 |
{ |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
129 |
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
|
130 |
for (; *s != '\0'; s++) hash = ROL(hash, 3) ^ *s; |
0 | 131 |
return hash % HASH_SIZE; |
132 |
} |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
133 |
|
2087 | 134 |
static void HashAdd(const char *s, LangString *ls) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
135 |
{ |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
136 |
uint hash = HashStr(s); |
2087 | 137 |
ls->hash_next = _hash_head[hash]; |
138 |
_hash_head[hash] = ls->index + 1; |
|
0 | 139 |
} |
140 |
||
2087 | 141 |
static LangString *HashFind(const char *s) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
142 |
{ |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
143 |
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
|
144 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
145 |
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
|
146 |
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
|
147 |
|
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 |
if (strcmp(ls->name, s) == 0) return ls; |
2087 | 149 |
idx = ls->hash_next; |
0 | 150 |
} |
2087 | 151 |
return NULL; |
0 | 152 |
} |
153 |
||
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3718
diff
changeset
|
154 |
#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
|
155 |
# 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
|
156 |
#else |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3718
diff
changeset
|
157 |
# 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
|
158 |
#endif |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
159 |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
160 |
static void CDECL strgen_warning(const char *s, ...) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
161 |
{ |
0 | 162 |
char buf[1024]; |
163 |
va_list va; |
|
164 |
va_start(va, s); |
|
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
165 |
vsnprintf(buf, lengthof(buf), s, va); |
0 | 166 |
va_end(va); |
4447
486395ec1e06
(svn r6225) -Codechange: change the warning/error format of strgen to show up
Darkvater
parents:
4434
diff
changeset
|
167 |
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
|
168 |
_warnings++; |
0 | 169 |
} |
170 |
||
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
171 |
static void CDECL strgen_error(const char *s, ...) |
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 |
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
|
174 |
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
|
175 |
va_start(va, s); |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
176 |
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
|
177 |
va_end(va); |
4447
486395ec1e06
(svn r6225) -Codechange: change the warning/error format of strgen to show up
Darkvater
parents:
4434
diff
changeset
|
178 |
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
|
179 |
_errors++; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
180 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
181 |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
182 |
void NORETURN CDECL error(const char *s, ...) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
183 |
{ |
0 | 184 |
char buf[1024]; |
185 |
va_list va; |
|
186 |
va_start(va, s); |
|
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
187 |
vsnprintf(buf, lengthof(buf), s, va); |
0 | 188 |
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
|
189 |
fprintf(stderr, "%s" LINE_NUM_FMT ": FATAL: %s\n", _file, _cur_line, buf); |
0 | 190 |
exit(1); |
191 |
} |
|
192 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
193 |
static void PutByte(byte c) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
194 |
{ |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
195 |
if (_put_pos == lengthof(_put_buf)) error("Put buffer too small"); |
0 | 196 |
_put_buf[_put_pos++] = c; |
197 |
} |
|
198 |
||
199 |
||
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
200 |
static void PutUtf8(uint32 value) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
201 |
{ |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
202 |
if (value < 0x80) { |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
203 |
PutByte(value); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
204 |
} else if (value < 0x800) { |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
205 |
PutByte(0xC0 + GB(value, 6, 5)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
206 |
PutByte(0x80 + GB(value, 0, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
207 |
} else if (value < 0x10000) { |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
208 |
PutByte(0xE0 + GB(value, 12, 4)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
209 |
PutByte(0x80 + GB(value, 6, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
210 |
PutByte(0x80 + GB(value, 0, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
211 |
} else if (value < 0x110000) { |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
212 |
PutByte(0xF0 + GB(value, 18, 3)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
213 |
PutByte(0x80 + GB(value, 12, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
214 |
PutByte(0x80 + GB(value, 6, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
215 |
PutByte(0x80 + GB(value, 0, 6)); |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
216 |
} else { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
217 |
strgen_warning("Invalid unicode value U+0x%X", value); |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
218 |
} |
0 | 219 |
} |
220 |
||
221 |
||
5111
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
222 |
size_t Utf8Validate(const char *s) |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
223 |
{ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
224 |
uint32 c; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
225 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7755
diff
changeset
|
226 |
if (!HasBit(s[0], 7)) { |
5111
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
227 |
/* 1 byte */ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
228 |
return 1; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
229 |
} else if (GB(s[0], 5, 3) == 6 && IsUtf8Part(s[1])) { |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
230 |
/* 2 bytes */ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
231 |
c = GB(s[0], 0, 5) << 6 | GB(s[1], 0, 6); |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
232 |
if (c >= 0x80) return 2; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
233 |
} else if (GB(s[0], 4, 4) == 14 && IsUtf8Part(s[1]) && IsUtf8Part(s[2])) { |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
234 |
/* 3 bytes */ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
235 |
c = GB(s[0], 0, 4) << 12 | GB(s[1], 0, 6) << 6 | GB(s[2], 0, 6); |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
236 |
if (c >= 0x800) return 3; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
237 |
} else if (GB(s[0], 3, 5) == 30 && IsUtf8Part(s[1]) && IsUtf8Part(s[2]) && IsUtf8Part(s[3])) { |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
238 |
/* 4 bytes */ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
239 |
c = GB(s[0], 0, 3) << 18 | GB(s[1], 0, 6) << 12 | GB(s[2], 0, 6) << 6 | GB(s[3], 0, 6); |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
240 |
if (c >= 0x10000 && c <= 0x10FFFF) return 4; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
241 |
} |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
242 |
|
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
243 |
return 0; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
244 |
} |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
245 |
|
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
246 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
247 |
static void EmitSingleChar(char *buf, int value) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
248 |
{ |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
249 |
if (*buf != '\0') strgen_warning("Ignoring trailing letters in command"); |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
250 |
PutUtf8(value); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
251 |
} |
0 | 252 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
253 |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
254 |
static void EmitSetX(char *buf, int value) |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
255 |
{ |
0 | 256 |
char *err; |
257 |
int x = strtol(buf, &err, 0); |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
258 |
if (*err != 0) error("SetX param invalid"); |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
259 |
PutUtf8(SCC_SETX); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
260 |
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
|
261 |
} |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
262 |
|
0 | 263 |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
264 |
static void EmitSetXY(char *buf, int value) |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
265 |
{ |
0 | 266 |
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
|
267 |
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
|
268 |
int y; |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
269 |
|
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
270 |
x = strtol(buf, &err, 0); |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
271 |
if (*err != ' ') error("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
|
272 |
y = strtol(err + 1, &err, 0); |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
273 |
if (*err != 0) error("SetXY param invalid"); |
0 | 274 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
275 |
PutUtf8(SCC_SETXY); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
276 |
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
|
277 |
PutByte((byte)y); |
0 | 278 |
} |
279 |
||
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
280 |
// The plural specifier looks like |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
281 |
// {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
|
282 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
283 |
// This is encoded like |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
284 |
// 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
|
285 |
|
2087 | 286 |
bool ParseRelNum(char **buf, int *value) |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
287 |
{ |
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
|
288 |
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
|
289 |
char* end; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
290 |
bool rel = false; |
2087 | 291 |
int v; |
292 |
||
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
293 |
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
|
294 |
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
|
295 |
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
|
296 |
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
|
297 |
} |
2087 | 298 |
v = strtol(s, &end, 0); |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
299 |
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
|
300 |
if (rel || v < 0) { |
2087 | 301 |
*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
|
302 |
} else { |
2087 | 303 |
*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
|
304 |
} |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
305 |
*buf = end; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
306 |
return true; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
307 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
308 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
309 |
// Parse out the next word, or NULL |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
310 |
char *ParseWord(char **buf) |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
311 |
{ |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
312 |
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
|
313 |
|
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
314 |
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
|
315 |
if (*s == '\0') return NULL; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
316 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
317 |
if (*s == '"') { |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
318 |
r = ++s; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
319 |
// parse until next " or NUL |
2952 | 320 |
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
|
321 |
if (*s == '\0') break; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
322 |
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
|
323 |
*s++ = '\0'; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
324 |
break; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
325 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
326 |
s++; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
327 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
328 |
} else { |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
329 |
// proceed until whitespace or NUL |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
330 |
r = s; |
2952 | 331 |
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
|
332 |
if (*s == '\0') break; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
333 |
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
|
334 |
*s++ = '\0'; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
335 |
break; |
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 |
s++; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
338 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
339 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
340 |
*buf = s; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
341 |
return r; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
342 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
343 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
344 |
// Forward declaration |
2087 | 345 |
static int TranslateArgumentIdx(int arg); |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
346 |
|
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
|
347 |
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
|
348 |
{ |
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
|
349 |
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
|
350 |
uint j; |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
351 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
352 |
PutByte(nw); |
2952 | 353 |
for (i = 0; i < nw; i++) PutByte(strlen(words[i])); |
354 |
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
|
355 |
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
|
356 |
} |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
357 |
} |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
358 |
|
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
359 |
static void EmitPlural(char *buf, int value) |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
360 |
{ |
2087 | 361 |
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
|
362 |
const char* words[5]; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
363 |
int nw = 0; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
364 |
|
2087 | 365 |
// 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
|
366 |
if (!ParseRelNum(&buf, &argidx)) argidx--; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
367 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
368 |
// 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
|
369 |
for (nw = 0; nw < 5; nw++) { |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
370 |
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
|
371 |
if (words[nw] == NULL) break; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
372 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
373 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
374 |
if (nw == 0) |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
375 |
error("%s: No plural words", _cur_ident); |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
376 |
|
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
|
377 |
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
|
378 |
if (_translated) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
379 |
error("%s: Invalid number of plural forms. Expecting %d, found %d.", _cur_ident, |
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
|
380 |
_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
|
381 |
} else { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
382 |
if ((_show_todo & 2) != 0) strgen_warning("'%s' is untranslated. Tweaking english string to allow compilation for plural forms", _cur_ident); |
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
|
383 |
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
|
384 |
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
|
385 |
} else { |
2952 | 386 |
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
|
387 |
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
|
388 |
} |
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
|
389 |
} |
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
|
390 |
} |
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
|
391 |
} |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
392 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
393 |
PutUtf8(SCC_PLURAL_LIST); |
2087 | 394 |
PutByte(TranslateArgumentIdx(argidx)); |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
395 |
EmitWordList(words, nw); |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
396 |
} |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
397 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
398 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
399 |
static void EmitGender(char *buf, int value) |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
400 |
{ |
2087 | 401 |
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
|
402 |
uint nw; |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
403 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
404 |
if (buf[0] == '=') { |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
405 |
buf++; |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
406 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
407 |
// This is a {G=DER} command |
2952 | 408 |
for (nw = 0; ; nw++) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
409 |
if (nw >= 8) error("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
|
410 |
if (strcmp(buf, _genders[nw]) == 0) break; |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
411 |
} |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
412 |
// now nw contains the gender index |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
413 |
PutUtf8(SCC_GENDER_INDEX); |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
414 |
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
|
415 |
} 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
|
416 |
const char* words[8]; |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
417 |
|
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
418 |
// This is a {G 0 foo bar two} command. |
2087 | 419 |
// If no relative number exists, default to +0 |
420 |
if (!ParseRelNum(&buf, &argidx)) {} |
|
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
421 |
|
2952 | 422 |
for (nw = 0; nw < 8; nw++) { |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
423 |
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
|
424 |
if (words[nw] == NULL) break; |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
425 |
} |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
426 |
if (nw != _numgenders) error("Bad # of arguments for gender command"); |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
427 |
PutUtf8(SCC_GENDER_LIST); |
2087 | 428 |
PutByte(TranslateArgumentIdx(argidx)); |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
429 |
EmitWordList(words, nw); |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
430 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
431 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
432 |
|
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
433 |
|
0 | 434 |
static const CmdStruct _cmd_structs[] = { |
435 |
// Update position |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
436 |
{"SETX", EmitSetX, SCC_SETX, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
437 |
{"SETXY", EmitSetXY, SCC_SETXY, 0, 0}, |
0 | 438 |
|
439 |
// Font size |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
440 |
{"TINYFONT", EmitSingleChar, SCC_TINYFONT, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
441 |
{"BIGFONT", EmitSingleChar, SCC_BIGFONT, 0, 0}, |
0 | 442 |
|
443 |
// Colors |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
444 |
{"BLUE", EmitSingleChar, SCC_BLUE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
445 |
{"SILVER", EmitSingleChar, SCC_SILVER, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
446 |
{"GOLD", EmitSingleChar, SCC_GOLD, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
447 |
{"RED", EmitSingleChar, SCC_RED, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
448 |
{"PURPLE", EmitSingleChar, SCC_PURPLE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
449 |
{"LTBROWN", EmitSingleChar, SCC_LTBROWN, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
450 |
{"ORANGE", EmitSingleChar, SCC_ORANGE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
451 |
{"GREEN", EmitSingleChar, SCC_GREEN, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
452 |
{"YELLOW", EmitSingleChar, SCC_YELLOW, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
453 |
{"DKGREEN", EmitSingleChar, SCC_DKGREEN, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
454 |
{"CREAM", EmitSingleChar, SCC_CREAM, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
455 |
{"BROWN", EmitSingleChar, SCC_BROWN, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
456 |
{"WHITE", EmitSingleChar, SCC_WHITE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
457 |
{"LTBLUE", EmitSingleChar, SCC_LTBLUE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
458 |
{"GRAY", EmitSingleChar, SCC_GRAY, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
459 |
{"DKBLUE", EmitSingleChar, SCC_DKBLUE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
460 |
{"BLACK", EmitSingleChar, SCC_BLACK, 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
|
461 |
|
7005
7273ae18a911
(svn r10261) -Cleanup: we do not need CURRENCY64 and CURRCOMPACT64 anymore, because everything is already 64 bits by default.
rubidium
parents:
6643
diff
changeset
|
462 |
{"CURRCOMPACT", EmitSingleChar, SCC_CURRENCY_COMPACT, 1, 0}, // compact currency |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
463 |
{"REV", EmitSingleChar, SCC_REVISION, 0, 0}, // openttd revision string |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
464 |
{"SHORTCARGO", EmitSingleChar, SCC_CARGO_SHORT, 2, 0}, // short cargo description, only ### tons, or ### litres |
0 | 465 |
|
9956
094d932dec8a
(svn r14111) -Fix (r2572): [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY}.
frosch
parents:
9648
diff
changeset
|
466 |
{"STRING1", EmitSingleChar, SCC_STRING1, 2, C_CASE}, // included string that consumes the string id and ONE argument |
094d932dec8a
(svn r14111) -Fix (r2572): [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY}.
frosch
parents:
9648
diff
changeset
|
467 |
{"STRING2", EmitSingleChar, SCC_STRING2, 3, C_CASE}, // included string that consumes the string id and TWO arguments |
094d932dec8a
(svn r14111) -Fix (r2572): [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY}.
frosch
parents:
9648
diff
changeset
|
468 |
{"STRING3", EmitSingleChar, SCC_STRING3, 4, C_CASE}, // included string that consumes the string id and THREE arguments |
094d932dec8a
(svn r14111) -Fix (r2572): [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY}.
frosch
parents:
9648
diff
changeset
|
469 |
{"STRING4", EmitSingleChar, SCC_STRING4, 5, C_CASE}, // included string that consumes the string id and FOUR arguments |
094d932dec8a
(svn r14111) -Fix (r2572): [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY}.
frosch
parents:
9648
diff
changeset
|
470 |
{"STRING5", EmitSingleChar, SCC_STRING5, 6, C_CASE}, // included string that consumes the string id and FIVE arguments |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
471 |
|
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
472 |
{"STATIONFEATURES", EmitSingleChar, SCC_STATION_FEATURES, 1, 0}, // station features string, icons of the features |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
473 |
{"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, 0}, // industry, takes an industry # |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
474 |
{"CARGO", EmitSingleChar, SCC_CARGO, 2, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
475 |
{"POWER", EmitSingleChar, SCC_POWER, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
476 |
{"VOLUME", EmitSingleChar, SCC_VOLUME, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
477 |
{"VOLUME_S", EmitSingleChar, SCC_VOLUME_SHORT, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
478 |
{"WEIGHT", EmitSingleChar, SCC_WEIGHT, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
479 |
{"WEIGHT_S", EmitSingleChar, SCC_WEIGHT_SHORT, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
480 |
{"FORCE", EmitSingleChar, SCC_FORCE, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
481 |
{"VELOCITY", EmitSingleChar, SCC_VELOCITY, 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
|
482 |
|
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
|
483 |
{"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
|
484 |
{"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
|
485 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
486 |
{"DATE_TINY", EmitSingleChar, SCC_DATE_TINY, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
487 |
{"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
488 |
{"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 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
|
489 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
490 |
{"SKIP", EmitSingleChar, SCC_SKIP, 1, 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
|
491 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
492 |
{"STRING", EmitSingleChar, SCC_STRING, 1, C_CASE}, |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9111
diff
changeset
|
493 |
{"RAW_STRING", EmitSingleChar, SCC_RAW_STRING_POINTER, 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
|
494 |
|
2410
795225af3c72
(svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents:
2407
diff
changeset
|
495 |
// Numbers |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
496 |
{"COMMA", EmitSingleChar, SCC_COMMA, 1, 0}, // Number with comma |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
497 |
{"NUM", EmitSingleChar, SCC_NUM, 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
|
498 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
499 |
{"CURRENCY", EmitSingleChar, SCC_CURRENCY, 1, 0}, |
2410
795225af3c72
(svn r2936) Move string commands to a non-printable range and remove stale comments
tron
parents:
2407
diff
changeset
|
500 |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
501 |
{"WAYPOINT", EmitSingleChar, SCC_WAYPOINT_NAME, 1, 0}, // waypoint name |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
502 |
{"STATION", EmitSingleChar, SCC_STATION_NAME, 1, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
503 |
{"TOWN", EmitSingleChar, SCC_TOWN_NAME, 1, 0}, |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6491
diff
changeset
|
504 |
{"GROUP", EmitSingleChar, SCC_GROUP_NAME, 1, 0}, |
7056
6daddeaa79df
(svn r10321) -Codechange: refer to sign text by index
peter1138
parents:
7049
diff
changeset
|
505 |
{"SIGN", EmitSingleChar, SCC_SIGN_NAME, 1, 0}, |
7059
c6d12e3de0dc
(svn r10324) -Codechange: reference engine names by index
peter1138
parents:
7058
diff
changeset
|
506 |
{"ENGINE", EmitSingleChar, SCC_ENGINE_NAME, 1, 0}, |
7049
0ebe47348074
(svn r10314) -Codechange: Refer to vehicle names by index
peter1138
parents:
7025
diff
changeset
|
507 |
{"VEHICLE", EmitSingleChar, SCC_VEHICLE_NAME, 1, 0}, |
7058
8105bb13ce3d
(svn r10323) -Codechange: reference company name, number and player (president) name
peter1138
parents:
7056
diff
changeset
|
508 |
{"COMPANY", EmitSingleChar, SCC_COMPANY_NAME, 1, 0}, |
8105bb13ce3d
(svn r10323) -Codechange: reference company name, number and player (president) name
peter1138
parents:
7056
diff
changeset
|
509 |
{"COMPANYNUM", EmitSingleChar, SCC_COMPANY_NUM, 1, 0}, |
8105bb13ce3d
(svn r10323) -Codechange: reference company name, number and player (president) name
peter1138
parents:
7056
diff
changeset
|
510 |
{"PLAYERNAME", EmitSingleChar, SCC_PLAYER_NAME, 1, 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
|
511 |
|
2087 | 512 |
// 0x9D is used for the pseudo command SETCASE |
513 |
// 0x9E is used for case switching |
|
514 |
||
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
515 |
{"", EmitSingleChar, '\n', 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
516 |
{"{", EmitSingleChar, '{', 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
517 |
{"UPARROW", EmitSingleChar, SCC_UPARROW, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
518 |
{"SMALLUPARROW", EmitSingleChar, SCC_SMALLUPARROW, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
519 |
{"SMALLDOWNARROW", EmitSingleChar, SCC_SMALLDOWNARROW, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
520 |
{"TRAIN", EmitSingleChar, SCC_TRAIN, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
521 |
{"LORRY", EmitSingleChar, SCC_LORRY, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
522 |
{"BUS", EmitSingleChar, SCC_BUS, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
523 |
{"PLANE", EmitSingleChar, SCC_PLANE, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
524 |
{"SHIP", EmitSingleChar, SCC_SHIP, 0, 0}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
525 |
{"NBSP", EmitSingleChar, 0xA0, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
526 |
{"CENT", EmitSingleChar, 0xA2, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
527 |
{"POUNDSIGN", EmitSingleChar, 0xA3, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
528 |
{"EURO", EmitSingleChar, 0x20AC, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
529 |
{"YENSIGN", EmitSingleChar, 0xA5, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
530 |
{"COPYRIGHT", EmitSingleChar, 0xA9, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
531 |
{"DOWNARROW", EmitSingleChar, SCC_DOWNARROW, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
532 |
{"CHECKMARK", EmitSingleChar, SCC_CHECKMARK, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
533 |
{"CROSS", EmitSingleChar, SCC_CROSS, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
534 |
{"REGISTERED", EmitSingleChar, 0xAE, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
535 |
{"RIGHTARROW", EmitSingleChar, SCC_RIGHTARROW, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
536 |
{"SMALLLEFTARROW", EmitSingleChar, SCC_LESSTHAN, 0, C_DONTCOUNT}, |
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
537 |
{"SMALLRIGHTARROW",EmitSingleChar, SCC_GREATERTHAN, 0, C_DONTCOUNT}, |
0 | 538 |
}; |
539 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
540 |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
541 |
static const CmdStruct *FindCmd(const char *s, int len) |
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
542 |
{ |
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
|
543 |
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
|
544 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
545 |
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
|
546 |
if (strncmp(cs->cmd, s, len) == 0 && cs->cmd[len] == '\0') return cs; |
0 | 547 |
} |
548 |
return NULL; |
|
549 |
} |
|
550 |
||
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
|
551 |
static uint ResolveCaseName(const char *str, uint len) |
2087 | 552 |
{ |
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
|
553 |
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
|
554 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
555 |
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
|
556 |
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
|
557 |
} |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
558 |
error("Invalid case-name '%s'", str); |
2087 | 559 |
} |
560 |
||
0 | 561 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
562 |
// 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
|
563 |
// else returns command struct |
2087 | 564 |
static const CmdStruct *ParseCommandString(const char **str, char *param, int *argno, int *casei) |
0 | 565 |
{ |
2087 | 566 |
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
|
567 |
const CmdStruct *cmd; |
2060
9f3855e81f4b
(svn r2569) Get rid of some dubious casts and thus warnings on 64bit machines
tron
parents:
2059
diff
changeset
|
568 |
byte c; |
0 | 569 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
570 |
*argno = -1; |
2087 | 571 |
*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
|
572 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
573 |
// Scan to the next command, exit if there's no next command. |
2952 | 574 |
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
|
575 |
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
|
576 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
577 |
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
|
578 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
579 |
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
|
580 |
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
|
581 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
582 |
*argno = strtoul(s, &end, 0); |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
583 |
if (*end != ':') error("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
|
584 |
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
|
585 |
} |
0 | 586 |
|
587 |
// parse command name |
|
588 |
start = s; |
|
2087 | 589 |
do { |
0 | 590 |
c = *s++; |
2087 | 591 |
} while (c != '}' && c != ' ' && c != '=' && c != '.' && c != 0); |
0 | 592 |
|
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
593 |
cmd = FindCmd(start, s - start - 1); |
0 | 594 |
if (cmd == NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
595 |
strgen_error("Undefined command '%.*s'", s - start - 1, start); |
0 | 596 |
return NULL; |
597 |
} |
|
598 |
||
2087 | 599 |
if (c == '.') { |
600 |
const char *casep = s; |
|
601 |
||
602 |
if (!(cmd->flags & C_CASE)) |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
603 |
error("Command '%s' can't have a case", cmd->cmd); |
2087 | 604 |
|
605 |
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
|
606 |
*casei = ResolveCaseName(casep, s - casep - 1); |
2087 | 607 |
} |
608 |
||
609 |
if (c == '\0') { |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
610 |
strgen_error("Missing } from command '%s'", start); |
2087 | 611 |
return NULL; |
612 |
} |
|
613 |
||
614 |
||
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
615 |
if (c != '}') { |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
616 |
if (c == '=') s--; |
0 | 617 |
// copy params |
618 |
start = s; |
|
2952 | 619 |
for (;;) { |
0 | 620 |
c = *s++; |
621 |
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
|
622 |
if (c == '\0') { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
623 |
strgen_error("Missing } from command '%s'", start); |
0 | 624 |
return NULL; |
625 |
} |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
626 |
if (s - start == 250) error("param command too long"); |
0 | 627 |
*param++ = c; |
628 |
} |
|
629 |
} |
|
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
|
630 |
*param = '\0'; |
0 | 631 |
|
632 |
*str = s; |
|
633 |
||
634 |
return cmd; |
|
635 |
} |
|
636 |
||
637 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
638 |
static void HandlePragma(char *str) |
0 | 639 |
{ |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
640 |
if (!memcmp(str, "id ", 3)) { |
0 | 641 |
_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
|
642 |
} else if (!memcmp(str, "name ", 5)) { |
0 | 643 |
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
|
644 |
} else if (!memcmp(str, "ownname ", 8)) { |
0 | 645 |
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
|
646 |
} 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
|
647 |
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
|
648 |
} else if (!memcmp(str, "plural ", 7)) { |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
649 |
_lang_pluralform = atoi(str + 7); |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
650 |
if (_lang_pluralform >= lengthof(_plural_form_counts)) |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
651 |
error("Invalid pluralform %d", _lang_pluralform); |
2084
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
652 |
} 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
|
653 |
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
|
654 |
|
2952 | 655 |
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
|
656 |
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
|
657 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
658 |
if (s == NULL) break; |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
659 |
if (_numgenders >= MAX_NUM_GENDER) error("Too many genders, max %d", MAX_NUM_GENDER); |
2087 | 660 |
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
|
661 |
_numgenders++; |
65639f898a50
(svn r2594) Fix: [strgen] Misc updates to the string system.
ludde
parents:
2082
diff
changeset
|
662 |
} |
2087 | 663 |
} 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
|
664 |
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
|
665 |
|
2952 | 666 |
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
|
667 |
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
|
668 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
669 |
if (s == NULL) break; |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
670 |
if (_numcases >= MAX_NUM_CASES) error("Too many cases, max %d", MAX_NUM_CASES); |
2087 | 671 |
ttd_strlcpy(_cases[_numcases], s, sizeof(_cases[_numcases])); |
672 |
_numcases++; |
|
673 |
} |
|
0 | 674 |
} else { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
675 |
error("unknown pragma '%s'", str); |
0 | 676 |
} |
677 |
} |
|
678 |
||
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
|
679 |
static void ExtractCommandString(ParsedCommandStruct* p, const char* s, bool warnings) |
0 | 680 |
{ |
681 |
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
|
682 |
int argno; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
683 |
int argidx = 0; |
2087 | 684 |
int casei; |
0 | 685 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
686 |
memset(p, 0, sizeof(*p)); |
0 | 687 |
|
2952 | 688 |
for (;;) { |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
689 |
// 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
|
690 |
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
|
691 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
692 |
if (ar == NULL) break; |
0 | 693 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
694 |
// Sanity checking |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
695 |
if (argno != -1 && ar->consumes == 0) error("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
|
696 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
697 |
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
|
698 |
if (argno != -1) argidx = argno; |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
699 |
if (argidx < 0 || argidx >= lengthof(p->cmd)) error("invalid param idx %d", argidx); |
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
700 |
if (p->cmd[argidx] != NULL && p->cmd[argidx] != ar) error("duplicate param idx %d", argidx); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
701 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
702 |
p->cmd[argidx++] = ar; |
2087 | 703 |
} else if (!(ar->flags & C_DONTCOUNT)) { // Ignore some of them |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
704 |
if (p->np >= lengthof(p->pairs)) error("too many commands in string, max %d", lengthof(p->pairs)); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
705 |
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
|
706 |
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
|
707 |
p->np++; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
708 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
709 |
} |
0 | 710 |
} |
711 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
712 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
713 |
static const CmdStruct *TranslateCmdForCompare(const CmdStruct *a) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
714 |
{ |
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
|
715 |
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
|
716 |
|
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 |
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
|
718 |
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
|
719 |
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
|
720 |
strcmp(a->cmd, "STRING4") == 0 || |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9111
diff
changeset
|
721 |
strcmp(a->cmd, "STRING5") == 0 || |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9111
diff
changeset
|
722 |
strcmp(a->cmd, "RAW_STRING") == 0){ |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
723 |
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
|
724 |
} |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
725 |
|
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
|
726 |
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
|
727 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
728 |
return a; |
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 |
|
2069
30294fb11fc1
(svn r2579) Change some strgen errors into warnings to prevent build from stopping.
ludde
parents:
2063
diff
changeset
|
732 |
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
|
733 |
{ |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
734 |
ParsedCommandStruct templ; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
735 |
ParsedCommandStruct lang; |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6248
diff
changeset
|
736 |
int i, j; |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
737 |
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
|
738 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
739 |
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
|
740 |
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
|
741 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
742 |
// 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
|
743 |
if (templ.np != lang.np) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
744 |
strgen_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
|
745 |
result = false; |
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 |
|
2952 | 748 |
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
|
749 |
// 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
|
750 |
bool found = false; |
2952 | 751 |
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
|
752 |
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
|
753 |
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
|
754 |
// 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
|
755 |
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
|
756 |
found = true; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
757 |
break; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
758 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
759 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
760 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
761 |
if (!found) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
762 |
strgen_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
|
763 |
result = false; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
764 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
765 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
766 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
767 |
// 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
|
768 |
// Check if the non consumer commands match up also. |
2952 | 769 |
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
|
770 |
if (TranslateCmdForCompare(templ.cmd[i]) != TranslateCmdForCompare(lang.cmd[i])) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
771 |
strgen_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
|
772 |
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
|
773 |
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
|
774 |
result = false; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
775 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
776 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
777 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
778 |
return result; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
779 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
780 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
781 |
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
|
782 |
{ |
8969
6d1c74e0e2cd
(svn r12761) -Codechange: lots of minor whitespace coding style fixes around operators.
rubidium
parents:
8812
diff
changeset
|
783 |
char *s, *t; |
2087 | 784 |
LangString *ent; |
785 |
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
|
786 |
|
0 | 787 |
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
|
788 |
if (str[1] == '#' && str[2] != '#') HandlePragma(str + 2); |
0 | 789 |
return; |
790 |
} |
|
791 |
||
792 |
// 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
|
793 |
if (*str == ';' || *str == ' ' || *str == '\0') return; |
0 | 794 |
|
795 |
s = strchr(str, ':'); |
|
796 |
if (s == NULL) { |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
797 |
strgen_error("Line has no ':' delimiter"); |
0 | 798 |
return; |
799 |
} |
|
800 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
801 |
// Trim spaces. |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
802 |
// 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
|
803 |
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
|
804 |
*t = 0; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
805 |
s++; |
0 | 806 |
|
5111
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
807 |
/* Check string is valid UTF-8 */ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
808 |
{ |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
809 |
const char *tmp; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
810 |
for (tmp = s; *tmp != '\0';) { |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
811 |
size_t len = Utf8Validate(tmp); |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
812 |
if (len == 0) error("Invalid UTF-8 sequence in '%s'", s); |
5111
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
813 |
tmp += len; |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
814 |
} |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
815 |
} |
ee7472776a4d
(svn r7185) -Codechange: Make strgen validate strings for UTF-8 well-formed-ness-ness
peter1138
parents:
5108
diff
changeset
|
816 |
|
2087 | 817 |
// Check if the string has a case.. |
818 |
// The syntax for cases is IDENTNAME.case |
|
819 |
casep = strchr(str, '.'); |
|
820 |
if (casep) *casep++ = 0; |
|
821 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
822 |
// 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
|
823 |
ent = HashFind(str); |
0 | 824 |
|
825 |
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
|
826 |
if (ent != NULL && casep == NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
827 |
strgen_error("String name '%s' is used multiple times", str); |
0 | 828 |
return; |
829 |
} |
|
830 |
||
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
|
831 |
if (ent == NULL && casep != NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
832 |
strgen_error("Base string name '%s' doesn't exist yet. Define it before defining a case.", str); |
0 | 833 |
return; |
834 |
} |
|
835 |
||
2087 | 836 |
if (ent == NULL) { |
837 |
if (_strings[_next_string_id]) { |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
838 |
strgen_error("String ID 0x%X for '%s' already in use by '%s'", ent, str, _strings[_next_string_id]->name); |
2087 | 839 |
return; |
840 |
} |
|
841 |
||
842 |
// Allocate a new LangString |
|
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
843 |
ent = CallocT<LangString>(1); |
2087 | 844 |
_strings[_next_string_id] = ent; |
845 |
ent->index = _next_string_id++; |
|
846 |
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
|
847 |
ent->line = _cur_line; |
2087 | 848 |
|
849 |
HashAdd(str, ent); |
|
850 |
} |
|
851 |
||
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
|
852 |
if (casep != NULL) { |
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
853 |
Case* c = MallocT<Case>(1); |
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
|
854 |
|
2087 | 855 |
c->caseidx = ResolveCaseName(casep, strlen(casep)); |
856 |
c->string = strdup(s); |
|
857 |
c->next = ent->english_case; |
|
858 |
ent->english_case = c; |
|
859 |
} else { |
|
860 |
ent->english = strdup(s); |
|
861 |
} |
|
862 |
||
0 | 863 |
} else { |
2087 | 864 |
if (ent == NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
865 |
strgen_warning("String name '%s' does not exist in master file", str); |
0 | 866 |
return; |
867 |
} |
|
868 |
||
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
|
869 |
if (ent->translated && casep == NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
870 |
strgen_error("String name '%s' is used multiple times", str); |
0 | 871 |
return; |
872 |
} |
|
873 |
||
2087 | 874 |
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
|
875 |
// Special syntax :: means we should just inherit the master string |
2087 | 876 |
ent->translated = strdup(ent->english); |
0 | 877 |
} else { |
2087 | 878 |
// 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
|
879 |
if (!CheckCommandsMatch(s, ent->english, str)) return; |
2087 | 880 |
|
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
|
881 |
if (casep != NULL) { |
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
882 |
Case* c = MallocT<Case>(1); |
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
|
883 |
|
2087 | 884 |
c->caseidx = ResolveCaseName(casep, strlen(casep)); |
885 |
c->string = strdup(s); |
|
886 |
c->next = ent->translated_case; |
|
887 |
ent->translated_case = c; |
|
888 |
} else { |
|
889 |
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
|
890 |
} |
0 | 891 |
} |
892 |
} |
|
893 |
} |
|
894 |
||
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 |
static void rstrip(char *buf) |
0 | 897 |
{ |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
898 |
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
|
899 |
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
|
900 |
buf[i] = '\0'; |
0 | 901 |
} |
902 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
903 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
904 |
static void ParseFile(const char *file, bool english) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
905 |
{ |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
906 |
FILE *in; |
0 | 907 |
char buf[2048]; |
908 |
||
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
|
909 |
_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
|
910 |
|
5725
0ec667093bc1
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
Darkvater
parents:
5609
diff
changeset
|
911 |
/* For each new file we parse, reset the genders, and language codes */ |
2087 | 912 |
_numgenders = 0; |
5725
0ec667093bc1
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
Darkvater
parents:
5609
diff
changeset
|
913 |
_lang_name[0] = _lang_ownname[0] = _lang_isocode[0] = '\0'; |
2087 | 914 |
// TODO:!! We can't reset the cases. In case the translated strings |
915 |
// derive some strings from english.... |
|
916 |
||
0 | 917 |
in = fopen(file, "r"); |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
918 |
if (in == NULL) error("Cannot open file"); |
0 | 919 |
_cur_line = 1; |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6248
diff
changeset
|
920 |
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
|
921 |
rstrip(buf); |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
922 |
HandleString(buf, english); |
0 | 923 |
_cur_line++; |
924 |
} |
|
925 |
fclose(in); |
|
5725
0ec667093bc1
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
Darkvater
parents:
5609
diff
changeset
|
926 |
|
0ec667093bc1
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
Darkvater
parents:
5609
diff
changeset
|
927 |
if (StrEmpty(_lang_name) || StrEmpty(_lang_ownname) || StrEmpty(_lang_isocode)) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
928 |
error("Language must include ##name, ##ownname and ##isocode"); |
5725
0ec667093bc1
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
Darkvater
parents:
5609
diff
changeset
|
929 |
} |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
930 |
} |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
931 |
|
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
932 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
933 |
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
|
934 |
{ |
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
|
935 |
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
|
936 |
hash = ROL(hash, 3) ^ *s; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3900
diff
changeset
|
937 |
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
|
938 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
939 |
return hash; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
940 |
} |
0 | 941 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
942 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
943 |
// make a hash of the file to get a unique "version number" |
6247 | 944 |
static void MakeHashOfStrings() |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
945 |
{ |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
946 |
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
|
947 |
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
|
948 |
|
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
|
949 |
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
|
950 |
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
|
951 |
|
f91a1b8fba79
(svn r3595) Several small cleanups, the only notable are some additional symbolic names for a few ISO8859 characters
tron
parents:
2952
diff
changeset
|
952 |
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
|
953 |
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
|
954 |
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
|
955 |
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
|
956 |
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
|
957 |
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
|
958 |
|
2087 | 959 |
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
|
960 |
hash ^= i * 0x717239; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3900
diff
changeset
|
961 |
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
|
962 |
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
|
963 |
|
2087 | 964 |
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
|
965 |
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
|
966 |
if (cs->flags & C_DONTCOUNT) continue; |
2087 | 967 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
968 |
hash ^= (cs - _cmd_structs) * 0x1234567; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3900
diff
changeset
|
969 |
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
|
970 |
} |
0 | 971 |
} |
972 |
} |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
973 |
_hash = hash; |
0 | 974 |
} |
975 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
976 |
|
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
|
977 |
static uint CountInUse(uint grp) |
2059
6446d0b23ddc
(svn r2568) Small cleanup in strgen: static, bracing, ...
tron
parents:
2057
diff
changeset
|
978 |
{ |
0 | 979 |
int i; |
980 |
||
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
|
981 |
for (i = 0x800; --i >= 0;) if (_strings[(grp << 11) + i] != NULL) break; |
0 | 982 |
return i + 1; |
983 |
} |
|
984 |
||
985 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
986 |
bool CompareFiles(const char *n1, const char *n2) |
0 | 987 |
{ |
988 |
FILE *f1, *f2; |
|
989 |
char b1[4096]; |
|
990 |
char b2[4096]; |
|
991 |
size_t l1, l2; |
|
992 |
||
993 |
f2 = fopen(n2, "rb"); |
|
994 |
if (f2 == NULL) return false; |
|
995 |
||
996 |
f1 = fopen(n1, "rb"); |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
997 |
if (f1 == NULL) error("can't open %s", n1); |
0 | 998 |
|
999 |
do { |
|
1000 |
l1 = fread(b1, 1, sizeof(b1), f1); |
|
1001 |
l2 = fread(b2, 1, sizeof(b2), f2); |
|
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 (l1 != l2 || memcmp(b1, b2, l1)) { |
0 | 1004 |
fclose(f2); |
1005 |
fclose(f1); |
|
1006 |
return false; |
|
1007 |
} |
|
1008 |
} while (l1); |
|
1009 |
||
1010 |
fclose(f2); |
|
1011 |
fclose(f1); |
|
1012 |
return true; |
|
1013 |
} |
|
1014 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1015 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1016 |
static void WriteStringsH(const char *filename) |
0 | 1017 |
{ |
1018 |
FILE *out; |
|
1019 |
int i; |
|
1020 |
int next = -1; |
|
1021 |
||
1022 |
out = fopen("tmp.xxx", "w"); |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1023 |
if (out == NULL) error("can't open tmp.xxx"); |
0 | 1024 |
|
7393
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1025 |
fprintf(out, "/* This file is automatically generated. Do not modify */\n\n"); |
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1026 |
fprintf(out, "#ifndef TABLE_STRINGS_H\n"); |
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1027 |
fprintf(out, "#define TABLE_STRINGS_H\n"); |
0 | 1028 |
|
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
|
1029 |
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
|
1030 |
if (_strings[i] != NULL) { |
7393
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1031 |
if (next != i) fprintf(out, "\n"); |
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1032 |
fprintf(out, "static const StringID %s = 0x%X;\n", _strings[i]->name, i); |
0 | 1033 |
next = i + 1; |
1034 |
} |
|
1035 |
} |
|
1036 |
||
7755
7038d5001e0a
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
7393
diff
changeset
|
1037 |
fprintf(out, "\nstatic const StringID STR_LAST_STRINGID = 0x%X;\n", next - 1); |
7038d5001e0a
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
7393
diff
changeset
|
1038 |
|
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
|
1039 |
fprintf(out, |
0 | 1040 |
"\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
|
1041 |
"\tLANGUAGE_PACK_IDENT = 0x474E414C, // Big Endian value for 'LANG' (LE is 0x 4C 41 4E 47)\n" |
0 | 1042 |
"\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
|
1043 |
"};\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
|
1044 |
); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1045 |
|
7393
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1046 |
fprintf(out, "\n#endif /* TABLE_STRINGS_H */\n"); |
f3d27c82fec3
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
peter1138
parents:
7110
diff
changeset
|
1047 |
|
0 | 1048 |
fclose(out); |
1049 |
||
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1050 |
if (CompareFiles("tmp.xxx", filename)) { |
0 | 1051 |
// files are equal. tmp.xxx is not needed |
1052 |
unlink("tmp.xxx"); |
|
1053 |
} else { |
|
1054 |
// 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
|
1055 |
#if defined(WIN32) || defined(WIN64) |
0 | 1056 |
unlink(filename); |
1057 |
#endif |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1058 |
if (rename("tmp.xxx", filename) == -1) error("rename() failed"); |
0 | 1059 |
} |
1060 |
} |
|
1061 |
||
2087 | 1062 |
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
|
1063 |
{ |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1064 |
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
|
1065 |
|
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1066 |
if (argidx < 0 || argidx >= lengthof(_cur_pcs.cmd)) |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1067 |
error("invalid argidx %d", argidx); |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1068 |
|
2952 | 1069 |
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
|
1070 |
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
|
1071 |
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
|
1072 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1073 |
|
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1074 |
return sum; |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1075 |
} |
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1076 |
|
6247 | 1077 |
static void PutArgidxCommand() |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1078 |
{ |
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
1079 |
PutUtf8(SCC_ARG_INDEX); |
2087 | 1080 |
PutByte(TranslateArgumentIdx(_cur_argidx)); |
1081 |
} |
|
1082 |
||
1083 |
||
1084 |
static void PutCommandString(const char *str) |
|
1085 |
{ |
|
1086 |
const CmdStruct *cs; |
|
1087 |
char param[256]; |
|
1088 |
int argno; |
|
1089 |
int casei; |
|
1090 |
||
1091 |
_cur_argidx = 0; |
|
1092 |
||
1093 |
while (*str != '\0') { |
|
1094 |
// Process characters as they are until we encounter a { |
|
1095 |
if (*str != '{') { |
|
1096 |
PutByte(*str++); |
|
1097 |
continue; |
|
1098 |
} |
|
1099 |
cs = ParseCommandString(&str, param, &argno, &casei); |
|
1100 |
if (cs == NULL) break; |
|
1101 |
||
1102 |
if (casei != -1) { |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
1103 |
PutUtf8(SCC_SETCASE); // {SETCASE} |
2087 | 1104 |
PutByte(casei); |
1105 |
} |
|
1106 |
||
1107 |
// 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
|
1108 |
if (cs->consumes > 0) { |
2087 | 1109 |
// 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
|
1110 |
if (argno != -1 && argno != _cur_argidx) { |
2087 | 1111 |
_cur_argidx = argno; |
1112 |
PutArgidxCommand(); |
|
1113 |
} |
|
1114 |
||
1115 |
// Output the one from the master string... it's always accurate. |
|
1116 |
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
|
1117 |
if (cs == NULL) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1118 |
error("%s: No argument exists at position %d", _cur_ident, _cur_argidx - 1); |
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
|
1119 |
} |
2087 | 1120 |
} |
1121 |
||
1122 |
cs->proc(param, cs->value); |
|
1123 |
} |
|
1124 |
} |
|
1125 |
||
1126 |
static void WriteLength(FILE *f, uint length) |
|
1127 |
{ |
|
1128 |
if (length < 0xC0) { |
|
1129 |
fputc(length, f); |
|
1130 |
} else if (length < 0x4000) { |
|
1131 |
fputc((length >> 8) | 0xC0, f); |
|
1132 |
fputc(length & 0xFF, f); |
|
1133 |
} else { |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1134 |
error("string too long"); |
2087 | 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 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1137 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1138 |
|
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1139 |
static void WriteLangfile(const char *filename) |
0 | 1140 |
{ |
1141 |
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
|
1142 |
uint in_use[32]; |
0 | 1143 |
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
|
1144 |
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
|
1145 |
uint j; |
0 | 1146 |
|
1147 |
f = fopen(filename, "wb"); |
|
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1148 |
if (f == NULL) error("can't open %s", filename); |
0 | 1149 |
|
1150 |
memset(&hdr, 0, sizeof(hdr)); |
|
2952 | 1151 |
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
|
1152 |
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
|
1153 |
|
0 | 1154 |
in_use[i] = n; |
1155 |
hdr.offsets[i] = TO_LE16(n); |
|
1156 |
} |
|
1157 |
||
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
|
1158 |
// 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
|
1159 |
hdr.ident = TO_LE32(0x474E414C); // Big Endian value for 'LANG' |
0 | 1160 |
hdr.version = TO_LE32(_hash); |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1161 |
hdr.plural_form = _lang_pluralform; |
0 | 1162 |
strcpy(hdr.name, _lang_name); |
1163 |
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
|
1164 |
strcpy(hdr.isocode, _lang_isocode); |
0 | 1165 |
|
1166 |
fwrite(&hdr, sizeof(hdr), 1, f); |
|
1167 |
||
2952 | 1168 |
for (i = 0; i != 32; i++) { |
1169 |
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
|
1170 |
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
|
1171 |
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
|
1172 |
const char* cmdp; |
0 | 1173 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1174 |
// For undefined strings, just set that it's an empty string |
2087 | 1175 |
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
|
1176 |
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
|
1177 |
continue; |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1178 |
} |
0 | 1179 |
|
2087 | 1180 |
_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
|
1181 |
_cur_line = ls->line; |
2082
1e289843fe0b
(svn r2592) Feature: [strgen] New way to specify plural forms.
ludde
parents:
2069
diff
changeset
|
1182 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1183 |
// Produce a message if a string doesn't have a translation. |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1184 |
if (_show_todo > 0 && ls->translated == NULL) { |
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1185 |
if ((_show_todo & 2) != 0) { |
8983
ea20f3cd2165
(svn r12777) -Codechange: rename fatal() and error() in strgen, so it can always have the NORETURN attribute
smatz
parents:
8969
diff
changeset
|
1186 |
strgen_warning("'%s' is untranslated", ls->name); |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1187 |
} |
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1188 |
if ((_show_todo & 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
|
1189 |
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
|
1190 |
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
|
1191 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1192 |
} |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1193 |
|
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1194 |
// Extract the strings and stuff from the english command string |
2087 | 1195 |
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
|
1196 |
|
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
|
1197 |
if (ls->translated_case != NULL || ls->translated != NULL) { |
2087 | 1198 |
casep = ls->translated_case; |
1199 |
cmdp = ls->translated; |
|
1200 |
} else { |
|
1201 |
casep = ls->english_case; |
|
1202 |
cmdp = ls->english; |
|
1203 |
} |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1204 |
|
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
|
1205 |
_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
|
1206 |
|
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
|
1207 |
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
|
1208 |
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
|
1209 |
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
|
1210 |
|
2087 | 1211 |
// Need to output a case-switch. |
1212 |
// It has this format |
|
1213 |
// <0x9E> <NUM CASES> <CASE1> <LEN1> <STRING1> <CASE2> <LEN2> <STRING2> <CASE3> <LEN3> <STRING3> <STRINGDEFAULT> |
|
1214 |
// Each LEN is printed using 2 bytes in big endian order. |
|
5108
aeaef6fe53b7
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4922
diff
changeset
|
1215 |
PutUtf8(SCC_SWITCH_CASE); |
2087 | 1216 |
// Count the number of cases |
2952 | 1217 |
for (num = 0, c = casep; c; c = c->next) num++; |
2087 | 1218 |
PutByte(num); |
1219 |
||
1220 |
// 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
|
1221 |
for (c = casep; c != NULL; c = c->next) { |
2087 | 1222 |
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
|
1223 |
|
2087 | 1224 |
PutByte(c->caseidx); |
1225 |
// Make some space for the 16-bit length |
|
1226 |
pos = _put_pos; |
|
1227 |
PutByte(0); |
|
1228 |
PutByte(0); |
|
1229 |
// Write string |
|
1230 |
PutCommandString(c->string); |
|
1231 |
PutByte(0); // terminate with a zero |
|
1232 |
// 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
|
1233 |
_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
|
1234 |
_put_buf[pos + 1] = GB(_put_pos - (pos + 2), 0, 8); |
0 | 1235 |
} |
2087 | 1236 |
} |
0 | 1237 |
|
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
|
1238 |
if (cmdp != NULL) PutCommandString(cmdp); |
0 | 1239 |
|
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1240 |
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
|
1241 |
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
|
1242 |
_put_pos = 0; |
0 | 1243 |
} |
1244 |
} |
|
1245 |
||
1246 |
fputc(0, f); |
|
1247 |
fclose(f); |
|
1248 |
} |
|
1249 |
||
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1250 |
/** Multi-OS mkdirectory function */ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1251 |
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
|
1252 |
{ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1253 |
#if defined(WIN32) || defined(__WATCOMC__) |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1254 |
mkdir(directory); |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1255 |
#else |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1256 |
mkdir(directory, 0755); |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1257 |
#endif |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1258 |
} |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1259 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1260 |
/** 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
|
1261 |
* 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
|
1262 |
* 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
|
1263 |
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
|
1264 |
{ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1265 |
char *p; |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1266 |
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
|
1267 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1268 |
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
|
1269 |
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
|
1270 |
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
|
1271 |
return buf; |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1272 |
} |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1273 |
|
5503
036e83e9083a
(svn r7796) -Fix (r7759): cygwin does not need to rewrite the paths for strgen.
rubidium
parents:
5475
diff
changeset
|
1274 |
#if defined(__MINGW32__) |
4379
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1275 |
/** |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1276 |
* 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
|
1277 |
* 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
|
1278 |
* 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
|
1279 |
*/ |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1280 |
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
|
1281 |
{ |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1282 |
char *c; |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1283 |
|
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1284 |
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
|
1285 |
return s; |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1286 |
} |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1287 |
#else |
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1288 |
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
|
1289 |
#endif |
2063
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1290 |
|
250
733e18ca6e93
(svn r251) -Project ready for 0.3.4 release. Updated installer, readme and fileinformation
darkvater
parents:
236
diff
changeset
|
1291 |
int CDECL main(int argc, char* argv[]) |
0 | 1292 |
{ |
8812
4fd6de597c6e
(svn r12557) -Cleanup: use MAX_PATH at two more places
smatz
parents:
8733
diff
changeset
|
1293 |
char pathbuf[MAX_PATH]; |
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1294 |
const char *src_dir = "."; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1295 |
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
|
1296 |
|
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1297 |
while (argc > 1 && *argv[1] == '-') { |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1298 |
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
|
1299 |
puts("$Revision$"); |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1300 |
return 0; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1301 |
} |
0 | 1302 |
|
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1303 |
if (strcmp(argv[1], "-t") == 0 || strcmp(argv[1], "--todo") == 0) { |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1304 |
_show_todo |= 1; |
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1305 |
argc--, argv++; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1306 |
continue; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1307 |
} |
0 | 1308 |
|
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1309 |
if (strcmp(argv[1], "-w") == 0 || strcmp(argv[1], "--warning") == 0) { |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1310 |
_show_todo |= 2; |
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1311 |
argc--, argv++; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1312 |
continue; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1313 |
} |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1314 |
|
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1315 |
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
|
1316 |
puts( |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1317 |
"strgen - $Revision$\n" |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1318 |
" -v | --version print version information and exit\n" |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1319 |
" -t | --todo replace any untranslated strings with '<TODO>'\n" |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1320 |
" -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
|
1321 |
" -h | -? | --help print this help message and exit\n" |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1322 |
" -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
|
1323 |
" -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
|
1324 |
" 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
|
1325 |
" 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
|
1326 |
" 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
|
1327 |
); |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1328 |
return 0; |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1329 |
} |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1330 |
|
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1331 |
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
|
1332 |
src_dir = replace_pathsep(argv[2]); |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1333 |
argc -= 2, argv += 2; |
4464
08e89a8faa09
(svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents:
4461
diff
changeset
|
1334 |
continue; |
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1335 |
} |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1336 |
|
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1337 |
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
|
1338 |
dest_dir = replace_pathsep(argv[2]); |
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1339 |
argc -= 2, argv += 2; |
4464
08e89a8faa09
(svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents:
4461
diff
changeset
|
1340 |
continue; |
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1341 |
} |
4464
08e89a8faa09
(svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents:
4461
diff
changeset
|
1342 |
|
08e89a8faa09
(svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents:
4461
diff
changeset
|
1343 |
fprintf(stderr, "Invalid arguments\n"); |
08e89a8faa09
(svn r6247) -Fix(r6244): invalid arguments caused infinite loop
glx
parents:
4461
diff
changeset
|
1344 |
return 0; |
0 | 1345 |
} |
1346 |
||
4461
905cb9ca6fe5
(svn r6244) -Fix: allow any order for strgen parameters
glx
parents:
4447
diff
changeset
|
1347 |
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
|
1348 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1349 |
/* 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
|
1350 |
* 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
|
1351 |
* 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
|
1352 |
* directory. As input english.txt is parsed from the source directory */ |
0 | 1353 |
if (argc == 1) { |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1354 |
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
|
1355 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1356 |
/* 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
|
1357 |
_masterlang = true; |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1358 |
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
|
1359 |
MakeHashOfStrings(); |
ae866a12f2df
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
ludde
parents:
2060
diff
changeset
|
1360 |
if (_errors) return 1; |
0 | 1361 |
|
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1362 |
/* write strings.h */ |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1363 |
ottd_mkdir(dest_dir); |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1364 |
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
|
1365 |
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
|
1366 |
} else if (argc == 2) { |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1367 |
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
|
1368 |
|
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1369 |
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
|
1370 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1371 |
/* 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
|
1372 |
_masterlang = false; |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1373 |
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
|
1374 |
MakeHashOfStrings(); |
4379
96eb926dcc1d
(svn r6117) -Fix r6097: on mingw it is normal that both / as \ are accepted as input
truelight
parents:
4373
diff
changeset
|
1375 |
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
|
1376 |
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
|
1377 |
|
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1378 |
/* 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
|
1379 |
r = strrchr(argv[1], PATHSEPCHAR); |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1380 |
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
|
1381 |
|
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1382 |
/* 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
|
1383 |
r = strrchr(pathbuf, '.'); |
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1384 |
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
|
1385 |
ttd_strlcpy(r, ".lng", (size_t)(r - pathbuf)); |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1386 |
WriteLangfile(pathbuf); |
5360
d87dfdb62e5a
(svn r7540) -Codechange: Print a summary of the number of errors/warnings of a language when strgen is run with the -w flag.
Darkvater
parents:
5111
diff
changeset
|
1387 |
|
d87dfdb62e5a
(svn r7540) -Codechange: Print a summary of the number of errors/warnings of a language when strgen is run with the -w flag.
Darkvater
parents:
5111
diff
changeset
|
1388 |
/* if showing warnings, print a summary of the language */ |
7110
bda0a45e30e5
(svn r10382) -Fix (strgen): it was not possible to use --warning and --todo at the same time.
rubidium
parents:
7059
diff
changeset
|
1389 |
if ((_show_todo & 2) != 0) { |
5442
577bf6b7da95
(svn r7693) -Codechange (r7540): print a newline after the summary (strgen).
Darkvater
parents:
5360
diff
changeset
|
1390 |
fprintf(stdout, "%d warnings and %d errors for %s\n", _warnings, _errors, pathbuf); |
5360
d87dfdb62e5a
(svn r7540) -Codechange: Print a summary of the number of errors/warnings of a language when strgen is run with the -w flag.
Darkvater
parents:
5111
diff
changeset
|
1391 |
} |
0 | 1392 |
} else { |
4370
5beb8896ae3d
(svn r6089) -Backport r6088: added -s (source) and -d (destination) to strgen (Darkvater)
truelight
parents:
4344
diff
changeset
|
1393 |
fprintf(stderr, "Invalid arguments\n"); |
0 | 1394 |
} |
1395 |
||
1396 |
return 0; |
|
1397 |
} |