From 3798317748e880b96d230bae0922d0e9c4b8d864 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sun, 29 Sep 2013 16:25:34 +0200 Subject: [PATCH] Remove excessive boilerplate duplication from dspwrappers. --- gnushogi/dspwrappers.c | 579 +++++------------------------------------------- 1 files changed, 52 insertions(+), 527 deletions(-) diff --git a/gnushogi/dspwrappers.c b/gnushogi/dspwrappers.c index 7287498..0a27ec0 100644 --- a/gnushogi/dspwrappers.c +++ b/gnushogi/dspwrappers.c @@ -37,530 +37,55 @@ #include "rawdsp.h" #include "cursesdsp.h" - -void -ChangeAlphaWindow(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ChangeAlphaWindow(); - break; - - case DISPLAY_CURSES: - Curses_ChangeAlphaWindow(); - break; - } -} - - -void -ChangeBetaWindow(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ChangeBetaWindow(); - break; - - case DISPLAY_CURSES: - Curses_ChangeBetaWindow(); - break; - } -} - - -void -ChangeHashDepth(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ChangeHashDepth(); - break; - - case DISPLAY_CURSES: - Curses_ChangeHashDepth(); - break; - } -} - - -void -ChangeSearchDepth(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ChangeSearchDepth(); - break; - - case DISPLAY_CURSES: - Curses_ChangeSearchDepth(); - break; - } -} - - -void -ChangeXwindow(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ChangeXwindow(); - break; - - case DISPLAY_CURSES: - Curses_ChangeXwindow(); - break; - } -} - - -void -ClearScreen(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ClearScreen(); - break; - - case DISPLAY_CURSES: - Curses_ClearScreen(); - break; - } -} - - -void -DoDebug(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_DoDebug(); - break; - - case DISPLAY_CURSES: - Curses_DoDebug(); - break; - } -} - - -void -DoTable(short table[NO_SQUARES]) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_DoTable(table); - break; - - case DISPLAY_CURSES: - Curses_DoTable(table); - break; - } -} - - -void -EditBoard(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_EditBoard(); - break; - - case DISPLAY_CURSES: - Curses_EditBoard(); - break; - } -} - - -void -ExitShogi(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ExitShogi(); - break; - - case DISPLAY_CURSES: - Curses_ExitShogi(); - break; - } -} - - -void -GiveHint(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_GiveHint(); - break; - - case DISPLAY_CURSES: - Curses_GiveHint(); - break; - } -} - - -void -Initialize(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_Initialize(); - break; - - case DISPLAY_CURSES: - Curses_Initialize(); - break; - } -} - - -void -OutputMove(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_OutputMove(); - break; - - case DISPLAY_CURSES: - Curses_OutputMove(); - break; - } -} - - -void -SetContempt(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_SetContempt(); - break; - - case DISPLAY_CURSES: - Curses_SetContempt(); - break; - } -} - - -void -SearchStartStuff(short side) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_SearchStartStuff(side); - break; - - case DISPLAY_CURSES: - Curses_SearchStartStuff(side); - break; - } -} - - -void -SelectLevel(char *sx) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_SelectLevel(sx); - break; - - case DISPLAY_CURSES: - Curses_SelectLevel(sx); - break; - } -} - - -void -ShowCurrentMove(short pnt, short f, short t) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowCurrentMove(pnt, f, t); - break; - - case DISPLAY_CURSES: - Curses_ShowCurrentMove(pnt, f, t); - break; - } -} - - -void -ShowDepth(char ch) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowDepth(ch); - break; - - case DISPLAY_CURSES: - Curses_ShowDepth(ch); - break; - } -} - - -void -ShowGameType(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowGameType(); - break; - - case DISPLAY_CURSES: - Curses_ShowGameType(); - break; - } -} - - -void -ShowLine(unsigned short *bstline) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowLine(bstline); - break; - - case DISPLAY_CURSES: - Curses_ShowLine(bstline); - break; - } -} - - -void -ShowMessage(char *s) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowMessage(s); - break; - - case DISPLAY_CURSES: - Curses_ShowMessage(s); - break; - } -} - - -void -ShowPatternCount(short side, short n) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowPatternCount(side, n); - break; - - case DISPLAY_CURSES: - Curses_ShowPatternCount(side, n); - break; - } -} - - -void -ShowPostnValue(short sq) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowPostnValue(sq); - break; - - case DISPLAY_CURSES: - Curses_ShowPostnValue(sq); - break; - } -} - - -void -ShowPostnValues(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowPostnValues(); - break; - - case DISPLAY_CURSES: - Curses_ShowPostnValues(); - break; - } -} - - -void -ShowResponseTime(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowResponseTime(); - break; - - case DISPLAY_CURSES: - Curses_ShowResponseTime(); - break; - } -} - - -void -ShowResults(short score, unsigned short *bstline, char ch) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowResults(score, bstline, ch); - break; - - case DISPLAY_CURSES: - Curses_ShowResults(score, bstline, ch); - break; - } -} - - -void -ShowSidetoMove(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowSidetoMove(); - break; - - case DISPLAY_CURSES: - Curses_ShowSidetoMove(); - break; - } -} - - -void -ShowStage(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_ShowStage(); - break; - - case DISPLAY_CURSES: - Curses_ShowStage(); - break; - } -} - - -void -TerminateSearch(int sig) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_TerminateSearch(sig); - break; - - case DISPLAY_CURSES: - Curses_TerminateSearch(sig); - break; - } -} - - -void -UpdateDisplay(short f, short t, short redraw, short isspec) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_UpdateDisplay(f, t, redraw, isspec); - break; - - case DISPLAY_CURSES: - Curses_UpdateDisplay(f, t, redraw, isspec); - break; - } -} - - -void -help(void) -{ - switch (display_type) - { - case DISPLAY_RAW: - case DISPLAY_X: - Raw_help(); - break; - - case DISPLAY_CURSES: - Curses_help(); - break; - } -} - +#define CASE_DSP_RAW(func,args) \ + case DISPLAY_RAW: \ + case DISPLAY_X: \ + func args; \ + break +#define CASE_DSP_CURSES(func,args) \ + case DISPLAY_CURSES: \ + func args; \ + break; + +#define DISPLAY_FUNC(func,argsdecl,args) \ + void func argsdecl \ + { \ + switch (display_type) { \ + CASE_DSP_RAW(Raw_ ## func, args); \ + CASE_DSP_CURSES(Curses_ ## func, args); \ + } \ + } +#define DISPLAY_VOIDFUNC(func) \ + DISPLAY_FUNC(func,(void),()) + +DISPLAY_VOIDFUNC(ChangeAlphaWindow) +DISPLAY_VOIDFUNC(ChangeBetaWindow) +DISPLAY_VOIDFUNC(ChangeHashDepth) +DISPLAY_VOIDFUNC(ChangeSearchDepth) +DISPLAY_VOIDFUNC(ChangeXwindow) +DISPLAY_VOIDFUNC(ClearScreen) +DISPLAY_VOIDFUNC(DoDebug) +DISPLAY_FUNC(DoTable, (short table[NO_SQUARES]), (table)) +DISPLAY_VOIDFUNC(EditBoard) +DISPLAY_VOIDFUNC(ExitShogi) +DISPLAY_VOIDFUNC(GiveHint) +DISPLAY_VOIDFUNC(Initialize) +DISPLAY_VOIDFUNC(OutputMove) +DISPLAY_VOIDFUNC(SetContempt) +DISPLAY_FUNC(SearchStartStuff, (short side), (side)) +DISPLAY_FUNC(SelectLevel, (char *sx), (sx)) +DISPLAY_FUNC(ShowCurrentMove, (short pnt, short f, short t), (pnt, f, t)) +DISPLAY_FUNC(ShowDepth, (char ch), (ch)) +DISPLAY_VOIDFUNC(ShowGameType) +DISPLAY_FUNC(ShowLine, (unsigned short *bstline), (bstline)) +DISPLAY_FUNC(ShowMessage, (char *s), (s)) +DISPLAY_FUNC(ShowPatternCount, (short side, short n), (side, n)) +DISPLAY_FUNC(ShowPostnValue, (short sq), (sq)) +DISPLAY_VOIDFUNC(ShowPostnValues) +DISPLAY_VOIDFUNC(ShowResponseTime) +DISPLAY_FUNC(ShowResults, (short score, unsigned short *bstline, char ch), (score, bstline, ch)) +DISPLAY_VOIDFUNC(ShowSidetoMove) +DISPLAY_VOIDFUNC(ShowStage) +DISPLAY_FUNC(TerminateSearch, (int sig), (sig)) +DISPLAY_FUNC(UpdateDisplay, (short f, short t, short redraw, short isspec), (f, t, redraw, isspec)) +DISPLAY_VOIDFUNC(help) -- 1.7.0.4