summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-31 19:06:45 (UTC)
committer zecke <zecke>2003-08-31 19:06:45 (UTC)
commit2696413e75a401899764f244c8c24026999fdb9d (patch) (unidiff)
tree630522a33052ea7d337bc76f624be0d7e142ff04
parentce4a99860d28e003871994cca88a82133c1921a7 (diff)
downloadopie-2696413e75a401899764f244c8c24026999fdb9d.zip
opie-2696413e75a401899764f244c8c24026999fdb9d.tar.gz
opie-2696413e75a401899764f244c8c24026999fdb9d.tar.bz2
recognize i18n as well
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--development/translation/opie-lupdate/fetchtr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/development/translation/opie-lupdate/fetchtr.cpp b/development/translation/opie-lupdate/fetchtr.cpp
index eb25555..d1f5881 100644
--- a/development/translation/opie-lupdate/fetchtr.cpp
+++ b/development/translation/opie-lupdate/fetchtr.cpp
@@ -147,64 +147,67 @@ static int getToken()
147 147
148 switch ( yyIdent[0] ) { 148 switch ( yyIdent[0] ) {
149 case 'Q': 149 case 'Q':
150 if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) { 150 if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) {
151 return Tok_Q_OBJECT; 151 return Tok_Q_OBJECT;
152 } else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) { 152 } else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) {
153 return Tok_tr; 153 return Tok_tr;
154 } else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) { 154 } else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) {
155 return Tok_translate; 155 return Tok_translate;
156 } 156 }
157 break; 157 break;
158 case 'T': 158 case 'T':
159 // TR() for when all else fails 159 // TR() for when all else fails
160 if ( qstricmp(yyIdent + 1, "R") == 0 ) 160 if ( qstricmp(yyIdent + 1, "R") == 0 )
161 return Tok_tr; 161 return Tok_tr;
162 break; 162 break;
163 case 'c': 163 case 'c':
164 if ( strcmp(yyIdent + 1, "lass") == 0 ) 164 if ( strcmp(yyIdent + 1, "lass") == 0 )
165 return Tok_class; 165 return Tok_class;
166 break; 166 break;
167 case 'n': 167 case 'n':
168 if ( strcmp(yyIdent + 1, "amespace") == 0 ) 168 if ( strcmp(yyIdent + 1, "amespace") == 0 )
169 return Tok_namespace; 169 return Tok_namespace;
170 break; 170 break;
171 case 'r': 171 case 'r':
172 if ( strcmp(yyIdent + 1, "eturn") == 0 ) 172 if ( strcmp(yyIdent + 1, "eturn") == 0 )
173 return Tok_return; 173 return Tok_return;
174 break; 174 break;
175 case 's': 175 case 's':
176 if ( strcmp(yyIdent + 1, "truct") == 0 ) 176 if ( strcmp(yyIdent + 1, "truct") == 0 )
177 return Tok_class; 177 return Tok_class;
178 break; 178 break;
179 case 'i':
180 if( strcmp(yyIdent + 1, "18n") == 0 )
181 return Tok_tr;
179 case 't': 182 case 't':
180 if ( strcmp(yyIdent + 1, "r") == 0 ) { 183 if ( strcmp(yyIdent + 1, "r") == 0 ) {
181 return Tok_tr; 184 return Tok_tr;
182 } else if ( qstrcmp(yyIdent + 1, "rUtf8") == 0 ) { 185 } else if ( qstrcmp(yyIdent + 1, "rUtf8") == 0 ) {
183 return Tok_trUtf8; 186 return Tok_trUtf8;
184 } else if ( qstrcmp(yyIdent + 1, "ranslate") == 0 ) { 187 } else if ( qstrcmp(yyIdent + 1, "ranslate") == 0 ) {
185 return Tok_translate; 188 return Tok_translate;
186 } 189 }
187 } 190 }
188 return Tok_Ident; 191 return Tok_Ident;
189 } else { 192 } else {
190 switch ( yyCh ) { 193 switch ( yyCh ) {
191 case '#': 194 case '#':
192 /* 195 /*
193 Early versions of lupdate complained about 196 Early versions of lupdate complained about
194 unbalanced braces in the following code: 197 unbalanced braces in the following code:
195 198
196 #ifdef ALPHA 199 #ifdef ALPHA
197 while ( beta ) { 200 while ( beta ) {
198 #else 201 #else
199 while ( gamma ) { 202 while ( gamma ) {
200 #endif 203 #endif
201 delta; 204 delta;
202 } 205 }
203 206
204 The code contains, indeed, two opening braces for 207 The code contains, indeed, two opening braces for
205 one closing brace; yet there's no reason to panic. 208 one closing brace; yet there's no reason to panic.
206 209
207 The solution is to remember yyBraceDepth as it was 210 The solution is to remember yyBraceDepth as it was
208 when #if, #ifdef or #ifndef was met, and to set 211 when #if, #ifdef or #ifndef was met, and to set
209 yyBraceDepth to that value when meeting #elif or 212 yyBraceDepth to that value when meeting #elif or
210 #else. 213 #else.