From owner-p4-projects@FreeBSD.ORG  Sun Jul 20 20:57:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5818106566C; Sun, 20 Jul 2008 20:57:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 89BD01065678
	for <perforce@FreeBSD.org>; Sun, 20 Jul 2008 20:57:59 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 85C668FC14
	for <perforce@FreeBSD.org>; Sun, 20 Jul 2008 20:57:59 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6KKvxXL072294
	for <perforce@FreeBSD.org>; Sun, 20 Jul 2008 20:57:59 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6KKvx0n072292
	for perforce@freebsd.org; Sun, 20 Jul 2008 20:57:59 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Sun, 20 Jul 2008 20:57:59 GMT
Message-Id: <200807202057.m6KKvx0n072292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145514 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2008 20:58:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=145514

Change 145514 by konrad@vspredator on 2008/07/20 20:57:52

	Fixed a regression introduced in previous commit.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/colldef.apple/Makefile#3 edit
.. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#5 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/colldef.apple/Makefile#3 (text+ko) ====

@@ -4,7 +4,7 @@
 SRCS=	parse.y scan.l y.tab.h
 LFLAGS=	-8 -i
 CFLAGS+=-I.
-CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -Wall -W -ansi -pedantic -Werror
+CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -Wall -W -ansi -pedantic -Werror -g
 LDADD=	-ll
 DPADD=	${LIBL}
 

==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#5 (text+ko) ====

@@ -826,11 +826,9 @@
 		yyerror("More weights than specified by order_start (%d >= %d, %s)", weight_index,
 		    directive_count, showwcs($1, CHARMAP_SYMBOL_LEN));
 	s = getsymbol($1, EXISTS);
-	if (order_pass && s->val == PRI_UNDEFINED) {
+	if (order_pass && s->val == PRI_UNDEFINED)
 		printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN));
-		weight_table[weight_index] = 0;
-	} else
-		weight_table[weight_index] = s;
+	weight_table[weight_index] = s;
 }
 ;
 order_end : ORDER_END '\n'