提交: 7e0de601c7e088089c4622cabd4eba6933a47893 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• 修订版: 7e0de601c7e088089c4622cabd4eba6933a47893 (tree)
• 时间: 2007-05-13 07:51:10
• 作者: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Add support for delset' directive.

更改概述

• modified: ChangeLog
• modified: include/gcmsgs.h
• modified: mcmerge.c

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-05-12  Keith Marshall  <[e-mail]>
 
+	Add support for `delset' directive.
+
+	* mcmerge.c (mc_delset): New static function...
+	(mc_merge): Use it.
+
+	* include/gcmsgs.h (MSG_DEL_UNSUPPORTED): Redundant message
+	definition; deleted.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Add support for single message deletion.
 
 	* mcsource.c: More comment improvements.

--- a/include/gcmsgs.h
+++ b/include/gcmsgs.h
@@ -49,7 +49,6 @@
 #define MSG_MSGNUM_NOT_INCR  2, 6, "invalid message number: expecting > %d; got %d\n"
 #define MSG_REDEFINED        2, 7, "%s: %s:%u: redefinition of message %u in set %u\n"
 #define MSG_PREVIOUS_HERE    2, 8, "%s: %s:%u: previous definition was here\n"
-#define MSG_DEL_UNSUPPORTED  3, 1, "%s: %s:%u: `delset' operation not yet supported\n"
 #define MSG_EOF_IN_QUOTES    3, 2, "%s:%u: unexpected EOF encountered before closing quote\n"
 #define MSG_TEXT_DISCARDED   3, 3, "%s:%u: incomplete message marked for deletion\n"
 #define MSG_MISSING_NEWLINE  3, 4, "%s:%u: missing newline at end of file\n"
@@ -57,4 +56,4 @@
 /* !
  * !$ end of file
  */
-#endif /* !defined( GCMSGS_H ): $RCSfile$Revision: 1.1.1.1 $: end of file */
+#endif /* !defined( GCMSGS_H ): $RCSfile$Revision: 1.2 $: end of file */

--- a/mcmerge.c
+++ b/mcmerge.c
@@ -40,6 +40,30 @@
 #include <gencat.h>
 #include <gcmsgs.h>
 
+static
+struct msgdict *mc_delset( unsigned short setnum, struct msgdict *msgset )
+{
+  /* Helper function, called by `mc_merge', to unlink message references
+   * in any set specified in a `delset' directive.
+   */
+  while( msgset && (msgset->set == setnum) )
+  {
+    /* Walk the message list, freeing the memory allocated to message
+     * entries with matching set number.
+     */
+    struct msgdict *ref = msgset;
+    msgset = msgset->link;
+    free( ref );
+  }
+  /* When done, return the address of the first message in the set,
+   * if any, following the one we just deleted; `mc_merge' will link
+   * this to succeed the predecessor, if any, of the deleted set,
+   * or otherwise, replacing the first set in the catalogue,
+   * thus implicitly unlinking the deleted messages.
+   */
+  return msgset;
+}
+
 struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
 {
   struct msgdict *mark = cat;
@@ -233,10 +257,80 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
 
     else if( input->set && (input->base == NULL) )
     {
-      /* This is a a `delset' operation...
-       * FIXME: we don't have support for this yet!
+      /* This is a a `delset' operation; it will delete all messages
+       * currently present in the catalogue, which are assigned to the
+       * specified message set.
+       *
+       * Obviously, if the catalogue is currently empty, then this is
+       * a no-op...
+       */
+      if( cat )
+      {
+	/* ...but when we do already have some content defined, then we
+	 * must locate and delete the specified set, if it exists.
+	 */
+	if( cat->set == input->set )
+	{
+	  /* The set to be deleted is the first in the catalogue...
+	   */
+	  if( mark->set == input->set )
+	    /*
+	     * ...and the current insertion point also lies within
+	     * this set, so *both* references must be adjusted.
+	     */
+	    mark = cat = mc_delset( input->set, cat );
+
+	  else
+	    /* ...the current insertion point has already advanced
+	     * beyond the set to be deleted, so leave it unchanged,
+	     * and simply remove the entire initial message set.
+	     */
+	    cat = mc_delset( input->set, cat );
+	}
+	else
+	{
+	  /* The set to be deleted is not the first in the catalogue,
+	   * so we must locate the last message entry in the set which
+	   * immediately precedes that to be deleted; this becomes the
+	   * reference point, from which deletion commences, and to
+	   * which any following message set must be relinked.
+	   */
+	  struct msgdict *delset, *ref = cat;
+	  
+	  /* Our search for this reference entry begins at the start
+	   * of the catalogue; however, if the current insertion point
+	   * lies in a set which precedes that to be deleted, then we
+	   * may immediately jump ahead to this point.
+	   */
+	  if( mark->key < input->key )
+	    ref = mark;
+
+	  /* We now walk the message list, until we either find the
+	   * required reference point, or our search overruns the end
+	   * of the list.
+	   */
+	  while( ((delset = ref->link) != NULL) && (delset->key < input->key) )
+	    ref = delset;
+
+	  /* Now, we must check the current insertion point, to ensure
+	   * that * it does not refer to an entry we are about to delete;
+	   * if it points to a message with a set number matching that of
+	   * the set to be deleted, then we must adjust it.
+	   */
+	  if( mark->set == input->set )
+	    mark = ref;
+
+	  /* Finally, if we found entries in the set to be deleted,
+	   * then we discard them.
+	   */
+	  if( delset->set == input->set )
+	    ref->link = mc_delset( input->set, delset );
+	}
+      }
+      /* Whether or not we actually found and deleted the specified
+       * message set, (if not, we silently ignore the `delset' request),
+       * the current input record serves no further purpose.
        */
-      fprintf( errmsg( MSG_DEL_UNSUPPORTED ), progname, input->src, input->lineno );
       free( input );
     }
 
@@ -272,4 +366,4 @@ struct msgdict *mc_merge( struct msgdict *cat, struct msgdict *input )
   return cat;
 }
 
-/* $RCSfile$Revision: 1.1.1.1 $: end of file */
+/* $RCSfile$Revision: 1.2 $: end of file */