Update.

2000-01-21  Ulrich Drepper  <drepper@cygnus.com>

	* intl/Makefile (routines): Add dcigettext, dcngettext, dngettxt,
	ngettext, and plural.
	(distribute): Add plural.y, po2test.sed, and tst-gettext.sh.
	(test-srcs): Add tst-gettext.
	(before-compile): Add $(objpfx)msgs.h.
	Add rules for plural.c and msgs.h generation and running tst-gettext.\
	* intl/Versions [GLIBC_2.2]: Add __dcngettext, dcngettext, dngettext,
	and ngettext.
	* intl/dcgettext.c: Move most code into dcigettext.c.  Add call
	dcigettext with appropriate parameters.
	* intl/dcigettext.c: New file.
	* intl/dcngettext.c: New file.
	* intl/dngettext.c: New file.
	* intl/ngettext.c: New file.
	* intl/gettextP.h (struct expression): Define.
	(struct loaded_domain): Add plural and nplurals members.
	Add prototypes for new internal functions.
	* intl/libintl.h: Declare new functions.  Add optimizations for them.
	* intl/loadinfo.h: Add new parameter to _nl_find_msg declaration.
	* intl/loadmsgcat.c (_nl_load_domain): Search for plural information in
	header entry and parse and store the expression.
	* intl/plural.y: New file.
	* intl/po2test.sed: New file.
	* intl/tst-gettext.c: New file.
	* intl/tst-gettext.sh: New file.

	* intl/gettext.c: Call __dcgettext directly.

1 files changed, 290 insertions, 0 deletions

diff --git a/intl/plural.y b/intl/plural.y
new file mode 100644
index 0000000000..00b6fccb4f
--- /dev/null
+++ b/intl/plural.y
@@ -0,0 +1,290 @@
+%{
+/* Expression parsing for plural form selection.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include "gettext.h"
+#include "gettextP.h"
+
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
+%}
+%pure_parser
+%expect 10
+
+%union {
+  unsigned long int num;
+  struct expression *exp;
+}
+
+%{
+/* Prototypes for local functions.  */
+static struct expression *new_exp (enum operator op, ...);
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
+%}
+
+%left '?'
+%left '|'
+%left '&'
+%left '=', '!'
+%left '+', '-'
+%left '*', '/', '%'
+%token <num> NUMBER
+%type <exp> exp
+
+%%
+
+start:	  exp
+	  {
+	    ((struct parse_args *) arg)->res = $1;
+	  }
+	;
+
+exp:	  exp '?' exp ':' exp
+	  {
+	    if (($$ = new_exp (qmop, $1, $3, $5, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '|' exp
+	  {
+	    if (($$ = new_exp (lor, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '&' exp
+	  {
+	    if (($$ = new_exp (land, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '=' exp
+	  {
+	    if (($$ = new_exp (equal, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '!' exp
+	  {
+	    if (($$ = new_exp (not_equal, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '+' exp
+	  {
+	    if (($$ = new_exp (plus, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '-' exp
+	  {
+	    if (($$ = new_exp (minus, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '*' exp
+	  {
+	    if (($$ = new_exp (mult, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '/' exp
+	  {
+	    if (($$ = new_exp (divide, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| exp '%' exp
+	  {
+	    if (($$ = new_exp (module, $1, $3, NULL)) == NULL)
+	      YYABORT
+	  }
+	| 'n'
+	  {
+	    if (($$ = new_exp (var, NULL)) == NULL)
+	      YYABORT
+	  }
+	| NUMBER
+	  {
+	    if (($$ = new_exp (num, NULL)) == NULL)
+	      YYABORT;
+	    $$->val.num = $1
+	  }
+	| '(' exp ')'
+	  {
+	    $$ = $2
+	  }
+	;
+
+%%
+
+static struct expression *
+new_exp (enum operator op, ...)
+{
+  struct expression *newp = (struct expression *) malloc (sizeof (*newp));
+  va_list va;
+  struct expression *next;
+
+  va_start (va, op);
+
+  if (newp == NULL)
+    while ((next = va_arg (va, struct expression *)) != NULL)
+      __gettext_free_exp (next);
+  else
+    {
+      newp->operation = op;
+      next = va_arg (va, struct expression *);
+      if (next != NULL)
+	{
+	  newp->val.args3.bexp = next;
+	  next = va_arg (va, struct expression *);
+	  if (next != NULL)
+	    {
+	      newp->val.args3.tbranch = next;
+	      next = va_arg (va, struct expression *);
+	      if (next != NULL)
+		newp->val.args3.fbranch = next;
+	    }
+	}
+    }
+
+  va_end (va);
+
+  return newp;
+}
+
+void
+internal_function
+__gettext_free_exp (struct expression *exp)
+{
+  if (exp == NULL)
+    return;
+
+  /* Handle the recursive case.  */
+  switch (exp->operation)
+    {
+    case qmop:
+      __gettext_free_exp (exp->val.args3.fbranch);
+      /* FALLTHROUGH */
+
+    case mult:
+    case divide:
+    case module:
+    case plus:
+    case minus:
+    case equal:
+    case not_equal:
+    case land:
+    case lor:
+      __gettext_free_exp (exp->val.args2.right);
+      __gettext_free_exp (exp->val.args2.left);
+      break;
+
+    default:
+      break;
+    }
+
+  free (exp);
+}
+
+
+static int
+yylex (YYSTYPE *lval, const char **pexp)
+{
+  const char *exp = *pexp;
+  int result;
+
+  while (1)
+    {
+      if (exp[0] == '\\' && exp[1] == '\n')
+	{
+	  exp += 2;
+	  continue;
+	}
+      if (exp[0] != '\0' && exp[0] != ' ' && exp[0] != '\t')
+	break;
+
+      ++exp;
+    }
+
+  result = *exp++;
+  switch (result)
+    {
+    case '0' ... '9':
+      {
+	unsigned long int n = exp[-1] - '0';
+	while (exp[0] >= '0' && exp[0] <= '9')
+	  {
+	    n *= 10;
+	    n += exp[0] - '0';
+	    ++exp;
+	  }
+	lval->num = n;
+	result = NUMBER;
+      }
+      break;
+
+    case '=':
+    case '!':
+      if (exp[0] == '=')
+	++exp;
+      else
+	result = YYERRCODE;
+      break;
+
+    case '&':
+    case '|':
+      if (exp[0] == result)
+	++exp;
+      else
+	result = YYERRCODE;
+      break;
+
+    case 'n':
+    case '*':
+    case '/':
+    case '%':
+    case '+':
+    case '-':
+    case '?':
+    case ':':
+    case '(':
+    case ')':
+      /* Nothing, just return the character.  */
+      break;
+
+    case '\n':
+    case '\0':
+      /* Be safe and let the user call this function again.  */
+      --exp;
+      result = YYEOF;
+      break;
+
+    default:
+      result = YYERRCODE;
+#if YYDEBUG != 0
+      --exp;
+#endif
+      break;
+    }
+
+  *pexp = exp;
+
+  return result;
+}
+
+
+static void
+yyerror (const char *str)
+{
+  /* Do nothing.  We don't print error messages here.  */
+}