if (msgctxt == NULL && msgid[0] == '\0' && !obsolete)
po_lex_charset_set (msgstr, gram_pos.file_name, ps->gram_pot_role);
- po_callback_message (ps->catr,
- msgctxt,
- msgid, msgid_pos, msgid_plural,
- msgstr, msgstr_len, msgstr_pos,
- prev_msgctxt, prev_msgid, prev_msgid_plural,
- false, obsolete);
+ catalog_reader_seen_message (ps->catr,
+ msgctxt,
+ msgid, msgid_pos, msgid_plural,
+ msgstr, msgstr_len, msgstr_pos,
+ prev_msgctxt, prev_msgid, prev_msgid_plural,
+ false, obsolete);
}
#define free_message_intro(value) \
comment
: COMMENT
{
- po_callback_comment_dispatcher (ps->catr, $1.string);
+ catalog_reader_seen_generic_comment (ps->catr, $1.string);
}
;
domain
: DOMAIN STRING
{
- po_callback_domain (ps->catr, $2.string);
+ catalog_reader_seen_domain (ps->catr, $2.string);
}
;
/* ========================================================================= */
-/* Callbacks used by po-gram.y or po-lex.c, indirectly from
- catalog_reader_parse. */
+/* Callbacks used by po-gram-gen.y, read-properties.c, read-stringtable.c,
+ indirectly from catalog_reader_parse. */
-/* This function is called by po_gram_lex() whenever a domain directive
- has been seen. */
void
-po_callback_domain (abstract_catalog_reader_ty *catr, char *name)
+catalog_reader_seen_domain (abstract_catalog_reader_ty *catr, char *name)
{
call_directive_domain (catr, name);
}
-/* This function is called by po_gram_lex() whenever a message has been
- seen. */
void
-po_callback_message (abstract_catalog_reader_ty *catr,
- char *msgctxt,
- char *msgid, lex_pos_ty *msgid_pos, char *msgid_plural,
- char *msgstr, size_t msgstr_len, lex_pos_ty *msgstr_pos,
- char *prev_msgctxt,
- char *prev_msgid,
- char *prev_msgid_plural,
- bool force_fuzzy, bool obsolete)
+catalog_reader_seen_message (abstract_catalog_reader_ty *catr,
+ char *msgctxt,
+ char *msgid, lex_pos_ty *msgid_pos, char *msgid_plural,
+ char *msgstr, size_t msgstr_len, lex_pos_ty *msgstr_pos,
+ char *prev_msgctxt,
+ char *prev_msgid,
+ char *prev_msgid_plural,
+ bool force_fuzzy, bool obsolete)
{
call_directive_message (catr, msgctxt,
msgid, msgid_pos, msgid_plural,
void
-po_callback_comment (abstract_catalog_reader_ty *catr, const char *s)
+catalog_reader_seen_comment (abstract_catalog_reader_ty *catr, const char *s)
{
call_comment (catr, s);
}
void
-po_callback_comment_dot (abstract_catalog_reader_ty *catr, const char *s)
+catalog_reader_seen_comment_dot (abstract_catalog_reader_ty *catr,
+ const char *s)
{
call_comment_dot (catr, s);
}
-/* This function is called by parse_comment_filepos(), once for each
- file name. */
void
-po_callback_comment_filepos (abstract_catalog_reader_ty *catr,
- const char *file_name, size_t line_number)
+catalog_reader_seen_comment_filepos (abstract_catalog_reader_ty *catr,
+ const char *file_name, size_t line_number)
{
call_comment_filepos (catr, file_name, line_number);
}
void
-po_callback_comment_special (abstract_catalog_reader_ty *catr, const char *s)
+catalog_reader_seen_comment_special (abstract_catalog_reader_ty *catr,
+ const char *s)
{
call_comment_special (catr, s);
}
FILENAME
or
U+2068 FILENAME U+2069.
- Call po_callback_comment_filepos for each of them. */
+ Call catalog_reader_seen_comment_filepos for each of them. */
static void
parse_comment_filepos (abstract_catalog_reader_ty *catr, const char *s)
{
memcpy (filename, filename_start, filename_length);
filename[filename_length] = '\0';
- po_callback_comment_filepos (catr, filename, n);
+ catalog_reader_seen_comment_filepos (catr, filename, n);
free (filename);
memcpy (filename, filename_start, filename_length);
filename[filename_length] = '\0';
- po_callback_comment_filepos (catr, filename, n);
+ catalog_reader_seen_comment_filepos (catr, filename, n);
free (filename);
memcpy (filename, filename_start, filename_length);
filename[filename_length] = '\0';
- po_callback_comment_filepos (catr, filename, n);
+ catalog_reader_seen_comment_filepos (catr, filename, n);
free (filename);
memcpy (filename, filename_start, filename_length);
filename[filename_length] = '\0';
- po_callback_comment_filepos (catr, filename, (size_t)(-1));
+ catalog_reader_seen_comment_filepos (catr, filename, (size_t)(-1));
free (filename);
}
memcpy (string, string_start, string_length);
string[string_length] = '\0';
- po_callback_comment_filepos (catr, string, n);
+ catalog_reader_seen_comment_filepos (catr, string, n);
free (string);
return true;
}
-/* This function is called by po_gram_lex() whenever a comment is
- seen. It analyzes the comment to see what sort it is, and then
- dispatches it to the appropriate method: call_comment, call_comment_dot,
- call_comment_filepos (via parse_comment_filepos), or
+/* This callback is called whenever a generic comment line has been seeen.
+ It parses s and invokes the appropriate method: call_comment,
+ call_comment_dot, call_comment_filepos (via parse_comment_filepos), or
call_comment_special. */
void
-po_callback_comment_dispatcher (abstract_catalog_reader_ty *catr, const char *s)
+catalog_reader_seen_generic_comment (abstract_catalog_reader_ty *catr,
+ const char *s)
{
if (*s == '.')
{
consider it part of the comment, therefore remove it here. */
if (*s == ' ')
s++;
- po_callback_comment_dot (catr, s);
+ catalog_reader_seen_comment_dot (catr, s);
}
else if (*s == ':')
{
else if (*s == ',' || *s == '!')
{
/* Get all entries in the special comment line. */
- po_callback_comment_special (catr, s + 1);
+ catalog_reader_seen_comment_special (catr, s + 1);
}
else
{
consider it part of the comment, therefore remove it here. */
if (*s == ' ')
s++;
- po_callback_comment (catr, s);
+ catalog_reader_seen_comment (catr, s);
}
}
}
catalog_reader_free (abstract_catalog_reader_ty *catr);
-/* Callbacks used by po-gram.y or po-lex.c, indirectly from
- catalog_reader_parse. */
-extern void po_callback_domain (abstract_catalog_reader_ty *catr, char *name);
-extern void po_callback_message (abstract_catalog_reader_ty *catr,
- char *msgctxt,
- char *msgid, lex_pos_ty *msgid_pos,
- char *msgid_plural,
- char *msgstr, size_t msgstr_len,
- lex_pos_ty *msgstr_pos,
- char *prev_msgctxt,
- char *prev_msgid, char *prev_msgid_plural,
- bool force_fuzzy, bool obsolete);
-extern void po_callback_comment (abstract_catalog_reader_ty *catr,
- const char *s);
-extern void po_callback_comment_dot (abstract_catalog_reader_ty *catr,
- const char *s);
-extern void po_callback_comment_filepos (abstract_catalog_reader_ty *catr,
- const char *file_name,
- size_t line_number);
-extern void po_callback_comment_special (abstract_catalog_reader_ty *catr,
- const char *s);
-extern void po_callback_comment_dispatcher (abstract_catalog_reader_ty *catr,
+/* Callbacks used by po-gram-gen.y, read-properties.c, read-stringtable.c,
+ indirectly from catalog_reader_parse. */
+/* This callback is called whenever a domain directive has been seen.
+ It invokes the 'directive_domain' method. */
+extern void
+ catalog_reader_seen_domain (abstract_catalog_reader_ty *catr,
+ char *name);
+/* This callback is called whenever a message has been seen.
+ It invokes the 'directive_message' method. */
+extern void
+ catalog_reader_seen_message (abstract_catalog_reader_ty *catr,
+ char *msgctxt,
+ char *msgid, lex_pos_ty *msgid_pos,
+ char *msgid_plural,
+ char *msgstr, size_t msgstr_len,
+ lex_pos_ty *msgstr_pos,
+ char *prev_msgctxt,
+ char *prev_msgid, char *prev_msgid_plural,
+ bool force_fuzzy, bool obsolete);
+/* This callback is called whenever a plain comment (a.k.a. translator comment)
+ has been seen. It invokes the 'comment' method. */
+extern void
+ catalog_reader_seen_comment (abstract_catalog_reader_ty *catr,
+ const char *s);
+/* This callback is called whenever a dot comment (a.k.a. extracted comment)
+ has been seen. It invokes the 'comment_dot' method. */
+extern void
+ catalog_reader_seen_comment_dot (abstract_catalog_reader_ty *catr,
+ const char *s);
+/* This callback is called whenever a source file reference has been seen.
+ It invokes the 'comment_filepos' method. */
+extern void
+ catalog_reader_seen_comment_filepos (abstract_catalog_reader_ty *catr,
+ const char *file_name,
+ size_t line_number);
+/* This callback is called whenever a special comment (#,) has been seen.
+ It invokes the 'comment_special' method. */
+extern void
+ catalog_reader_seen_comment_special (abstract_catalog_reader_ty *catr,
+ const char *s);
+/* This callback is called whenever a generic comment line has been seeen.
+ It parses s and invokes the appropriate method. */
+extern void
+ catalog_reader_seen_generic_comment (abstract_catalog_reader_ty *catr,
const char *s);
}
buffer[buflen] = '\0';
- po_callback_comment_dispatcher (
+ catalog_reader_seen_generic_comment (
catr,
conv_from_java (
assume_utf8 ? buffer : conv_from_iso_8859_1 (buffer)));
and if it is not already header/fuzzy/untranslated. */
force_fuzzy = (hidden && msgid[0] != '\0' && msgstr[0] != '\0');
- po_callback_message (catr,
- NULL, msgid, &msgid_pos, NULL,
- msgstr, strlen (msgstr) + 1, &msgstr_pos,
- NULL, NULL, NULL,
- force_fuzzy, false);
+ catalog_reader_seen_message (catr,
+ NULL, msgid, &msgid_pos, NULL,
+ msgstr, strlen (msgstr) + 1, &msgstr_pos,
+ NULL, NULL, NULL,
+ force_fuzzy, false);
}
}
}
{
if (special_comment != NULL)
{
- po_callback_comment_special (catr, special_comment);
+ catalog_reader_seen_comment_special (catr, special_comment);
free (special_comment);
special_comment = NULL;
}
special_comment_add (line + 6);
else if (strlen (line) >= 9 && memcmp (line, "Comment: ", 9) == 0)
/* A comment extracted from the source. */
- po_callback_comment_dot (catr, line + 9);
+ catalog_reader_seen_comment_dot (catr, line + 9);
else
{
char *last_colon;
{
/* A "File: <filename>:<number>" type comment. */
*last_colon = '\0';
- po_callback_comment_filepos (catr, line + 6, number);
+ catalog_reader_seen_comment_filepos (catr, line + 6, number);
}
else
- po_callback_comment (catr, line);
+ catalog_reader_seen_comment (catr, line);
}
}
necessarily designate an untranslated entry. */
msgstr = xstrdup ("");
msgstr_pos = msgid_pos;
- po_callback_message (catr,
- NULL, msgid, &msgid_pos, NULL,
- msgstr, strlen (msgstr) + 1, &msgstr_pos,
- NULL, NULL, NULL,
- false, next_is_obsolete);
+ catalog_reader_seen_message (catr,
+ NULL, msgid, &msgid_pos, NULL,
+ msgstr, strlen (msgstr) + 1, &msgstr_pos,
+ NULL, NULL, NULL,
+ false, next_is_obsolete);
}
else if (c == '=')
{
msgstr = fuzzy_msgstr;
/* A key/value pair. */
- po_callback_message (catr,
- NULL, msgid, &msgid_pos, NULL,
- msgstr, strlen (msgstr) + 1, &msgstr_pos,
- NULL, NULL, NULL,
- false, next_is_obsolete);
+ catalog_reader_seen_message (catr,
+ NULL, msgid, &msgid_pos, NULL,
+ msgstr, strlen (msgstr) + 1, &msgstr_pos,
+ NULL, NULL, NULL,
+ false, next_is_obsolete);
}
else
{
projects / thirdparty / gettext.git / commitdiff
