PERFORCE change 145514 for review

[Konrad Jankowski]

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

Change 145514 by konrad at 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'