Patch level : 12.0 no-patch

Files correlati     :
Commento            :

Aggiunta la definizione di ricerche  ai campi jolly (1-10)
This commit is contained in:
Alessandro Bonazzi 2020-11-27 23:41:15 +01:00
parent 33bf40c3ef
commit 8a23315636
2 changed files with 172 additions and 162 deletions

View File

@ -1922,34 +1922,35 @@ ENDIF
IFNDEF(PR_JOLLY1) IFNDEF(PR_JOLLY1)
F_PROMPT(JOLLY1, "Jolly 1 ") F_PROMPT(JOLLY1, "Jolly 1 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY1)
F_FIELD(JOLLY1, 999999)
ENDIF
IFNDEF(FL_JOLLY1)
F_FLG(JOLLY1, 999999)
ENDIF
IFNDEF(CH_JOLLY1)
F_CHK(JOLLY1, 999999)
ENDIF
IFNDEF(MS_JOLLY1)
!!define MS_JOLLY1 999999
ENDIF
TY_JOLLY1 FR_JOLLY1 LN_JOLLY1 DE_JOLLY1 TY_JOLLY1 FR_JOLLY1 LN_JOLLY1 DE_JOLLY1
BEGIN BEGIN
PROMPT X_JOLLY1 Y_JOLLY1 PR_JOLLY1 PROMPT X_JOLLY1 Y_JOLLY1 PR_JOLLY1
IF(FL_JOLLY1 != 999999) IFDEF(FL_JOLLY1)
FLAGS FL_JOLLY1 FLAGS FL_JOLLY1
ENDIF ENDIF
IF(CH_JOLLY1 != 999999) IFDEF(CH_JOLLY1)
CHECKTYPE CH_JOLLY1 CHECKTYPE CH_JOLLY1
ENDIF ENDIF
IF(MS_JOLLY1 != 999999) IFDEF(MS_JOLLY1)
MESSAGE MS_JOLLY1,MF_JOLLY1 MESSAGE MS_JOLLY1,MF_JOLLY1
ENDIF ENDIF
IF(FI_JOLLY1 != 999999) IFDEF(FI_JOLLY1)
FIELD FI_JOLLY1 FIELD FI_JOLLY1
ENDIF ENDIF
IFDEF (USE_JOLLY1)
USE_JOLLY1
ENDIF
IFDEF (INPUT_JOLLY1)
INPUT_JOLLY1
ENDIF
IFDEF (DISPLAY_JOLLY1)
DISPLAY_JOLLY1
ENDIF
IFDEF (OUTPUT_JOLLY1)
OUTPUT_JOLLY1
ENDIF
END END
ENDIF ENDIF
@ -1972,34 +1973,35 @@ ENDIF
IFNDEF(PR_JOLLY2) IFNDEF(PR_JOLLY2)
F_PROMPT(JOLLY2, "Jolly 2 ") F_PROMPT(JOLLY2, "Jolly 2 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY2)
F_FIELD(JOLLY2, 999999)
ENDIF
IFNDEF(FL_JOLLY2)
F_FLG(JOLLY2, 999999)
ENDIF
IFNDEF(CH_JOLLY2)
F_CHK(JOLLY2, 999999)
ENDIF
IFNDEF(MS_JOLLY2)
!!define MS_JOLLY2 999999
ENDIF
TY_JOLLY2 FR_JOLLY2 LN_JOLLY2 DE_JOLLY2 TY_JOLLY2 FR_JOLLY2 LN_JOLLY2 DE_JOLLY2
BEGIN BEGIN
PROMPT X_JOLLY2 Y_JOLLY2 PR_JOLLY2 PROMPT X_JOLLY2 Y_JOLLY2 PR_JOLLY2
IF(FL_JOLLY2 != 999999) IFDEF(FL_JOLLY2)
FLAGS FL_JOLLY2 FLAGS FL_JOLLY2
ENDIF ENDIF
IF(CH_JOLLY2 != 999999) IFDEF(CH_JOLLY2)
CHECKTYPE CH_JOLLY2 CHECKTYPE CH_JOLLY2
ENDIF ENDIF
IF(MS_JOLLY2 != 999999) IFDEF(MS_JOLLY2)
MESSAGE MS_JOLLY2,MF_JOLLY2 MESSAGE MS_JOLLY2,MF_JOLLY2
ENDIF ENDIF
IF(FI_JOLLY2 != 999999) IFDEF(FI_JOLLY2)
FIELD FI_JOLLY2 FIELD FI_JOLLY2
ENDIF ENDIF
IFDEF (USE_JOLLY2)
USE_JOLLY2
ENDIF
IFDEF (INPUT_JOLLY2)
INPUT_JOLLY2
ENDIF
IFDEF (DISPLAY_JOLLY2)
DISPLAY_JOLLY2
ENDIF
IFDEF (OUTPUT_JOLLY2)
OUTPUT_JOLLY2
ENDIF
END END
ENDIF ENDIF
@ -2022,34 +2024,34 @@ ENDIF
IFNDEF(PR_JOLLY3) IFNDEF(PR_JOLLY3)
F_PROMPT(JOLLY3, "Jolly 3 ") F_PROMPT(JOLLY3, "Jolly 3 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY3)
F_FIELD(JOLLY3, 999999)
ENDIF
IFNDEF(FL_JOLLY3)
F_FLG(JOLLY3, 999999)
ENDIF
IFNDEF(CH_JOLLY3)
F_CHK(JOLLY3, 999999)
ENDIF
IFNDEF(MS_JOLLY3)
!!define MS_JOLLY3 999999
ENDIF
TY_JOLLY3 FR_JOLLY3 LN_JOLLY3 DE_JOLLY3 TY_JOLLY3 FR_JOLLY3 LN_JOLLY3 DE_JOLLY3
BEGIN BEGIN
PROMPT X_JOLLY3 Y_JOLLY3 PR_JOLLY3 PROMPT X_JOLLY3 Y_JOLLY3 PR_JOLLY3
IF(FL_JOLLY3 != 999999) IFDEF(FL_JOLLY3)
FLAGS FL_JOLLY3 FLAGS FL_JOLLY3
ENDIF ENDIF
IF(CH_JOLLY3 != 999999) IFDEF(CH_JOLLY3)
CHECKTYPE CH_JOLLY3 CHECKTYPE CH_JOLLY3
ENDIF ENDIF
IF(MS_JOLLY3 != 999999) IFDEF(MS_JOLLY3)
MESSAGE MS_JOLLY3,MF_JOLLY3 MESSAGE MS_JOLLY3,MF_JOLLY3
ENDIF ENDIF
IF(FI_JOLLY3 != 999999) IFDEF(FI_JOLLY3)
FIELD FI_JOLLY3 FIELD FI_JOLLY3
ENDIF ENDIF
IFDEF (USE_JOLLY3)
USE_JOLLY3
ENDIF
IFDEF (INPUT_JOLLY3)
INPUT_JOLLY3
ENDIF
IFDEF (DISPLAY_JOLLY3)
DISPLAY_JOLLY3
ENDIF
IFDEF (OUTPUT_JOLLY3)
OUTPUT_JOLLY3
ENDIF
END END
ENDIF ENDIF
@ -2072,34 +2074,34 @@ ENDIF
IFNDEF(PR_JOLLY4) IFNDEF(PR_JOLLY4)
F_PROMPT(JOLLY4, "Jolly 4 ") F_PROMPT(JOLLY4, "Jolly 4 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY4)
F_FIELD(JOLLY4, 999999)
ENDIF
IFNDEF(FL_JOLLY4)
F_FLG(JOLLY4, 999999)
ENDIF
IFNDEF(CH_JOLLY4)
F_CHK(JOLLY4, 999999)
ENDIF
IFNDEF(MS_JOLLY4)
!!define MS_JOLLY4 999999
ENDIF
TY_JOLLY4 FR_JOLLY4 LN_JOLLY4 DE_JOLLY4 TY_JOLLY4 FR_JOLLY4 LN_JOLLY4 DE_JOLLY4
BEGIN BEGIN
PROMPT X_JOLLY4 Y_JOLLY4 PR_JOLLY4 PROMPT X_JOLLY4 Y_JOLLY4 PR_JOLLY4
IF(FL_JOLLY4 != 999999) IFDEF(FL_JOLLY4)
FLAGS FL_JOLLY4 FLAGS FL_JOLLY4
ENDIF ENDIF
IF(CH_JOLLY4 != 999999) IFDEF(CH_JOLLY4)
CHECKTYPE CH_JOLLY4 CHECKTYPE CH_JOLLY4
ENDIF ENDIF
IF(MS_JOLLY4 != 999999) IFDEF(MS_JOLLY4)
MESSAGE MS_JOLLY4,MF_JOLLY4 MESSAGE MS_JOLLY4,MF_JOLLY4
ENDIF ENDIF
IF(FI_JOLLY4 != 999999) IFDEF(FI_JOLLY4)
FIELD FI_JOLLY4 FIELD FI_JOLLY4
ENDIF ENDIF
IFDEF (USE_JOLLY4)
USE_JOLLY4
ENDIF
IFDEF (INPUT_JOLLY4)
INPUT_JOLLY4
ENDIF
IFDEF (DISPLAY_JOLLY4)
DISPLAY_JOLLY4
ENDIF
IFDEF (OUTPUT_JOLLY4)
OUTPUT_JOLLY4
ENDIF
END END
ENDIF ENDIF
@ -2122,34 +2124,34 @@ ENDIF
IFNDEF(PR_JOLLY5) IFNDEF(PR_JOLLY5)
F_PROMPT(JOLLY5, "Jolly 5 ") F_PROMPT(JOLLY5, "Jolly 5 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY5)
F_FIELD(JOLLY5, 999999)
ENDIF
IFNDEF(FL_JOLLY5)
F_FLG(JOLLY5, 999999)
ENDIF
IFNDEF(CH_JOLLY5)
F_CHK(JOLLY5, 999999)
ENDIF
IFNDEF(MS_JOLLY5)
!!define MS_JOLLY5 999999
ENDIF
TY_JOLLY5 FR_JOLLY5 LN_JOLLY5 DE_JOLLY5 TY_JOLLY5 FR_JOLLY5 LN_JOLLY5 DE_JOLLY5
BEGIN BEGIN
PROMPT X_JOLLY5 Y_JOLLY5 PR_JOLLY5 PROMPT X_JOLLY5 Y_JOLLY5 PR_JOLLY5
IF(FL_JOLLY5 != 999999) IFDEF(FL_JOLLY5)
FLAGS FL_JOLLY5 FLAGS FL_JOLLY5
ENDIF ENDIF
IF(CH_JOLLY5 != 999999) IFDEF(CH_JOLLY5)
CHECKTYPE CH_JOLLY5 CHECKTYPE CH_JOLLY5
ENDIF ENDIF
IF(MS_JOLLY5 != 999999) IFDEF(MS_JOLLY5)
MESSAGE MS_JOLLY5,MF_JOLLY5 MESSAGE MS_JOLLY5,MF_JOLLY5
ENDIF ENDIF
IF(FI_JOLLY5 != 999999) IFDEF(FI_JOLLY5)
FIELD FI_JOLLY5 FIELD FI_JOLLY5
ENDIF ENDIF
IFDEF (USE_JOLLY5)
USE_JOLLY5
ENDIF
IFDEF (INPUT_JOLLY5)
INPUT_JOLLY5
ENDIF
IFDEF (DISPLAY_JOLLY5)
DISPLAY_JOLLY5
ENDIF
IFDEF (OUTPUT_JOLLY5)
OUTPUT_JOLLY5
ENDIF
END END
ENDIF ENDIF
@ -2172,34 +2174,35 @@ ENDIF
IFNDEF(PR_JOLLY6) IFNDEF(PR_JOLLY6)
F_PROMPT(JOLLY6, "Jolly 6 ") F_PROMPT(JOLLY6, "Jolly 6 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY6)
F_FIELD(JOLLY6, 999999)
ENDIF
IFNDEF(FL_JOLLY6)
F_FLG(JOLLY6, 999999)
ENDIF
IFNDEF(CH_JOLLY6)
F_CHK(JOLLY6, 999999)
ENDIF
IFNDEF(MS_JOLLY6)
!!define MS_JOLLY6 999999
ENDIF
TY_JOLLY6 FR_JOLLY6 LN_JOLLY6 DE_JOLLY6 TY_JOLLY6 FR_JOLLY6 LN_JOLLY6 DE_JOLLY6
BEGIN BEGIN
PROMPT X_JOLLY6 Y_JOLLY6 PR_JOLLY6 PROMPT X_JOLLY6 Y_JOLLY6 PR_JOLLY6
IF(FL_JOLLY6 != 999999) IFDEF(FL_JOLLY6)
FLAGS FL_JOLLY6 FLAGS FL_JOLLY6
ENDIF ENDIF
IF(CH_JOLLY6 != 999999) IFDEF(CH_JOLLY6)
CHECKTYPE CH_JOLLY6 CHECKTYPE CH_JOLLY6
ENDIF ENDIF
IF(MS_JOLLY6 != 999999) IFDEF(MS_JOLLY6)
MESSAGE MS_JOLLY6,MF_JOLLY6 MESSAGE MS_JOLLY6,MF_JOLLY6
ENDIF ENDIF
IF(FI_JOLLY6 != 999999) IFDEF(FI_JOLLY6)
FIELD FI_JOLLY6 FIELD FI_JOLLY6
ENDIF ENDIF
IFDEF (USE_JOLLY6)
USE_JOLLY6
ENDIF
IFDEF (INPUT_JOLLY6)
INPUT_JOLLY6
ENDIF
IFDEF (DISPLAY_JOLLY6)
DISPLAY_JOLLY6
ENDIF
IFDEF (OUTPUT_JOLLY6)
OUTPUT_JOLLY6
ENDIF
END END
ENDIF ENDIF
@ -2222,34 +2225,34 @@ ENDIF
IFNDEF(PR_JOLLY7) IFNDEF(PR_JOLLY7)
F_PROMPT(JOLLY7, "Jolly 7 ") F_PROMPT(JOLLY7, "Jolly 7 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY7)
F_FIELD(JOLLY7, 999999)
ENDIF
IFNDEF(FL_JOLLY7)
F_FLG(JOLLY7, 999999)
ENDIF
IFNDEF(CH_JOLLY7)
F_CHK(JOLLY7, 999999)
ENDIF
IFNDEF(MS_JOLLY7)
!!define MS_JOLLY7 999999
ENDIF
TY_JOLLY7 FR_JOLLY7 LN_JOLLY7 DE_JOLLY7 TY_JOLLY7 FR_JOLLY7 LN_JOLLY7 DE_JOLLY7
BEGIN BEGIN
PROMPT X_JOLLY7 Y_JOLLY7 PR_JOLLY7 PROMPT X_JOLLY7 Y_JOLLY7 PR_JOLLY7
IF(FL_JOLLY7 != 999999) IFDEF(FL_JOLLY7)
FLAGS FL_JOLLY7 FLAGS FL_JOLLY7
ENDIF ENDIF
IF(CH_JOLLY7 != 999999) IFDEF(CH_JOLLY7)
CHECKTYPE CH_JOLLY7 CHECKTYPE CH_JOLLY7
ENDIF ENDIF
IF(MS_JOLLY7 != 999999) IFDEF(MS_JOLLY7)
MESSAGE MS_JOLLY7,MF_JOLLY7 MESSAGE MS_JOLLY7,MF_JOLLY7
ENDIF ENDIF
IF(FI_JOLLY7 != 999999) IFDEF(FI_JOLLY7)
FIELD FI_JOLLY7 FIELD FI_JOLLY7
ENDIF ENDIF
IFDEF (USE_JOLLY7)
USE_JOLLY7
ENDIF
IFDEF (INPUT_JOLLY7)
INPUT_JOLLY7
ENDIF
IFDEF (DISPLAY_JOLLY7)
DISPLAY_JOLLY7
ENDIF
IFDEF (OUTPUT_JOLLY7)
OUTPUT_JOLLY7
ENDIF
END END
ENDIF ENDIF
@ -2272,34 +2275,34 @@ ENDIF
IFNDEF(PR_JOLLY8) IFNDEF(PR_JOLLY8)
F_PROMPT(JOLLY8, "Jolly 8 ") F_PROMPT(JOLLY8, "Jolly 8 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY8)
F_FIELD(JOLLY8, 999999)
ENDIF
IFNDEF(FL_JOLLY8)
F_FLG(JOLLY8, 999999)
ENDIF
IFNDEF(CH_JOLLY8)
F_CHK(JOLLY8, 999999)
ENDIF
IFNDEF(MS_JOLLY8)
!!define MS_JOLLY8 999999
ENDIF
TY_JOLLY8 FR_JOLLY8 LN_JOLLY8 DE_JOLLY8 TY_JOLLY8 FR_JOLLY8 LN_JOLLY8 DE_JOLLY8
BEGIN BEGIN
PROMPT X_JOLLY8 Y_JOLLY8 PR_JOLLY8 PROMPT X_JOLLY8 Y_JOLLY8 PR_JOLLY8
IF(FL_JOLLY8 != 999999) IFDEF(FL_JOLLY8)
FLAGS FL_JOLLY8 FLAGS FL_JOLLY8
ENDIF ENDIF
IF(CH_JOLLY8 != 999999) IFDEF(CH_JOLLY8)
CHECKTYPE CH_JOLLY8 CHECKTYPE CH_JOLLY8
ENDIF ENDIF
IF(MS_JOLLY8 != 999999) IFDEF(MS_JOLLY8)
MESSAGE MS_JOLLY8,MF_JOLLY8 MESSAGE MS_JOLLY8,MF_JOLLY8
ENDIF ENDIF
IF(FI_JOLLY8 != 999999) IFDEF(FI_JOLLY8)
FIELD FI_JOLLY8 FIELD FI_JOLLY8
ENDIF ENDIF
IFDEF (USE_JOLLY8)
USE_JOLLY8
ENDIF
IFDEF (INPUT_JOLLY8)
INPUT_JOLLY8
ENDIF
IFDEF (DISPLAY_JOLLY8)
DISPLAY_JOLLY8
ENDIF
IFDEF (OUTPUT_JOLLY8)
OUTPUT_JOLLY8
ENDIF
END END
ENDIF ENDIF
@ -2322,34 +2325,34 @@ ENDIF
IFNDEF(PR_JOLLY9) IFNDEF(PR_JOLLY9)
F_PROMPT(JOLLY9, "Jolly 9 ") F_PROMPT(JOLLY9, "Jolly 9 ")
ENDIF ENDIF
IFNDEF(FI_JOLLY9)
F_FIELD(JOLLY9, 999999)
ENDIF
IFNDEF(FL_JOLLY9)
F_FLG(JOLLY9, 999999)
ENDIF
IFNDEF(CH_JOLLY9)
F_CHK(JOLLY9, 999999)
ENDIF
IFNDEF(MS_JOLLY9)
!!define MS_JOLLY9 999999
ENDIF
TY_JOLLY9 FR_JOLLY9 LN_JOLLY9 DE_JOLLY9 TY_JOLLY9 FR_JOLLY9 LN_JOLLY9 DE_JOLLY9
BEGIN BEGIN
PROMPT X_JOLLY9 Y_JOLLY9 PR_JOLLY9 PROMPT X_JOLLY9 Y_JOLLY9 PR_JOLLY9
IF(FL_JOLLY9 != 999999) IFDEF(FL_JOLLY9)
FLAGS FL_JOLLY9 FLAGS FL_JOLLY9
ENDIF ENDIF
IF(CH_JOLLY9 != 999999) IFDEF(CH_JOLLY9)
CHECKTYPE CH_JOLLY9 CHECKTYPE CH_JOLLY9
ENDIF ENDIF
IF(MS_JOLLY9 != 999999) IFDEF(MS_JOLLY9)
MESSAGE MS_JOLLY9,MF_JOLLY9 MESSAGE MS_JOLLY9,MF_JOLLY9
ENDIF ENDIF
IF(FI_JOLLY9 != 999999) IFDEF(FI_JOLLY9)
FIELD FI_JOLLY9 FIELD FI_JOLLY9
ENDIF ENDIF
IFDEF (USE_JOLLY9)
USE_JOLLY9
ENDIF
IFDEF (INPUT_JOLLY9)
INPUT_JOLLY9
ENDIF
IFDEF (DISPLAY_JOLLY9)
DISPLAY_JOLLY9
ENDIF
IFDEF (OUTPUT_JOLLY9)
OUTPUT_JOLLY9
ENDIF
END END
ENDIF ENDIF
@ -2372,34 +2375,34 @@ ENDIF
IFNDEF (PR_JOLLY10) IFNDEF (PR_JOLLY10)
F_PROMPT(JOLLY10, "Jolly 10 ") F_PROMPT(JOLLY10, "Jolly 10 ")
ENDIF ENDIF
IFNDEF (FI_JOLLY10)
F_FIELD(JOLLY10, 999999)
ENDIF
IFNDEF (FL_JOLLY10)
F_FLG(JOLLY10, 999999)
ENDIF
IFNDEF (CH_JOLLY10)
F_CHK(JOLLY10, 999999)
ENDIF
IFNDEF (MS_JOLLY10)
!!define MS_JOLLY10 999999
ENDIF
TY_JOLLY10 FR_JOLLY10 LN_JOLLY10 DE_JOLLY10 TY_JOLLY10 FR_JOLLY10 LN_JOLLY10 DE_JOLLY10
BEGIN BEGIN
PROMPT X_JOLLY10 Y_JOLLY10 PR_JOLLY10 PROMPT X_JOLLY10 Y_JOLLY10 PR_JOLLY10
IF(FL_JOLLY10 != 999999) IFDEF(FL_JOLLY10)
FLAGS FL_JOLLY10 FLAGS FL_JOLLY10
ENDIF ENDIF
IF(CH_JOLLY10 != 999999) IFDEF(CH_JOLLY10)
CHECKTYPE CH_JOLLY10 CHECKTYPE CH_JOLLY10
ENDIF ENDIF
IF(MS_JOLLY10 != 999999) IFDEF(MS_JOLLY10)
MESSAGE MS_JOLLY10 MESSAGE MS_JOLLY10
ENDIF ENDIF
IF(FI_JOLLY10 != 999999) IFDEF(FI_JOLLY10)
FIELD FI_JOLLY10 FIELD FI_JOLLY10
ENDIF ENDIF
IFDEF (USE_JOLLY10)
USE_JOLLY10
ENDIF
IFDEF (INPUT_JOLLY10)
INPUT_JOLLY10
ENDIF
IFDEF (DISPLAY_JOLLY10)
DISPLAY_JOLLY10
ENDIF
IFDEF (OUTPUT_JOLLY10)
OUTPUT_JOLLY10
ENDIF
END END
ENDIF ENDIF

View File

@ -33,8 +33,15 @@ F_PROMPT(name, prompt);
!!define DI7_##name e7 ;\ !!define DI7_##name e7 ;\
!!define DI8_##name e8 ;\ !!define DI8_##name e8 ;\
!!define DI9_##name e9 ; !!define DI9_##name e9 ;
#define F_OUT(name, mfield, field) !!define OUM_##name mfield ; \ #define F_USE(name, use) !!define USE_##name USE use;
!!define OU_##name field ; \ #define F_INPUT(name, input) !!define INPUT_##name INPUT input
#define F_DISPLAY(name, display) !!define DISPLAY_##name DISPLAY display
#define F_OUTPUT(name, output) !!define OUTPUT_##name OUTPUT output
#define F_SEARCH(name, use, input, display, output) \
F_USE(name, use) \
F_INPUT(name, input) \
F_DISPLAY(name, input) \
F_OUTPUT(name, input)
INCLDEF("verig.h") INCLDEF("verig.h")