1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
--- dealer.orig/defs.y 2012-07-29 00:20:15.000000000 +0200
+++ dealer/defs.y 2012-07-29 00:22:43.580752442 +0200
@@ -49,6 +49,8 @@
char y_distr[4];
}
+%expect 16 /* number of shift/reduce errors to be expected */
+
%left QUERY COLON
%left OR2
%left AND2
@@ -61,7 +63,7 @@
%token GENERATE PRODUCE HCP SHAPE ANY EXCEPT CONDITION ACTION
%token PRINT PRINTALL PRINTEW PRINTPBN PRINTCOMPACT PRINTONELINE
%token AVERAGE HASCARD FREQUENCY PREDEAL POINTCOUNT ALTCOUNT
-%token CONTROL LOSER DEALER VULNERABLE
+%token CONTROL LOSER DEALER
%token QUALITY CCCC
%token TRICKS NOTRUMPS NORTHSOUTH EASTWEST
%token EVALCONTRACT ALL NONE SCORE IMPS RND
@@ -272,13 +274,13 @@
}
| HASCARD '(' COMPASS ',' CARD ')'
{ $$ = newtree(TRT_HASCARD, NIL, NIL, $3, $5); }
- | TRICKS '(' compass ',' SUIT ')'
+ | TRICKS '(' compass ',' SUIT ')'
{ $$ = newtree(TRT_TRICKS, NIL, NIL, $3, $5); }
- | TRICKS '(' compass ',' NOTRUMPS ')'
+ | TRICKS '(' compass ',' NOTRUMPS ')'
{ $$ = newtree(TRT_TRICKS, NIL, NIL, $3, 4); }
- | SCORE '(' VULN ',' CONTRACT ',' expr ')'
+ | SCORE '(' VULN ',' CONTRACT ',' expr ')'
{ $$ = newtree(TRT_SCORE, $7, NIL, $3, $5); }
- | IMPS '(' expr ')'
+ | IMPS '(' expr ')'
{ $$ = newtree(TRT_IMPS, $3, NIL, 0, 0); }
| '(' expr ')'
{ $$ = $2; }
@@ -649,5 +651,3 @@
#ifdef WIN32
#pragma warning( default : 4127 )
#endif
-
-
diff -ur src/dealer.orig/Makefile src/dealer/Makefile
--- dealer.orig/Makefile 2012-07-29 00:20:15.000000000 +0200
+++ dealer/Makefile 2012-07-29 00:29:41.933759002 +0200
@@ -1,7 +1,7 @@
# $Header: /home/henk/CVS/dealer/Makefile,v 1.15 1999/08/05 19:57:44 henk Exp $
CC = gcc
-CFLAGS = -Wall -pedantic -O2 -I. -DNDEBUG -c $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = -Wall -pedantic -O2 -I. -DNDEBUG -c
FLEX = flex
YACC = yacc
@@ -22,7 +22,7 @@
dealer: ${OBJ} ${LOBJ} ${YOBJ} ${MAN}
${MAKE} -C Random lib
- $(CC) -o $@ ${OBJ} -L./Random -lgnurand $(shell dpkg-buildflags --get LDFLAGS)
+ $(CC) -o $@ ${OBJ} -L./Random -lgnurand
clean:
rm -f ${OBJ} ${LOBJ} ${YOBJ} ${MAN} dealer
diff -ur src/dealer.orig/Random/Makefile src/dealer/Random/Makefile
--- dealer.orig/Random/Makefile 2012-07-29 00:20:15.000000000 +0200
+++ dealer/Random/Makefile 2012-07-29 00:29:38.163731894 +0200
@@ -1,7 +1,7 @@
SRC = $(wildcard *.c)
OBJ = $(subst .c,.o,$(wildcard *.c))
GCC = gcc
-GCCFLAGS = -c -Wall -O2 -I. $(shell dpkg-buildflags --get CFLAGS)
+GCCFLAGS = -c -Wall -O2 -I.
HDR = ansidecl.h
LIB = libgnurand.a
AR = ar
|