diff options
author | Foppe Hemminga | 2015-07-07 13:15:51 +0200 |
---|---|---|
committer | Foppe Hemminga | 2015-07-07 13:15:51 +0200 |
commit | 099b7300bd5b9104bc06601ac120e4085654a0f0 (patch) | |
tree | a5a7311afd2ddd744c682447b692eb646e6411ce /dealer-4.diff | |
download | aur-099b7300bd5b9104bc06601ac120e4085654a0f0.tar.gz |
Initial commit copy of AUR3
Diffstat (limited to 'dealer-4.diff')
-rw-r--r-- | dealer-4.diff | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/dealer-4.diff b/dealer-4.diff new file mode 100644 index 000000000000..aab4dcb8f40f --- /dev/null +++ b/dealer-4.diff @@ -0,0 +1,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 |