flora-commits Mailing List for Flora-2
Brought to you by:
kifer
Menu
▾
▴
flora-commits — List for commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(43) |
Jul
(4) |
Aug
(4) |
Sep
(102) |
Oct
(20) |
Nov
(47) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(24) |
Feb
(34) |
Mar
(72) |
Apr
(36) |
May
(10) |
Jun
(46) |
Jul
(36) |
Aug
(24) |
Sep
(37) |
Oct
(27) |
Nov
(43) |
Dec
(40) |
| 2004 |
Jan
(35) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(30) |
Aug
(83) |
Sep
(68) |
Oct
(38) |
Nov
(3) |
Dec
(7) |
| 2005 |
Jan
(9) |
Feb
(31) |
Mar
(46) |
Apr
(73) |
May
(21) |
Jun
(1) |
Jul
(32) |
Aug
(33) |
Sep
(3) |
Oct
(28) |
Nov
(4) |
Dec
(23) |
| 2006 |
Jan
(22) |
Feb
(2) |
Mar
(12) |
Apr
(23) |
May
(73) |
Jun
(14) |
Jul
|
Aug
(20) |
Sep
(14) |
Oct
(5) |
Nov
|
Dec
(14) |
| 2007 |
Jan
(54) |
Feb
(81) |
Mar
(286) |
Apr
(313) |
May
(154) |
Jun
(85) |
Jul
(8) |
Aug
(11) |
Sep
(12) |
Oct
(14) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(12) |
May
(4) |
Jun
|
Jul
(13) |
Aug
(22) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(46) |
Jun
(43) |
Jul
(46) |
Aug
(9) |
Sep
(13) |
Oct
(31) |
Nov
(42) |
Dec
(18) |
| 2014 |
Jan
(7) |
Feb
(7) |
Mar
(11) |
Apr
(13) |
May
(16) |
Jun
(6) |
Jul
(17) |
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2015 |
Jan
|
Feb
(17) |
Mar
(4) |
Apr
(3) |
May
(2) |
Jun
(3) |
Jul
(2) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
|
2
|
3
(1) |
4
|
|
5
|
6
|
7
|
8
|
9
(6) |
10
(3) |
11
|
|
12
|
13
|
14
|
15
|
16
|
17
|
18
|
|
19
|
20
|
21
|
22
|
23
|
24
(2) |
25
|
|
26
|
27
|
28
|
29
|
30
|
31
|
|
|
From: Hui W. <hw...@us...> - 2006-03-24 23:21:36
|
Update of /cvsroot/flora/flora2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24845 Modified Files: flrparser.P Log Message: parser bug fixing. Index: flrparser.P =================================================================== RCS file: /cvsroot/flora/flora2/flrparser.P,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- flrparser.P 24 Mar 2006 19:54:35 -0000 1.94 +++ flrparser.P 24 Mar 2006 23:21:32 -0000 1.95 @@ -5255,17 +5255,17 @@ ), !. -flora_db_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- +flora_db_attmethspec(Mode,CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- get_atom(Funct,F), ( is_boolsigop(F) ; is_iboolsigop(F)), - flora_db_pathexp(A,DISALLOW_TRANS,DWS,ACode,S1), + flora_db_pathexp(Mode,A,DISALLOW_TRANS,DWS,ACode,S1), (S1 == [] -> ( is_boolsigop(F) -> flboolsig_struct(ACode,F,Code) ; is_iboolsigop(F) -> fliboolsig_struct(ACode,F,Code) ), Status = [] ; - flora_db_attmethspec(A,DWS,ACode2,S2), + flora_db_attmethspec(Mode,A,DWS,ACode2,S2), (S2 == [] -> (fltranspec_struct(ATemp,ACode2) -> ( is_boolsigop(F) -> fltransig_struct(ATemp,F,Code) @@ -5281,11 +5281,11 @@ ), !. -flora_db_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- +flora_db_attmethspec(Mode,CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- get_atom(Funct,F), ( is_transigop(F) ; is_itransigop(F)), !, - flora_db_pathexp(A,DISALLOW_TRANS,DWS,ACode,Status), + flora_db_pathexp(Mode,A,DISALLOW_TRANS,DWS,ACode,Status), ( is_transigop(F) -> fltransig_struct(ACode,F,Code) ; is_itransigop(F) -> flitransig_struct(ACode,F,Code) ). |
|
From: Hui W. <hw...@us...> - 2006-03-24 19:54:49
|
Update of /cvsroot/flora/flora2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9897 Modified Files: flrparser.P Log Message: Fix a parser bug. Index: flrparser.P =================================================================== RCS file: /cvsroot/flora/flora2/flrparser.P,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- flrparser.P 10 Mar 2006 23:08:21 -0000 1.93 +++ flrparser.P 24 Mar 2006 19:54:35 -0000 1.94 @@ -4340,7 +4340,7 @@ /**************************************************************************** flora_head_pathexp(+CanoniTerm,+TransFlag,+DWS,-HeadPathExpression,-Status) ****************************************************************************/ -flora_head_pathexp(CANOTERM(Funct,2,FL_PARENTHESIS,Args,If,_Ip),DWS,HF,Code,Status) :- +flora_head_pathexp(CANOTERM(Funct,2,FL_PARENTHESIS,Args,If,_Ip),HF,DWS,Code,Status) :- get_atom(Funct,F), !, ( is_birelop(F) -> |
|
From: Michael K. <ki...@us...> - 2006-03-10 23:08:35
|
Update of /cvsroot/flora/flora2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24835 Modified Files: flrparser.P Log Message: changed <- to <-- Index: flrparser.P =================================================================== RCS file: /cvsroot/flora/flora2/flrparser.P,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- flrparser.P 9 Mar 2006 08:58:17 -0000 1.92 +++ flrparser.P 10 Mar 2006 23:08:21 -0000 1.93 @@ -2217,7 +2217,7 @@ !, parsing_error(If,ERROR_ELSEBODY,Status). -%% Parse the a<-b form of if-then +%% Parse the a<--b form of if-then flora_body(CANOTERM(Funct,2,FL_PARENTHESIS,[IfPart,ThenPart],_If,_Ip),WS,DWS,Code,Status) :- get_name(Funct,FL_LEFTARROW), !, |
|
From: Michael K. <ki...@us...> - 2006-03-10 23:08:32
|
Update of /cvsroot/flora/flora2/flrincludes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24835/flrincludes Modified Files: flora_terms.flh Log Message: changed <- to <-- Index: flora_terms.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_terms.flh,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- flora_terms.flh 9 Mar 2006 08:58:18 -0000 1.61 +++ flora_terms.flh 10 Mar 2006 23:08:21 -0000 1.62 @@ -102,7 +102,7 @@ #define FL_IMPLYOP (':-') #define FL_QUERYOP ('?-') /* Alternative if-then */ -#define FL_LEFTARROW ('<-') +#define FL_LEFTARROW ('<--') #define FL_PARENTHESIS '(' #define FL_BRACKET '[' |
|
From: Michael K. <ki...@us...> - 2006-03-10 23:08:31
|
Update of /cvsroot/flora/flora2/syslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24835/syslib Modified Files: flrdbmodule.P Log Message: changed <- to <-- Index: flrdbmodule.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrdbmodule.P,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- flrdbmodule.P 16 Feb 2006 07:33:50 -0000 1.5 +++ flrdbmodule.P 10 Mar 2006 23:08:21 -0000 1.6 @@ -174,9 +174,10 @@ fllibdbmodule_prepare_db(+Database,+ModuleName,+DBHandle) The workhorse that creates all the required tables. Note that for each - type of tabel 23 (MAX_TABLE_COUNT) separate tables are created. + type of table 23 (MAX_TABLE_COUNT) separate tables are created. ****************************************************************************/ fllibdbmodule_prepare_db(Database,ModuleName,DBHandle) :- + %% USE is strictly MySQL -- will need to be fixed UseDbSQL = ['USE ',Database], flora_db_ddl_sql(DBHandle,q_db_use,UseDbSQL,[],DB_CONNECT,Database), fllibdbmodule_get_tbl_name_suffix(ModuleName,Suffix), @@ -373,7 +374,8 @@ fllibdbmodule_insert_quotes(ValueList,ValQuoteList), flora_concat_items(['(',String1,')'],ColString), fllibdbmodule_get_tbl_name_suffix(ModuleName,Suffix), - %%no subquery inside insert in mysql. hence have to do it in two steps. + %% Subqueries inside insert are disallowed in some DBMS (eg MySQL). + %% So, we do it in two steps. append([IS_TUPLE_PRESENT,Wrapper,Suffix,'_',N,' '],ColValList,SQLCheckQuery), ( %%for empty resultset checks, db_sql fails and R is un-initialized @@ -500,10 +502,12 @@ /**************************************************************************** fllibdbmodule_get_db_handle(+ModuleName) + + Obtain the database connect handle for the given FLORA-2 module. ****************************************************************************/ fllibdbmodule_get_db_handle(ModuleName,DBHandle) :- %%get the db info for the module. - flora_dbmodule_registry(ModuleName,Database,DSN,UserName,Password), + flora_dbmodule_registry(ModuleName,_Database,DSN,UserName,Password), flora_dbmodule_handle(DSN,UserName,Password,DBHandle), %% USE is strictly MySQL -- will need to be fixed UseDbSQL = ['USE ',Database], |
Update of /cvsroot/flora/flora2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015 Modified Files: flrcoder.P flrcompiler.P flrdependency.P flroperator.P flrparser.P flrshell.P flrundefined.P flrwrapper.P Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: flrcompiler.P =================================================================== RCS file: /cvsroot/flora/flora2/flrcompiler.P,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- flrcompiler.P 22 Dec 2005 22:37:18 -0000 1.86 +++ flrcompiler.P 9 Mar 2006 08:58:17 -0000 1.87 @@ -174,6 +174,10 @@ is_flsigconstr(FLSIGCONSTR(Lower,Upper),Lower,Upper). is_flincattspec(FLINCATTSPEC(Att,RefType,Val),Att,RefType,Val). is_fltolistattspec(FLTOLISTATTSPEC(Att,RefType,Val),Att,RefType,Val). +is_flboolsig(FLBOOLSIG(Att,RefType),Att,RefType). +is_fliboolsig(FLIBOOLSIG(Att,RefType),Att,RefType). +is_fltransig(FLTRANSIG(Att,RefType),Att,RefType). +is_flitransig(FLITRANSIG(Att,RefType),Att,RefType). is_flmethspec(FLMETHSPEC(Meth),Meth). is_flimethspec(FLIMETHSPEC(IMeth),IMeth). is_fltranspec(FLTRANSPEC(Tran),Tran). @@ -808,6 +812,16 @@ imvdcondef_struct(Context,Object,AttObj,LowerObj,UpperObj,PRIMVDCONDEF(Object,AttObj,LowerObj,UpperObj,Caller)) :- determine_caller_info(Context,Caller). +boolsig_struct(Context,Object,AttObj,PRBOOLSIG(Object,AttObj,Caller)):- + determine_caller_info(Context,Caller). +iboolsig_struct(Context,Object,AttObj,PRIBOOLSIG(Object,AttObj,Caller)):- + determine_caller_info(Context,Caller). + +transig_struct(Context,Object,AttObj,PRTRANSIG(Object,AttObj,Caller)):- + determine_caller_info(Context,Caller). +itransig_struct(Context,Object,AttObj,PRITRANSIG(Object,AttObj,Caller)):- + determine_caller_info(Context,Caller). + %% This is called when someting like a.b[]@module is compiled. %% Why is compilation different from body_objref_struct, which is used for %% a.b[] (without the module)? @@ -2770,6 +2784,54 @@ Status = S ). +%% boolean signatures: =>. +compile_flspecbody(Object,SpecTerm,NULL,Code,Status) :- + is_flboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_pathexp(AttTerm,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + boolsig_struct(BODYLITERAL,Object,AttObj,SCode), + conjunct_code([AOidCode,ACode,SCode],Code) + ; + true + ). + +%% boolean signatures: *=>. +compile_flspecbody(Object,SpecTerm,NULL,Code,Status) :- + is_fliboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_pathexp(AttTerm,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + iboolsig_struct(BODYLITERAL,Object,AttObj,SCode), + conjunct_code([AOidCode,ACode,SCode],Code) + ; + true + ). + +%% boolean signatures: =>% for transactional method +compile_flspecbody(Object,SpecTerm,NULL,Code,Status) :- + is_fltransig(SpecTerm,AttTerm,_RefType), + !, + compile_pathexp(AttTerm,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + transig_struct(BODYLITERAL,Object,AttObj,SCode), + conjunct_code([AOidCode,ACode,SCode],Code) + ; + true + ). + +%% boolean signatures: *=>% for transactional method +compile_flspecbody(Object,SpecTerm,NULL,Code,Status) :- + is_flitransig(SpecTerm,AttTerm,_RefType), + !, + compile_pathexp(AttTerm,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + itransig_struct(BODYLITERAL,Object,AttObj,SCode), + conjunct_code([AOidCode,ACode,SCode],Code) + ; + true + ). + %% +>>, *+>> compile_flspecbody(Object,SpecTerm,NULL,Code,Status) :- is_flincattspec(SpecTerm,AttTerm,RefType,ValTerm), @@ -3297,6 +3359,54 @@ Status = S ). +%% boolean signatures: =>. +compile_head_flspecbody(Object,SpecTerm,Code,Status) :- + is_flboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_head_pathexp(AttTerm,AttObj,ACode,Status), + ( Status == [] -> + boolsig_struct(HEADLITERAL,Object,AttObj,SCode), + conjunct_struct(ACode,SCode,Code) + ; + true + ). + +%% boolean signatures: *=>. +compile_head_flspecbody(Object,SpecTerm,Code,Status) :- + is_fliboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_head_pathexp(AttTerm,AttObj,ACode,Status), + ( Status == [] -> + iboolsig_struct(HEADLITERAL,Object,AttObj,SCode), + conjunct_struct(ACode,SCode,Code) + ; + true + ). + +%% boolean signatures: =>% for transactional method +compile_head_flspecbody(Object,SpecTerm,Code,Status) :- + is_fltransig(SpecTerm,AttTerm,_RefType), + !, + compile_head_pathexp(AttTerm,AttObj,ACode,Status), + ( Status == [] -> + transig_struct(HEADLITERAL,Object,AttObj,SCode), + conjunct_struct(ACode,SCode,Code) + ; + true + ). + +%% boolean signatures: *=>% for transactional method +compile_head_flspecbody(Object,SpecTerm,Code,Status) :- + is_flitransig(SpecTerm,AttTerm,_RefType), + !, + compile_head_pathexp(AttTerm,AttObj,ACode,Status), + ( Status == [] -> + itransig_struct(HEADLITERAL,Object,AttObj,SCode), + conjunct_struct(ACode,SCode,Code) + ; + true + ). + compile_head_flspecbody(Object,SpecTerm,Code,Status) :- is_flmethspec(SpecTerm,MethTerm), !, @@ -3876,6 +3986,61 @@ Status = S ). +%% boolean signatures: =>. +compile_wsflspecbody(Object,SpecTerm,WS,NULL,Code,Status) :- + is_flboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_wsflpathexp(AttTerm,WS,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + boolsig_struct(BODYLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_code([AOidCode,ACode,WSCode],Code) + ; + true + ). + +%% boolean signatures: *=>. +compile_wsflspecbody(Object,SpecTerm,WS,NULL,Code,Status) :- + is_fliboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_wsflpathexp(AttTerm,WS,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + iboolsig_struct(BODYLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_code([AOidCode,ACode,WSCode],Code) + ; + true + ). + +%% boolean signatures: =>% for transactional method +compile_wsflspecbody(Object,SpecTerm,WS,NULL,Code,Status) :- + is_fltransig(SpecTerm,AttTerm,_RefType), + !, + compile_wsflpathexp(AttTerm,WS,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + transig_struct(BODYLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_code([AOidCode,ACode,WSCode],Code) + ; + true + ). + +%% boolean signatures: *=>% for transactional method +compile_wsflspecbody(Object,SpecTerm,WS,NULL,Code,Status) :- + is_flitransig(SpecTerm,AttTerm,_RefType), + !, + compile_wsflpathexp(AttTerm,WS,AttObj,AOidCode,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + itransig_struct(BODYLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_code([AOidCode,ACode,WSCode],Code) + ; + true + ). %% +>>, *+>>@module %% NULL means: consume OidCode for attr and val here -- don't pass up the chain @@ -4761,7 +4926,61 @@ ). +%% boolean signatures: =>. +compile_head_wsflspecbody(Object,SpecTerm,WS,Code,Status) :- + is_flboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_head_wsflpathexp(AttTerm,WS,AttObj,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + boolsig_struct(HEADLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_struct(ACode,WSCode,Code) + ; + true + ). + +%% boolean signatures: *=>. +compile_head_wsflspecbody(Object,SpecTerm,WS,Code,Status) :- + is_fliboolsig(SpecTerm,AttTerm,_RefType), + !, + compile_head_wsflpathexp(AttTerm,WS,AttObj,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + iboolsig_struct(HEADLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_struct(ACode,WSCode,Code) + ; + true + ). +%% boolean signatures: =>% for transactional method +compile_head_wsflspecbody(Object,SpecTerm,WS,Code,Status) :- + is_fltransig(SpecTerm,AttTerm,_RefType), + !, + compile_head_wsflpathexp(AttTerm,WS,AttObj,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + transig_struct(HEADLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_struct(ACode,WSCode,Code) + ; + true + ). + +%% boolean signatures: *=>% for transactional method +compile_head_wsflspecbody(Object,SpecTerm,WS,Code,Status) :- + is_flitransig(SpecTerm,AttTerm,_RefType), + !, + compile_head_wsflpathexp(AttTerm,WS,AttObj,ACode,Status), + ( Status == [] -> + attach_workspace(WS, + itransig_struct(HEADLITERAL,Object,AttObj,SCode), + SCode,WSCode), + conjunct_struct(ACode,WSCode,Code) + ; + true + ). compile_head_wsmvdattspec(_Object,_AttObj,_RefType,[],_WS,NULL,[]) :- !. Index: flrundefined.P =================================================================== RCS file: /cvsroot/flora/flora2/flrundefined.P,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- flrundefined.P 22 Dec 2005 22:37:18 -0000 1.29 +++ flrundefined.P 9 Mar 2006 08:58:17 -0000 1.30 @@ -196,6 +196,34 @@ new_varobj(NO_INDEX,NV2), flora_build_debug_term_skeleton(Tran,TCode). +flora_build_debug_skeleton_flogic(Head,PRBOOLSIG(NV1,ACode,NV2)) :- + is_flogic(Head,WRAP_BOOLSIG,_Arity,[_Obj,Att|_]), + !, + new_varobj(NO_INDEX,NV1), + new_varobj(NO_INDEX,NV2), + flora_build_debug_term_skeleton(Att,ACode). + +flora_build_debug_skeleton_flogic(Head,PRIBOOLSIG(NV1,ACode,NV2)) :- + is_flogic(Head,WRAP_IBOOLSIG,_Arity,[_Obj,Att|_]), + !, + new_varobj(NO_INDEX,NV1), + new_varobj(NO_INDEX,NV2), + flora_build_debug_term_skeleton(Att,ACode). + +flora_build_debug_skeleton_flogic(Head,PRTRANSIG(NV1,ACode,NV2)) :- + is_flogic(Head,WRAP_TRANSIG,_Arity,[_Obj,Att|_]), + !, + new_varobj(NO_INDEX,NV1), + new_varobj(NO_INDEX,NV2), + flora_build_debug_term_skeleton(Att,ACode). + +flora_build_debug_skeleton_flogic(Head,PRITRANSIG(NV1,ACode,NV2)) :- + is_flogic(Head,WRAP_ITRANSIG,_Arity,[_Obj,Att|_]), + !, + new_varobj(NO_INDEX,NV1), + new_varobj(NO_INDEX,NV2), + flora_build_debug_term_skeleton(Att,ACode). + flora_build_debug_skeleton_flogic(Head,PRMVDSIG(NV1,ACode,NV2,NV3)) :- is_flogic(Head,WRAP_MVDSIG,_Arity,[_Obj,Att,_Val|_]), !, @@ -422,6 +450,10 @@ is_flogic_3params(WRAP_IMETH) :- !. is_flogic_3params(WRAP_MVDDEF) :- !. is_flogic_3params(WRAP_IMVDDEF) :- !. +is_flogic_3params(WRAP_BOOLSIG) :- !. +is_flogic_3params(WRAP_IBOOLSIG) :- !. +is_flogic_3params(WRAP_TRANSIG) :- !. +is_flogic_3params(WRAP_ITRANSIG) :- !. is_flogic_3params(WRAP_TRAN) :- !. is_flogic_4params(WRAP_MVDSIG) :- !. @@ -670,6 +702,12 @@ defined_by([WRAP_MVDSIG,X,Y,Z,_],[WRAP_MVDSIG,X,Y,Z,_]). defined_by([WRAP_MVDSIG,X,Y,Z,_],[WRAP_IMVDSIG,X,Y,Z,_]). defined_by([WRAP_IMVDSIG,X,Y,Z,_],[WRAP_IMVDSIG,X,Y,Z,_]). +defined_by([WRAP_BOOLSIG,X,Y,_],[WRAP_BOOLSIG,X,Y,_]). +defined_by([WRAP_BOOLSIG,X,Y,_],[WRAP_IBOOLSIG,X,Y,_]). +defined_by([WRAP_IBOOLSIG,X,Y,_],[WRAP_IBOOLSIG,X,Y,_]). +defined_by([WRAP_TRANSIG,X,Y,_],[WRAP_TRANSIG,X,Y,_]). +defined_by([WRAP_TRANSIG,X,Y,_],[WRAP_ITRANSIG,X,Y,_]). +defined_by([WRAP_ITRANSIG,X,Y,_],[WRAP_ITRANSIG,X,Y,_]). defined_by([WRAP_MVDCONDEF,W,X,Y,Z,_],[WRAP_MVDCONDEF,W,X,Y,Z,_]). defined_by([WRAP_MVDCONDEF,W,X,Y,Z,_],[WRAP_IMVDCONDEF,W,X,Y,Z,_]). defined_by([WRAP_IMVDCONDEF,W,X,Y,Z,_],[WRAP_IMVDCONDEF,W,X,Y,Z,_]). @@ -920,6 +958,26 @@ predicate_msg(O2, O2Msg), flora_concat_atoms(['?[%',O2Msg,']'],PMsg). +predicate_msg(WRAP_BOOLSIG,[_Obj, Att,_], PMsg) :- + !, + predicate_msg(Att, AMsg), + flora_concat_atoms(['?[=>',AMsg,']'],PMsg). + +predicate_msg(WRAP_IBOOLSIG,[_Obj, Att,_], PMsg) :- + !, + predicate_msg(Att, AMsg), + flora_concat_atoms(['?[*=>',AMsg,']'],PMsg). + +predicate_msg(WRAP_TRANSIG,[_Obj, Att,_], PMsg) :- + !, + predicate_msg(Att, AMsg), + flora_concat_atoms(['?[=>%',AMsg,']'],PMsg). + +predicate_msg(WRAP_ITRANSIG,[_Obj, Att,_], PMsg) :- + !, + predicate_msg(Att, AMsg), + flora_concat_atoms(['?[*=>%',AMsg,']'],PMsg). + predicate_msg(WRAP_MVDSIG, [_Obj, Att, _Val,_], PMsg) :- !, predicate_msg(Att,AMsg), Index: flroperator.P =================================================================== RCS file: /cvsroot/flora/flora2/flroperator.P,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- flroperator.P 22 Dec 2005 22:37:18 -0000 1.26 +++ flroperator.P 9 Mar 2006 08:58:17 -0000 1.27 @@ -85,6 +85,10 @@ flora_op(1100,xfx,FL_INALLINARROW). flora_op(1100,xfx,FL_INTOLISTARROW). flora_op(1100,xfx,FL_INMVDSIGARR). +flora_op(1100,fx,FL_BOOLSIGARR). +flora_op(1100,fx,FL_INBOOLSIGARR). +flora_op(1100,fx,FL_TRANSIGARR). +flora_op(1100,fx,FL_INTRANSIGARR). %%flora_op(1100,fx,FL_TRAN). flora_op(1000,xfx,FL_UNIVEQ). Index: flrparser.P =================================================================== RCS file: /cvsroot/flora/flora2/flrparser.P,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- flrparser.P 26 Dec 2005 03:47:58 -0000 1.91 +++ flrparser.P 9 Mar 2006 08:58:17 -0000 1.92 @@ -551,6 +551,12 @@ is_export_spec(FL_MVDARROW) :- !. +is_boolsigop(FL_BOOLSIGARR) :- !. +is_iboolsigop(FL_INBOOLSIGARR) :- !. + +is_transigop(FL_TRANSIGARR) :- !. +is_itransigop(FL_INTRANSIGARR) :- !. + %% +>>, *+>> is_incattspecop(FL_ALLINARROW) :- !. is_incattspecop(FL_INALLINARROW) :- !. @@ -710,6 +716,10 @@ flsigattconspec_struct(Attribute,Constr,Spec,Value,FLSIGATTCONSPEC(Attribute,Constr,Spec,Value)). flincattspec_struct(Attribute,Spec,Value,FLINCATTSPEC(Attribute,Spec,Value)). fltolistattspec_struct(Attribute,Spec,Value,FLTOLISTATTSPEC(Attribute,Spec,Value)). +flboolsig_struct(Attribute,Spec,FLBOOLSIG(Attribute,Spec)). +fliboolsig_struct(Attribute,Spec,FLIBOOLSIG(Attribute,Spec)). +fltransig_struct(Attribute,Spec,FLTRANSIG(Attribute,Spec)). +flitransig_struct(Attribute,Spec,FLITRANSIG(Attribute,Spec)). flsigconstr_struct(LowerBound,UpperBound,FLSIGCONSTR(LowerBound,UpperBound)). @@ -3246,6 +3256,41 @@ ). flora_attmeth_template(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),Code,Status) :- + get_atom(Funct,F), + ( is_boolsigop(F) ; is_iboolsigop(F)), + flora_term_template(A,DISALLOW_TRANS,ACode,S1), + (S1 == [] -> + ( is_boolsigop(F) -> flboolsig_struct(ACode,F,Code) + ; is_iboolsigop(F) -> fliboolsig_struct(ACode,F,Code) + ), + Status = [] + ; + flora_attmeth_template(A,ACode2,S2), + (S2 == [] -> + (fltranspec_struct(ATemp,ACode2) -> + ( is_boolsigop(F) -> fltransig_struct(ATemp,F,Code) + ; is_iboolsigop(F) -> flitransig_struct(ATemp,F,Code) + ), + Status = [] + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ), + !. + +flora_attmeth_template(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),Code,Status) :- + get_atom(Funct,F), + ( is_transigop(F) ; is_itransigop(F)), + !, + flora_term_template(A,DISALLOW_TRANS,ACode,Status), + ( is_transigop(F) -> fltransig_struct(ACode,F,Code) + ; is_itransigop(F) -> flitransig_struct(ACode,F,Code) + ). + +flora_attmeth_template(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),Code,Status) :- get_atom(Funct,FL_INMETH), !, flora_term_template(A,DISALLOW_TRANS,C,Status), @@ -3968,6 +4013,41 @@ ), !. +flora_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_boolsigop(F) ; is_iboolsigop(F)), + flora_pathexp(A,DISALLOW_TRANS,DWS,ACode,S1), + (S1 == [] -> + ( is_boolsigop(F) -> flboolsig_struct(ACode,F,Code) + ; is_iboolsigop(F) -> fliboolsig_struct(ACode,F,Code) + ), + Status = [] + ; + flora_attmethspec(A,DWS,ACode2,S2), + (S2 == [] -> + (fltranspec_struct(ATemp,ACode2) -> + ( is_boolsigop(F) -> fltransig_struct(ATemp,F,Code) + ; is_iboolsigop(F) -> flitransig_struct(ATemp,F,Code) + ), + Status = [] + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ), + !. + +flora_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_transigop(F) ; is_itransigop(F)), + !, + flora_pathexp(A,DISALLOW_TRANS,DWS,ACode,Status), + ( is_transigop(F) -> fltransig_struct(ACode,F,Code) + ; is_itransigop(F) -> flitransig_struct(ACode,F,Code) + ). + %% is this case DEPRECATED in the compiler? flora_attmethspec(CANOTERM(Funct,2,FL_PARENTHESIS,[L,R],If,_Ip),_DWS,Code,Status) :- get_atom(Funct,FL_AT), @@ -4438,6 +4518,41 @@ !. flora_head_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_boolsigop(F) ; is_iboolsigop(F)), + flora_head_pathexp(A,DISALLOW_TRANS,DWS,ACode,S1), + (S1 == [] -> + ( is_boolsigop(F) -> flboolsig_struct(ACode,F,Code) + ; is_iboolsigop(F) -> fliboolsig_struct(ACode,F,Code) + ), + Status = [] + ; + flora_head_attmethspec(A,DWS,ACode2,S2), + (S2 == [] -> + (fltranspec_struct(ATemp,ACode2) -> + ( is_boolsigop(F) -> fltransig_struct(ATemp,F,Code) + ; is_iboolsigop(F) -> flitransig_struct(ATemp,F,Code) + ), + Status = [] + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ), + !. + +flora_head_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_transigop(F) ; is_itransigop(F)), + !, + flora_head_pathexp(A,DISALLOW_TRANS,DWS,ACode,Status), + ( is_transigop(F) -> fltransig_struct(ACode,F,Code) + ; is_itransigop(F) -> flitransig_struct(ACode,F,Code) + ). + +flora_head_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- get_atom(Funct,FL_INMETH), !, flora_head_pathexp(A,DISALLOW_TRANS,DWS,C,Status), @@ -5140,6 +5255,41 @@ ), !. +flora_db_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_boolsigop(F) ; is_iboolsigop(F)), + flora_db_pathexp(A,DISALLOW_TRANS,DWS,ACode,S1), + (S1 == [] -> + ( is_boolsigop(F) -> flboolsig_struct(ACode,F,Code) + ; is_iboolsigop(F) -> fliboolsig_struct(ACode,F,Code) + ), + Status = [] + ; + flora_db_attmethspec(A,DWS,ACode2,S2), + (S2 == [] -> + (fltranspec_struct(ATemp,ACode2) -> + ( is_boolsigop(F) -> fltransig_struct(ATemp,F,Code) + ; is_iboolsigop(F) -> flitransig_struct(ATemp,F,Code) + ), + Status = [] + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ; + parsing_error(A,ERROR_BOOLSIG,Status) + ) + ), + !. + +flora_db_attmethspec(CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- + get_atom(Funct,F), + ( is_transigop(F) ; is_itransigop(F)), + !, + flora_db_pathexp(A,DISALLOW_TRANS,DWS,ACode,Status), + ( is_transigop(F) -> fltransig_struct(ACode,F,Code) + ; is_itransigop(F) -> flitransig_struct(ACode,F,Code) + ). + flora_db_attmethspec(Mode,CANOTERM(Funct,1,FL_PARENTHESIS,[A],_If,_Ip),DWS,Code,Status) :- get_atom(Funct,FL_INMETH), !, Index: flrcoder.P =================================================================== RCS file: /cvsroot/flora/flora2/flrcoder.P,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- flrcoder.P 22 Dec 2005 22:37:18 -0000 1.45 +++ flrcoder.P 9 Mar 2006 08:58:17 -0000 1.46 @@ -160,6 +160,18 @@ is_flogic(PRIMVDSIG(Obj,Att,Val,Caller),WRAP_D_IMVDSIG,4,[Obj,Att,Val,Caller]) :- flora_get_counter(using_debug_prefix,1), !. +is_flogic(PRBOOLSIG(Obj,Att,Caller),WRAP_D_BOOLSIG,3,[Obj,Att,Caller]) :- + flora_get_counter(using_debug_prefix,1), + !. +is_flogic(PRIBOOLSIG(Obj,Att,Caller),WRAP_D_IBOOLSIG,3,[Obj,Att,Caller]) :- + flora_get_counter(using_debug_prefix,1), + !. +is_flogic(PRTRANSIG(Obj,Att,Caller),WRAP_D_TRANSIG,3,[Obj,Att,Caller]) :- + flora_get_counter(using_debug_prefix,1), + !. +is_flogic(PRITRANSIG(Obj,Att,Caller),WRAP_D_ITRANSIG,3,[Obj,Att,Caller]) :- + flora_get_counter(using_debug_prefix,1), + !. is_flogic(PRIMVDSIGDEF(Obj,Att,Caller),WRAP_D_IMVDSIGDEF,3,[Obj,Att,Caller]) :- flora_get_counter(using_debug_prefix,1), !. @@ -206,6 +218,10 @@ is_flogic(PRMVDCONDEF(Object,Att,Lower,Upper,Caller),WRAP_MVDCONDEF,5,[Object,Att,Lower,Upper,Caller]) :- !. is_flogic(PRIMVDCONDEF(Object,Att,Lower,Upper,Caller),WRAP_IMVDCONDEF,5,[Object,Att,Lower,Upper,Caller]) :- !. is_flogic(PRIMVDSIG(Obj,Att,Val,Caller),WRAP_IMVDSIG,4,[Obj,Att,Val,Caller]) :- !. +is_flogic(PRBOOLSIG(Obj,Att,Caller),WRAP_BOOLSIG,3,[Obj,Att,Caller]) :- !. +is_flogic(PRIBOOLSIG(Obj,Att,Caller),WRAP_IBOOLSIG,3,[Obj,Att,Caller]) :- !. +is_flogic(PRTRANSIG(Obj,Att,Caller),WRAP_TRANSIG,3,[Obj,Att,Caller]) :- !. +is_flogic(PRITRANSIG(Obj,Att,Caller),WRAP_ITRANSIG,3,[Obj,Att,Caller]) :- !. is_flogic(PRIMVDSIGDEF(Obj,Att,Caller),WRAP_IMVDSIGDEF,3,[Obj,Att,Caller]) :- !. is_flogic(PRMVD(Obj,Att,Val,Caller),WRAP_MVD,4,[Obj,Att,Val,Caller]) :- !. is_flogic(PRIMVD(Obj,Att,Val,Caller),WRAP_IMVD,4,[Obj,Att,Val,Caller]) :- !. Index: flrshell.P =================================================================== RCS file: /cvsroot/flora/flora2/flrshell.P,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- flrshell.P 22 Jan 2006 19:11:13 -0000 1.26 +++ flrshell.P 9 Mar 2006 08:58:17 -0000 1.27 @@ -75,7 +75,6 @@ fail. flora_shell_loop_handler(error(undefined_predicate(PredName,Arity,Module),_Msg,Trace)) :- - %flora_error_line('undefined error caught by flora'), %huiwan close_open_tables, print_backtrace(Trace), flora_undefined_predicate_hook(PredName,Arity,Module), Index: flrdependency.P =================================================================== RCS file: /cvsroot/flora/flora2/flrdependency.P,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- flrdependency.P 22 Dec 2005 22:37:18 -0000 1.24 +++ flrdependency.P 9 Mar 2006 08:58:17 -0000 1.25 @@ -65,6 +65,10 @@ #define PREFIXED_WRAP_EXISTS PREFIXING(WRAP_EXISTS) #define PREFIXED_WRAP_MVDDEF PREFIXING(WRAP_MVDDEF) #define PREFIXED_WRAP_IMVDDEF PREFIXING(WRAP_IMVDDEF) +#define PREFIXED_WRAP_BOOLSIG PREFIXING(WRAP_BOOLSIG) +#define PREFIXED_WRAP_IBOOLSIG PREFIXING(WRAP_IBOOLSIG) +#define PREFIXED_WRAP_TRANSIG PREFIXING(WRAP_TRANSIG) +#define PREFIXED_WRAP_ITRANSIG PREFIXING(WRAP_ITRANSIG) #define PREFIXED_WRAP_OBJEQL PREFIXING(WRAP_OBJEQL) #define PREFIXED_WRAP_TRAN PREFIXING(WRAP_TRAN) @@ -89,6 +93,10 @@ default_tabled(PREFIXED_WRAP_EXISTS,2). default_tabled(PREFIXED_WRAP_MVDDEF,3). default_tabled(PREFIXED_WRAP_IMVDDEF,3). +default_tabled(PREFIXED_WRAP_BOOLSIG,3). +default_tabled(PREFIXED_WRAP_IBOOLSIG,3). +default_tabled(PREFIXED_WRAP_TRANSIG,3). +default_tabled(PREFIXED_WRAP_ITRANSIG,3). default_tabled(PREFIXED_WRAP_OBJEQL,3). default_tabled(PREFIXED_WRAP_TABLED_HILOG,2). Index: flrwrapper.P =================================================================== RCS file: /cvsroot/flora/flora2/flrwrapper.P,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- flrwrapper.P 22 Dec 2005 22:37:18 -0000 1.32 +++ flrwrapper.P 9 Mar 2006 08:58:17 -0000 1.33 @@ -368,6 +368,10 @@ flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_IMVD],WSBimvd), flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_MVDSIG],WSBmvdsig), flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_IMVDSIG],WSBimvdsig), + flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_BOOLSIG],WSBboolsig), + flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_IBOOLSIG],WSBiboolsig), + flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_TRANSIG],WSBtransig), + flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_ITRANSIG],WSBitransig), flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_MVDCONDEF],WSBmvdcondef), flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_IMVDCONDEF],WSBimvdcondef), flora_concat_atoms([Prefix,'''',WS,'''',FLBODYPREFIX,WRAP_MVDCON],WSBmvdcon), @@ -385,6 +389,10 @@ assert(flora_flogic_fact_wrapper(WRAP_IMVD,WSBimvd)), assert(flora_flogic_fact_wrapper(WRAP_MVDSIG,WSBmvdsig)), assert(flora_flogic_fact_wrapper(WRAP_IMVDSIG,WSBimvdsig)), + assert(flora_flogic_fact_wrapper(WRAP_BOOLSIG,WSBboolsig)), + assert(flora_flogic_fact_wrapper(WRAP_IBOOLSIG,WSBiboolsig)), + assert(flora_flogic_fact_wrapper(WRAP_TRANSIG,WSBtransig)), + assert(flora_flogic_fact_wrapper(WRAP_ITRANSIG,WSBitransig)), assert(flora_flogic_fact_wrapper(WRAP_MVDCONDEF,WSBmvdcondef)), assert(flora_flogic_fact_wrapper(WRAP_IMVDCONDEF,WSBimvdcondef)), assert(flora_flogic_fact_wrapper(WRAP_MVDCON,WSBmvdcon)), @@ -446,13 +454,17 @@ flora_is_flogic_base(WRAP_IMVDDEF) :- !. flora_is_flogic_base(WRAP_TRAN) :- !. flora_is_flogic_base(WRAP_MVDSIG) :- !. -flora_is_flogic_base(WRAP_MVDCONDEF) :- !. +flora_is_flogic_base(WRAP_MVDCONDEF) :- !. flora_is_flogic_base(WRAP_MVDCON) :- !. flora_is_flogic_base(WRAP_MVDSIGDEF) :- !. flora_is_flogic_base(WRAP_IMVDSIG) :- !. -flora_is_flogic_base(WRAP_IMVDCONDEF) :- !. -flora_is_flogic_base(WRAP_IMVDCON) :- !. +flora_is_flogic_base(WRAP_IMVDCONDEF) :- !. +flora_is_flogic_base(WRAP_IMVDCON) :- !. flora_is_flogic_base(WRAP_IMVDSIGDEF) :- !. +flora_is_flogic_base(WRAP_BOOLSIG) :- !. +flora_is_flogic_base(WRAP_IBOOLSIG) :- !. +flora_is_flogic_base(WRAP_TRANSIG) :- !. +flora_is_flogic_base(WRAP_ITRANSIG) :- !. flora_is_flogic_base(WRAP_MVDINC) :- !. flora_is_flogic_base(WRAP_IMVDINC) :- !. flora_is_flogic_base(WRAP_MVDTOLIST) :- !. |
|
From: Hui W. <hw...@us...> - 2006-03-09 08:58:51
|
Update of /cvsroot/flora/flora2/debugger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/debugger Modified Files: dynamic_data.in Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: dynamic_data.in =================================================================== RCS file: /cvsroot/flora/flora2/debugger/dynamic_data.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- dynamic_data.in 22 Dec 2005 22:37:18 -0000 1.19 +++ dynamic_data.in 9 Mar 2006 08:58:17 -0000 1.20 @@ -68,6 +68,10 @@ flora_hide_this_show(FLHEADPREFIX(WRAP_IMVD)/4). flora_hide_this_show(FLHEADPREFIX(WRAP_MVDSIG)/4). flora_hide_this_show(FLHEADPREFIX(WRAP_IMVDSIG)/4). +flora_hide_this_show(FLHEADPREFIX(WRAP_BOOLSIG)/3). +flora_hide_this_show(FLHEADPREFIX(WRAP_IBOOLSIG)/3). +flora_hide_this_show(FLHEADPREFIX(WRAP_TRANSIG)/3). +flora_hide_this_show(FLHEADPREFIX(WRAP_ITRANSIG)/3). flora_hide_this_show(FLHEADPREFIX(WRAP_MVDCONDEF)/5). flora_hide_this_show(FLHEADPREFIX(WRAP_IMVDCONDEF)/5). flora_hide_this_show(FLHEADPREFIX(WRAP_TRAN)/3). @@ -84,6 +88,10 @@ flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVD)/4). flora_hide_this_show(FLDYNAPREFIX(WRAP_MVDSIG)/4). flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVDSIG)/4). +flora_hide_this_show(FLDYNAPREFIX(WRAP_BOOLSIG)/3). +flora_hide_this_show(FLDYNAPREFIX(WRAP_IBOOLSIG)/3). +flora_hide_this_show(FLDYNAPREFIX(WRAP_TRANSIG)/3). +flora_hide_this_show(FLDYNAPREFIX(WRAP_ITRANSIG)/3). flora_hide_this_show(FLDYNAPREFIX(WRAP_MVDCONDEF)/5). flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVDCONDEF)/5). flora_hide_this_show(FLDYNAPREFIX(WRAP_TRAN)/3). @@ -100,6 +108,10 @@ flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVD)/4). flora_hide_this_show(FLDYNZPREFIX(WRAP_MVDSIG)/4). flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVDSIG)/4). +flora_hide_this_show(FLDYNZPREFIX(WRAP_BOOLSIG)/3). +flora_hide_this_show(FLDYNZPREFIX(WRAP_IBOOLSIG)/3). +flora_hide_this_show(FLDYNZPREFIX(WRAP_TRANSIG)/3). +flora_hide_this_show(FLDYNZPREFIX(WRAP_ITRANSIG)/3). flora_hide_this_show(FLDYNZPREFIX(WRAP_MVDCONDEF)/5). flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVDCONDEF)/5). flora_hide_this_show(FLDYNZPREFIX(WRAP_TRAN)/3). @@ -135,6 +147,10 @@ flora_hide_this_show(FLTRAILERPREFIX(WRAP_TRAN)/3). flora_hide_this_show(FLTRAILERPREFIX(WRAP_MVDSIG)/4). flora_hide_this_show(FLTRAILERPREFIX(WRAP_IMVDSIG)/4). +flora_hide_this_show(FLTRAILERPREFIX(WRAP_BOOLSIG)/3). +flora_hide_this_show(FLTRAILERPREFIX(WRAP_IBOOLSIG)/3). +flora_hide_this_show(FLTRAILERPREFIX(WRAP_TRANSIG)/3). +flora_hide_this_show(FLTRAILERPREFIX(WRAP_ITRANSIG)/3). flora_hide_this_show(FLTRAILERPREFIX(WRAP_MVDCONDEF)/5). flora_hide_this_show(FLTRAILERPREFIX(WRAP_IMVDCONDEF)/5). @@ -153,6 +169,10 @@ flora_hide_this_show(match(WRAP_TRAN/3)). flora_hide_this_show(match(WRAP_MVDSIG/4)). flora_hide_this_show(match(WRAP_IMVDSIG/4)). +flora_hide_this_show(match(WRAP_BOOLSIG/3)). +flora_hide_this_show(match(WRAP_IBOOLSIG/3)). +flora_hide_this_show(match(WRAP_TRANSIG/3)). +flora_hide_this_show(match(WRAP_ITRANSIG/3)). flora_hide_this_show(match(WRAP_MVDCONDEF/5)). flora_hide_this_show(match(WRAP_IMVDCONDEF/5)). @@ -209,6 +229,10 @@ flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVD)/4). flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVDSIG)/4). flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVDSIG)/4). +flora_hide_this_hide(FLCHECKPREFIX(WRAP_BOOLSIG)/3). +flora_hide_this_hide(FLCHECKPREFIX(WRAP_IBOOLSIG)/3). +flora_hide_this_hide(FLCHECKPREFIX(WRAP_TRANSIG)/3). +flora_hide_this_hide(FLCHECKPREFIX(WRAP_ITRANSIG)/3). flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVDCONDEF)/5). flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVDCONDEF)/5). flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVDDEF)/3). |
|
From: Hui W. <hw...@us...> - 2006-03-09 08:58:50
|
Update of /cvsroot/flora/flora2/closure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/closure Modified Files: flrcommon.fli flreqltrailer.fli flreqltrailer_inh.fli flrnoeqltrailer.fli flrnoeqltrailer_inh.fli Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: flrnoeqltrailer_inh.fli =================================================================== RCS file: /cvsroot/flora/flora2/closure/flrnoeqltrailer_inh.fli,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- flrnoeqltrailer_inh.fli 22 Dec 2005 22:37:18 -0000 1.6 +++ flrnoeqltrailer_inh.fli 9 Mar 2006 08:58:17 -0000 1.7 @@ -387,6 +387,34 @@ %% Should have a cut here when XSB will allow +boolsig(O,M,CallerInfo) :- + inferred_boolsig(O,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inferred_iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + iboolsig(S,M,CallerInfo). + +transig(O,M,CallerInfo) :- + inferred_transig(O,M,CallerInfo). + +transig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + inferred_itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + itransig(S,M,CallerInfo). + /***************************************************************************** object existence *****************************************************************************/ Index: flrcommon.fli =================================================================== RCS file: /cvsroot/flora/flora2/closure/flrcommon.fli,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- flrcommon.fli 22 Dec 2005 22:37:18 -0000 1.32 +++ flrcommon.fli 9 Mar 2006 08:58:17 -0000 1.33 @@ -76,6 +76,18 @@ FLTRAILERPREFIX(imeth)(C,M,CallerInfo) :- checkCallerInfo(imeth(C,M),'FLORA_THIS_MODULE_NAME',CallerInfo), FLHEADPREFIX(imeth)(C,M,CallerInfo). +FLTRAILERPREFIX(boolsig)(O,M,CallerInfo) :- + checkCallerInfo(boolsig(O,M),'FLORA_THIS_MODULE_NAME',CallerInfo), + FLHEADPREFIX(boolsig)(O,M,CallerInfo). +FLTRAILERPREFIX(iboolsig)(C,M,CallerInfo) :- + checkCallerInfo(iboolsig(C,M),'FLORA_THIS_MODULE_NAME',CallerInfo), + FLHEADPREFIX(iboolsig)(C,M,CallerInfo). +FLTRAILERPREFIX(transig)(O,M,CallerInfo) :- + checkCallerInfo(transig(O,M),'FLORA_THIS_MODULE_NAME',CallerInfo), + FLHEADPREFIX(transig)(O,M,CallerInfo). +FLTRAILERPREFIX(itransig)(C,M,CallerInfo) :- + checkCallerInfo(itransig(C,M),'FLORA_THIS_MODULE_NAME',CallerInfo), + FLHEADPREFIX(itransig)(C,M,CallerInfo). FLTRAILERPREFIX(tran)(O,T,CallerInfo) :- checkCallerInfo(tran(O,T),'FLORA_THIS_MODULE_NAME',CallerInfo), FLHEADPREFIX(tran)(O,T,CallerInfo). Index: flrnoeqltrailer.fli =================================================================== RCS file: /cvsroot/flora/flora2/closure/flrnoeqltrailer.fli,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- flrnoeqltrailer.fli 22 Dec 2005 22:37:18 -0000 1.11 +++ flrnoeqltrailer.fli 9 Mar 2006 08:58:17 -0000 1.12 @@ -139,6 +139,34 @@ %% Should have a cut here when XSB will allow +boolsig(O,M,CallerInfo) :- + inferred_boolsig(O,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inferred_iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + iboolsig(S,M,CallerInfo). + +transig(O,M,CallerInfo) :- + inferred_transig(O,M,CallerInfo). + +transig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + inferred_itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + itransig(S,M,CallerInfo). + /***************************************************************************** object existence *****************************************************************************/ Index: flreqltrailer_inh.fli =================================================================== RCS file: /cvsroot/flora/flora2/closure/flreqltrailer_inh.fli,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- flreqltrailer_inh.fli 22 Dec 2005 22:37:18 -0000 1.5 +++ flreqltrailer_inh.fli 9 Mar 2006 08:58:17 -0000 1.6 @@ -834,6 +834,94 @@ %% Should have a cut here when XSB will allow +%% boolsig/3 +boolsig(O,M,CallerInfo) :- + inferred_boolsig(O,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + inferred_boolsig(OX,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_boolsig(O,MX,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_boolsig(OX,MX,CallerInfo). + +boolsig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + iboolsig(C,M,CallerInfo). + + +%% iboolsig/3 +iboolsig(C,M,CallerInfo) :- + inferred_iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + inferred_iboolsig(CX,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_iboolsig(C,MX,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_iboolsig(CX,MX,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + iboolsig(S,M,CallerInfo). + + +%% transig/3 +transig(O,M,CallerInfo) :- + inferred_transig(O,M,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + inferred_transig(OX,M,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_transig(O,MX,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_transig(OX,MX,CallerInfo). + +transig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + itransig(C,M,CallerInfo). + + +%% itransig/3 +itransig(C,M,CallerInfo) :- + inferred_itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + inferred_itransig(CX,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_itransig(C,MX,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_itransig(CX,MX,CallerInfo). + +itransig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + itransig(S,M,CallerInfo). + + /***************************************************************************** object existence *****************************************************************************/ Index: flreqltrailer.fli =================================================================== RCS file: /cvsroot/flora/flora2/closure/flreqltrailer.fli,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- flreqltrailer.fli 22 Dec 2005 22:37:18 -0000 1.22 +++ flreqltrailer.fli 9 Mar 2006 08:58:17 -0000 1.23 @@ -587,6 +587,94 @@ %% Should have a cut here when XSB will allow +%% boolsig/3 +boolsig(O,M,CallerInfo) :- + inferred_boolsig(O,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + inferred_boolsig(OX,M,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_boolsig(O,MX,CallerInfo). + +boolsig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_boolsig(OX,MX,CallerInfo). + +boolsig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + iboolsig(C,M,CallerInfo). + + +%% iboolsig/3 +iboolsig(C,M,CallerInfo) :- + inferred_iboolsig(C,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + inferred_iboolsig(CX,M,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_iboolsig(C,MX,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_iboolsig(CX,MX,CallerInfo). + +iboolsig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + iboolsig(S,M,CallerInfo). + + +%% transig/3 +transig(O,M,CallerInfo) :- + inferred_transig(O,M,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + inferred_transig(OX,M,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_transig(O,MX,CallerInfo). + +transig(O,M,CallerInfo) :- + diffobjeql(O,OX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_transig(OX,MX,CallerInfo). + +transig(O,M,CallerInfo) :- + isa(O,C,CallerInfo), + itransig(C,M,CallerInfo). + + +%% itransig/3 +itransig(C,M,CallerInfo) :- + inferred_itransig(C,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + inferred_itransig(CX,M,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(M,MX,CallerInfo), + inferred_itransig(C,MX,CallerInfo). + +itransig(C,M,CallerInfo) :- + diffobjeql(C,CX,CallerInfo), + diffobjeql(M,MX,CallerInfo), + inferred_itransig(CX,MX,CallerInfo). + +itransig(C,M,CallerInfo) :- + inheritance_sub(C,S,CallerInfo), + itransig(S,M,CallerInfo). + + /***************************************************************************** object existence *****************************************************************************/ |
|
From: Hui W. <hw...@us...> - 2006-03-09 08:58:30
|
Update of /cvsroot/flora/flora2/syslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/syslib Modified Files: flrbtdbop.P flrcanon.P flrdbop.P flrdecode.P flrmetaops.P Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: flrdbop.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrdbop.P,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- flrdbop.P 4 Jan 2006 08:59:10 -0000 1.33 +++ flrdbop.P 9 Mar 2006 08:58:18 -0000 1.34 @@ -508,6 +508,10 @@ ; Base == WRAP_TRAN -> Args=[O,_T,_Caller] ; Base == WRAP_MVDSIG -> Args=[_S,_AS,O,_Caller] ; Base == WRAP_IMVDSIG -> Args=[_S,_IAS,O,_Caller] + ; Base == WRAP_BOOLSIG -> Args=[O,_A,_Caller] + ; Base == WRAP_IBOOLSIG -> Args=[O,_IA,_Caller] + ; Base == WRAP_TRANSIG -> Args=[O,_A,_Caller] + ; Base == WRAP_ITRANSIG -> Args=[O,_IA,_Caller] ; Base == WRAP_MVDCONDEF -> Args=[_S,_AS,O,_O2,_Caller] ; Base == WRAP_IMVDCONDEF -> Args=[_S,_IAS,O,_O2,_Caller] ; Base == WRAP_MVDCON -> Args=[_S,_AS,O,_O2,_Caller] @@ -541,6 +545,10 @@ flora_flogic_fact_wrapper(WRAP_IMVD,WSBimvd), flora_flogic_fact_wrapper(WRAP_MVDSIG,WSBmvdsig), flora_flogic_fact_wrapper(WRAP_IMVDSIG,WSBimvdsig), + flora_flogic_fact_wrapper(WRAP_BOOLSIG,WSBboolsig), + flora_flogic_fact_wrapper(WRAP_IBOOLSIG,WSBiboolsig), + flora_flogic_fact_wrapper(WRAP_TRANSIG,WSBtransig), + flora_flogic_fact_wrapper(WRAP_ITRANSIG,WSBitransig), flora_flogic_fact_wrapper(WRAP_MVDCONDEF,WSBmvdcondef), flora_flogic_fact_wrapper(WRAP_IMVDCONDEF,WSBimvdcondef), flora_flogic_fact_wrapper(WRAP_MVDCON,WSBmvdcon), @@ -578,6 +586,10 @@ Pimvd =.. [WSBimvd,O,_,_,_], Pmvdsig =.. [WSBmvdsig,O,_,_,_], Pimvdsig =.. [WSBimvdsig,O,_,_,_], + Pboolsig =.. [WSBboolsig,O,_,_], + Piboolsig =.. [WSBiboolsig,O,_,_], + Ptransig =.. [WSBtransig,O,_,_], + Pitransig =.. [WSBitransig,O,_,_], Pmvdcondef =.. [WSBmvdcondef,O,_,_,_,_], Pimvdcondef =.. [WSBimvdcondef,O,_,_,_,_], Pmvdcon =.. [WSBmvdcon,O,_,_,_,_], @@ -595,6 +607,10 @@ flora_storage_deleteall(ThisModuleName,Pimvd,StorageName), flora_storage_deleteall(ThisModuleName,Pmvdsig,StorageName), flora_storage_deleteall(ThisModuleName,Pimvdsig,StorageName), + flora_storage_deleteall(ThisModuleName,Pboolsig,StorageName), + flora_storage_deleteall(ThisModuleName,Piboolsig,StorageName), + flora_storage_deleteall(ThisModuleName,Ptransig,StorageName), + flora_storage_deleteall(ThisModuleName,Pitransig,StorageName), flora_storage_deleteall(ThisModuleName,Pmvdcondef,StorageName), flora_storage_deleteall(ThisModuleName,Pimvdcondef,StorageName), flora_storage_deleteall(ThisModuleName,Pmvdcon,StorageName), Index: flrmetaops.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrmetaops.P,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- flrmetaops.P 3 Mar 2006 04:12:39 -0000 1.26 +++ flrmetaops.P 9 Mar 2006 08:58:18 -0000 1.27 @@ -489,6 +489,10 @@ flogic_wrapper(WRAP_METH, 'boolean', 2). flogic_wrapper(WRAP_IMETH, '*boolean', 2). flogic_wrapper(WRAP_TRAN, '%boolean', 2). +flogic_wrapper(WRAP_BOOLSIG, '=>boolean', 2). +flogic_wrapper(WRAP_IBOOLSIG, '*=>boolean', 2). +flogic_wrapper(WRAP_TRANSIG, '=>%boolean', 2). +flogic_wrapper(WRAP_ITRANSIG, '*=>%boolean', 2). flogic_wrapper(WRAP_OBJEQL, ':=:', 2). flogic_wrapper(WRAP_EXISTS, '[]', 1). Index: flrbtdbop.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrbtdbop.P,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- flrbtdbop.P 4 Jan 2006 08:59:10 -0000 1.29 +++ flrbtdbop.P 9 Mar 2006 08:58:18 -0000 1.30 @@ -493,6 +493,10 @@ ; Base == WRAP_TRAN -> Args=[O,_T,_Caller] ; Base == WRAP_MVDSIG -> Args=[_S,_AS,O,_Caller] ; Base == WRAP_IMVDSIG -> Args=[_S,_IAS,O,_Caller] + ; Base == WRAP_BOOLSIG -> Args=[O,_A,_Caller] + ; Base == WRAP_IBOOLSIG -> Args=[O,_IA,_Caller] + ; Base == WRAP_TRANSIG -> Args=[O,_A,_Caller] + ; Base == WRAP_ITRANSIG -> Args=[O,_IA,_Caller] ; Base == WRAP_MVDCONDEF -> Args=[_S,_AS,O,_O2,_Caller] ; Base == WRAP_IMVDCONDEF -> Args=[_S,_IAS,O,_O2,_Caller] ; Base == WRAP_MVDCON -> Args=[_S,_AS,O,_O2,_Caller] @@ -526,6 +530,10 @@ flora_flogic_fact_wrapper(WRAP_IMVD,WSBimvd), flora_flogic_fact_wrapper(WRAP_MVDSIG,WSBmvdsig), flora_flogic_fact_wrapper(WRAP_IMVDSIG,WSBimvdsig), + flora_flogic_fact_wrapper(WRAP_BOOLSIG,WSBboolsig), + flora_flogic_fact_wrapper(WRAP_IBOOLSIG,WSBiboolsig), + flora_flogic_fact_wrapper(WRAP_TRANSIG,WSBtransig), + flora_flogic_fact_wrapper(WRAP_ITRANSIG,WSBitransig), flora_flogic_fact_wrapper(WRAP_MVDCONDEF,WSBmvdcondef), flora_flogic_fact_wrapper(WRAP_IMVDCONDEF,WSBimvdcondef), flora_flogic_fact_wrapper(WRAP_MVDCON,WSBmvdcon), @@ -563,6 +571,10 @@ Pimvd =.. [WSBimvd,O,_,_,_], Pmvdsig =.. [WSBmvdsig,O,_,_,_], Pimvdsig =.. [WSBimvdsig,O,_,_,_], + Pboolsig =.. [WSBboolsig,O,_,_], + Piboolsig =.. [WSBiboolsig,O,_,_], + Ptransig =.. [WSBtransig,O,_,_], + Pitransig =.. [WSBitransig,O,_,_], Pmvdcondef =.. [WSBmvdcondef,O,_,_,_,_], Pimvdcondef =.. [WSBimvdcondef,O,_,_,_,_], Pmvdcon =.. [WSBmvdcon,O,_,_,_,_], @@ -580,6 +592,10 @@ flora_storage_deleteall_bt(ThisModuleName,Pimvd,StorageName), flora_storage_deleteall_bt(ThisModuleName,Pmvdsig,StorageName), flora_storage_deleteall_bt(ThisModuleName,Pimvdsig,StorageName), + flora_storage_deleteall_bt(ThisModuleName,Pboolsig,StorageName), + flora_storage_deleteall_bt(ThisModuleName,Piboolsig,StorageName), + flora_storage_deleteall_bt(ThisModuleName,Ptransig,StorageName), + flora_storage_deleteall_bt(ThisModuleName,Pitransig,StorageName), flora_storage_deleteall_bt(ThisModuleName,Pmvdcondef,StorageName), flora_storage_deleteall_bt(ThisModuleName,Pimvdcondef,StorageName), flora_storage_deleteall_bt(ThisModuleName,Pmvdcon,StorageName), Index: flrcanon.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrcanon.P,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- flrcanon.P 4 Jan 2006 08:59:10 -0000 1.32 +++ flrcanon.P 9 Mar 2006 08:58:18 -0000 1.33 @@ -775,6 +775,23 @@ to_signature_atom(WRAP_IMVDSIG,inheritable,WRAP_IMVDSIG) :- !. to_signature_atom(WRAP_MVD,inheritable,WRAP_IMVDSIG) :- !. to_signature_atom(WRAP_IMVD,inheritable,WRAP_IMVDSIG) :- !. + +to_signature_atom(WRAP_BOOLSIG,noninheritable,WRAP_BOOLSIG) :- !. +to_signature_atom(WRAP_IBOOLSIG,noninheritable,WRAP_BOOLSIG) :- !. +to_signature_atom(WRAP_METH,noninheritable,WRAP_BOOLSIG) :- !. +to_signature_atom(WRAP_IMETH,noninheritable,WRAP_BOOLSIG) :- !. +to_signature_atom(WRAP_BOOLSIG,inheritable,WRAP_IBOOLSIG) :- !. +to_signature_atom(WRAP_IBOOLSIG,inheritable,WRAP_IBOOLSIG) :- !. +to_signature_atom(WRAP_METH,inheritable,WRAP_IBOOLSIG) :- !. +to_signature_atom(WRAP_IMETH,inheritable,WRAP_IBOOLSIG) :- !. + +to_signature_atom(WRAP_TRANSIG,noninheritable,WRAP_TRANSIG) :- !. +to_signature_atom(WRAP_ITRANSIG,noninheritable,WRAP_TRANSIG) :- !. +to_signature_atom(WRAP_TRAN,noninheritable,WRAP_TRANSIG) :- !. +to_signature_atom(WRAP_TRANSIG,inheritable,WRAP_ITRANSIG) :- !. +to_signature_atom(WRAP_ITRANSIG,inheritable,WRAP_ITRANSIG) :- !. +to_signature_atom(WRAP_TRAN,inheritable,WRAP_ITRANSIG) :- !. + to_value_atom(WRAP_IMVD,noninheritable,WRAP_MVD) :- !. to_value_atom(WRAP_MVD,noninheritable,WRAP_MVD) :- !. to_value_atom(WRAP_IMVDSIG,noninheritable,WRAP_MVD) :- !. @@ -783,3 +800,16 @@ to_value_atom(WRAP_MVD,inheritable,WRAP_IMVD) :- !. to_value_atom(WRAP_IMVDSIG,inheritable,WRAP_IMVD) :- !. to_value_atom(WRAP_MVDSIG,inheritable,WRAP_IMVD) :- !. + +to_value_atom(WRAP_IMETH,noninheritable,WRAP_METH) :- !. +to_value_atom(WRAP_METH,noninheritable,WRAP_METH) :- !. +to_value_atom(WRAP_IBOOLSIG,noninheritable,WRAP_METH) :- !. +to_value_atom(WRAP_BOOLSIG,noninheritable,WRAP_METH) :- !. +to_value_atom(WRAP_IMETH,inheritable,WRAP_IMETH) :- !. +to_value_atom(WRAP_METH,inheritable,WRAP_IMETH) :- !. +to_value_atom(WRAP_IBOOLSIG,inheritable,WRAP_IMETH) :- !. +to_value_atom(WRAP_BOOLSIG,inheritable,WRAP_IMETH) :- !. + +to_value_atom(WRAP_TRAN,noninheritable,WRAP_TRAN) :- !. +to_value_atom(WRAP_ITRANSIG,noninheritable,WRAP_TRAN) :- !. +to_value_atom(WRAP_TRANSIG,noninheritable,WRAP_TRAN) :- !. Index: flrdecode.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrdecode.P,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- flrdecode.P 22 Dec 2005 22:37:19 -0000 1.41 +++ flrdecode.P 9 Mar 2006 08:58:18 -0000 1.42 @@ -310,6 +310,10 @@ decode_molecule_base(WRAP_IMVDDEF, [O,M|_], [O,'!',M,'[]']). decode_molecule_base(WRAP_MVDSIG, [O,M,V|_], [O,'[',M,' => ',V,']']). decode_molecule_base(WRAP_IMVDSIG, [O,M,V|_], [O,'[',M,' *=> ',V,']']). +decode_molecule_base(WRAP_BOOLSIG, [O,P|_], [O,'[',' => ',P,']']). +decode_molecule_base(WRAP_IBOOLSIG, [O,P|_], [O,'[',' *=> ',P,']']). +decode_molecule_base(WRAP_TRANSIG, [O,P|_], [O,'[',' =>% ',P,']']). +decode_molecule_base(WRAP_ITRANSIG, [O,P|_], [O,'[',' *=>% ',P,']']). decode_molecule_base(WRAP_MVDCON, [O,M,L,U|_], [O,'[',M,'{',L,':',U,'}=>?']). decode_molecule_base(WRAP_IMVDCON, [O,M,L,U|_], [O,'[',M,'{',L,':',U,'}*=>?']). decode_molecule_base(WRAP_MVDCONDEF, [O,M,L,U|_], [O,'[',M,'{',L,':',U,'}=>?']). |
|
From: Hui W. <hw...@us...> - 2006-03-09 08:58:28
|
Update of /cvsroot/flora/flora2/flrincludes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/flrincludes Modified Files: flora_errors.flh flora_terms.flh flora_wspredicates.flh Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: flora_terms.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_terms.flh,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- flora_terms.flh 22 Dec 2005 22:37:19 -0000 1.60 +++ flora_terms.flh 9 Mar 2006 08:58:18 -0000 1.61 @@ -181,10 +181,14 @@ #define FL_INMVDSIGARR '*=>' #define FL_INMETH '*' #define FL_CONSTR ':' +#define FL_BOOLSIGARR '=>' +#define FL_INBOOLSIGARR '*=>' #mode save #mode nocomment "%" #define FL_TRAN '%' +#define FL_TRANSIGARR '=>%' +#define FL_INTRANSIGARR '*=>%' #mode restore #define FL_UNIVEQ '=' @@ -324,6 +328,10 @@ FLSIGATTCONSPEC(FLPATHEXP,Constraint,AttRefType,FLPATHEXPLIST) FLINCATTSPEC(FLPATHEXP,AttRefType,FLPATHEXP) FLTOLISTATTSPEC(FLPATHEXP,AttRefType,FLPATHEXP) + FLBOOLSIG(FLPATHEXP,AttRefType) + FLIBOOLSIG(FLPATHEXP,AttRefType) + FLTRANSIG(TRAN,AttRefType) + FLITRANSIG(TRAN,AttRefType) FLMETHSPEC(Meth) FLIMETHSPEC(IMeth) FLSIGCONSTR(FLPATHEXP,FLPATHEXP) @@ -417,6 +425,10 @@ #define FLSIGATTCONSPEC flsigattconspec #define FLINCATTSPEC flincattspec #define FLTOLISTATTSPEC fltolistattspec +#define FLBOOLSIG flboolsig +#define FLIBOOLSIG fliboolsig +#define FLTRANSIG fltransig +#define FLITRANSIG flitransig #define FLMETHSPEC flmethspec #define FLIMETHSPEC flimethspec #define FLSIGCONSTR flsigconstr @@ -572,6 +584,10 @@ #define PRIMVDCON primvdcon #define PRIMVDCONDEF primvdcondef #define PRIMVDSIGDEF primvdsigdef +#define PRBOOLSIG prboolsig +#define PRIBOOLSIG priboolsig +#define PRTRANSIG prtransig +#define PRITRANSIG pritransig #define PRMVD prmvd #define PRIMVD primvd #define PRMVDINC prmvdinc @@ -615,6 +631,10 @@ #define WRAP_MVDCON mvdcon #define WRAP_MVDCONDEF mvdcondef #define WRAP_IMVDSIG imvdsig +#define WRAP_BOOLSIG boolsig +#define WRAP_IBOOLSIG iboolsig +#define WRAP_TRANSIG transig +#define WRAP_ITRANSIG itransig #define WRAP_IMVDSIGDEF imvdsigdef #define WRAP_IMVDCON imvdcon #define WRAP_IMVDCONDEF imvdcondef @@ -629,7 +649,7 @@ #define WRAP_DIFFOBJEQL diffobjeql -#define WRAP_LIST [WRAP_TABLED_HILOG, WRAP_HILOG,WRAP_ISA, WRAP_SUB, WRAP_METH, WRAP_IMETH, WRAP_TRAN, WRAP_MVD,WRAP_IMVD, WRAP_MVDSIG, WRAP_MVDSIGDEF, WRAP_MVDCON, WRAP_MVDCONDEF, WRAP_IMVDSIG, WRAP_IMVDSIGDEF, WRAP_IMVDCON, WRAP_IMVDCONDEF, WRAP_EXISTS, WRAP_MVDDEF, WRAP_IMVDDEF, WRAP_OBJEQL] +#define WRAP_LIST [WRAP_TABLED_HILOG, WRAP_HILOG,WRAP_ISA, WRAP_SUB, WRAP_METH, WRAP_IMETH, WRAP_TRANSIG, WRAP_ITRANSIG, WRAP_BOOLSIG, WRAP_IBOOLSIG, WRAP_TRAN, WRAP_MVD,WRAP_IMVD, WRAP_MVDSIG, WRAP_MVDSIGDEF, WRAP_MVDCON, WRAP_MVDCONDEF, WRAP_IMVDSIG, WRAP_IMVDSIGDEF, WRAP_IMVDCON, WRAP_IMVDCONDEF, WRAP_EXISTS, WRAP_MVDDEF, WRAP_IMVDDEF, WRAP_OBJEQL] /* Wrapper names that occur in the body of the compiled rules that come @@ -646,6 +666,10 @@ #define WRAP_D_MVDSIGDEF FLDEBUGPREFIX(WRAP_MVDSIGDEF) #define WRAP_D_MVDCON FLDEBUGPREFIX(WRAP_MVDCON) #define WRAP_D_IMVDSIG FLDEBUGPREFIX(WRAP_IMVDSIG) +#define WRAP_D_BOOLSIG FLDEBUGPREFIX(WRAP_BOOLSIG) +#define WRAP_D_IBOOLSIG FLDEBUGPREFIX(WRAP_IBOOLSIG) +#define WRAP_D_TRANSIG FLDEBUGPREFIX(WRAP_TRANSIG) +#define WRAP_D_ITRANSIG FLDEBUGPREFIX(WRAP_ITRANSIG) #define WRAP_D_IMVDSIGDEF FLDEBUGPREFIX(WRAP_IMVDSIGDEF) #define WRAP_D_IMVDCON FLDEBUGPREFIX(WRAP_IMVDCON) #define WRAP_D_MVDINC FLDEBUGPREFIX(WRAP_MVDINC) Index: flora_wspredicates.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_wspredicates.flh,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- flora_wspredicates.flh 22 Dec 2005 22:37:19 -0000 1.18 +++ flora_wspredicates.flh 9 Mar 2006 08:58:18 -0000 1.19 @@ -34,6 +34,10 @@ FLHEADPREFIX(WRAP_IMVDSIG)/4, FLHEADPREFIX(WRAP_IMVDCONDEF)/5, FLHEADPREFIX(WRAP_IMVDSIGDEF)/3, + FLHEADPREFIX(WRAP_BOOLSIG)/3, + FLHEADPREFIX(WRAP_IBOOLSIG)/3, + FLHEADPREFIX(WRAP_TRANSIG)/3, + FLHEADPREFIX(WRAP_ITRANSIG)/3, FLHEADPREFIX(WRAP_METH)/3, FLHEADPREFIX(WRAP_IMETH)/3, FLHEADPREFIX(WRAP_TRAN)/3, @@ -61,6 +65,10 @@ FLTRAILERPREFIX(WRAP_IMVDSIG)/4, FLTRAILERPREFIX(WRAP_IMVDCONDEF)/5, FLTRAILERPREFIX(WRAP_IMVDSIGDEF)/3, + FLTRAILERPREFIX(WRAP_BOOLSIG)/3, + FLTRAILERPREFIX(WRAP_IBOOLSIG)/3, + FLTRAILERPREFIX(WRAP_TRANSIG)/3, + FLTRAILERPREFIX(WRAP_ITRANSIG)/3, FLTRAILERPREFIX(WRAP_METH)/3, FLTRAILERPREFIX(WRAP_IMETH)/3, FLTRAILERPREFIX(WRAP_TRAN)/3, @@ -131,6 +139,10 @@ WRAP_IMVDSIG/4, WRAP_IMVDCONDEF/5, WRAP_IMVDSIGDEF/3, + WRAP_BOOLSIG/3, + WRAP_IBOOLSIG/3, + WRAP_TRANSIG/3, + WRAP_ITRANSIG/3, WRAP_METH/3, WRAP_IMETH/3, WRAP_TRAN/3, @@ -156,6 +168,10 @@ WRAP_IMVDSIG/4, WRAP_IMVDCONDEF/5, WRAP_IMVDSIGDEF/3, + WRAP_BOOLSIG/3, + WRAP_IBOOLSIG/3, + WRAP_TRANSIG/3, + WRAP_ITRANSIG/3, WRAP_METH/3, WRAP_IMETH/3, WRAP_TRAN/3, @@ -290,6 +306,10 @@ FLDYNAPREFIX(WRAP_IMVDSIG)/4, FLDYNAPREFIX(WRAP_IMVDCONDEF)/5, FLDYNAPREFIX(WRAP_IMVDSIGDEF)/3, + FLDYNAPREFIX(WRAP_BOOLSIG)/3, + FLDYNAPREFIX(WRAP_IBOOLSIG)/3, + FLDYNAPREFIX(WRAP_TRANSIG)/3, + FLDYNAPREFIX(WRAP_ITRANSIG)/3, FLDYNAPREFIX(WRAP_METH)/3, FLDYNAPREFIX(WRAP_IMETH)/3, FLDYNAPREFIX(WRAP_TRAN)/3, @@ -313,6 +333,10 @@ FLDYNZPREFIX(WRAP_IMVDSIG)/4, FLDYNZPREFIX(WRAP_IMVDCONDEF)/5, FLDYNZPREFIX(WRAP_IMVDSIGDEF)/3, + FLDYNZPREFIX(WRAP_BOOLSIG)/3, + FLDYNZPREFIX(WRAP_IBOOLSIG)/3, + FLDYNZPREFIX(WRAP_TRANSIG)/3, + FLDYNZPREFIX(WRAP_ITRANSIG)/3, FLDYNZPREFIX(WRAP_METH)/3, FLDYNZPREFIX(WRAP_IMETH)/3, FLDYNZPREFIX(WRAP_TRAN)/3, @@ -395,6 +419,10 @@ WRAP_D_IMVDSIG/4, WRAP_D_IMVDCON/5, WRAP_D_IMVDSIGDEF/3, + WRAP_D_BOOLSIG/3, + WRAP_D_IBOOLSIG/3, + WRAP_D_TRANSIG/3, + WRAP_D_ITRANSIG/3, WRAP_D_MVDDEF/3, WRAP_D_IMVDDEF/3, WRAP_D_TRAN/3, @@ -418,6 +446,10 @@ FLCHECKPREFIX(WRAP_IMVDSIG)/4, FLDEFINEDPREFIX(WRAP_IMVDSIG)/4, FLCHECKPREFIX(WRAP_IMVDCONDEF)/5, FLDEFINEDPREFIX(WRAP_IMVDCONDEF)/5, FLCHECKPREFIX(WRAP_IMVDSIGDEF)/3, FLDEFINEDPREFIX(WRAP_IMVDSIGDEF)/3, + FLCHECKPREFIX(WRAP_BOOLSIG)/3, FLDEFINEDPREFIX(WRAP_BOOLSIG)/3, + FLCHECKPREFIX(WRAP_IBOOLSIG)/3, FLDEFINEDPREFIX(WRAP_IBOOLSIG)/3, + FLCHECKPREFIX(WRAP_TRANSIG)/3, FLDEFINEDPREFIX(WRAP_TRANSIG)/3, + FLCHECKPREFIX(WRAP_ITRANSIG)/3, FLDEFINEDPREFIX(WRAP_ITRANSIG)/3, FLCHECKPREFIX(WRAP_MVDDEF)/3, FLDEFINEDPREFIX(WRAP_MVDDEF)/3, FLCHECKPREFIX(WRAP_IMVDDEF)/3, FLDEFINEDPREFIX(WRAP_IMVDDEF)/3, FLCHECKPREFIX(WRAP_TRAN)/3, FLDEFINEDPREFIX(WRAP_TRAN)/3. Index: flora_errors.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_errors.flh,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- flora_errors.flh 22 Dec 2005 22:37:19 -0000 1.36 +++ flora_errors.flh 9 Mar 2006 08:58:18 -0000 1.37 @@ -105,6 +105,7 @@ #define ERROR_PRLGLIT 'invalid PROLOG literal' #define ERROR_HILGTERM 'invalid HiLog term' #define ERROR_WSNAME 'invalid module name' +#define ERROR_BOOLSIG 'invalid boolean signature' #define ERROR_PATHEXP 'invalid path expression' #define ERROR_HDLITERAL 'invalid literal/molecule in rule head' #define ERROR_EXPINHEAD 'invalid path expression in rule head' |
Update of /cvsroot/flora/flora2/genincludes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/genincludes Modified Files: flrdyna.fli flrdynz.fli flrexportcheck.fli flrindex_P.fli flrpatch.fli flrpreddef.fli flrrefreshtable.fli flrtable.fli Log Message: Added in boolean method signatures and transactional method signatures, e.g. C[=>meth], C[*=>meth], C[=>%meth], C[*=>%meth]. Index: flrtable.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrtable.fli,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- flrtable.fli 22 Dec 2005 22:37:19 -0000 1.8 +++ flrtable.fli 9 Mar 2006 08:58:18 -0000 1.9 @@ -43,6 +43,12 @@ WRAP_METH/3, WRAP_IMETH/3. :- table + WRAP_BOOLSIG/3, + WRAP_IBOOLSIG/3. +:- table + WRAP_TRANSIG/3, + WRAP_ITRANSIG/3. +:- table WRAP_EXISTS/2, WRAP_DIFFOBJEQL/3. @@ -69,6 +75,12 @@ WRAP_METH/3, WRAP_IMETH/3. :- use_variant_tabling + WRAP_BOOLSIG/3, + WRAP_IBOOLSIG/3. +:- use_variant_tabling + WRAP_TRANSIG/3, + WRAP_ITRANSIG/3. +:- use_variant_tabling WRAP_EXISTS/2, WRAP_DIFFOBJEQL/3. Index: flrexportcheck.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrexportcheck.fli,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- flrexportcheck.fli 22 Dec 2005 22:37:19 -0000 1.6 +++ flrexportcheck.fli 9 Mar 2006 08:58:18 -0000 1.7 @@ -34,9 +34,25 @@ CallerInfo = [Caller|_], flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_IMETH(X,Y,CallerInfo)). +WRAP_D_BOOLSIG(X,Y,CallerInfo) :- + CallerInfo = [Caller|_], + flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_BOOLSIG(X,Y,CallerInfo)). + +WRAP_D_IBOOLSIG(X,Y,CallerInfo) :- + CallerInfo = [Caller|_], + flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_IBOOLSIG(X,Y,CallerInfo)). + +WRAP_D_TRANSIG(X,Y,CallerInfo) :- + CallerInfo = [Caller|_], + flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_TRANSIG(X,Y,CallerInfo)). + +WRAP_D_ITRANSIG(X,Y,CallerInfo) :- + CallerInfo = [Caller|_], + flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_ITRANSIG(X,Y,CallerInfo)). + WRAP_D_MVD(X,Y,Z,CallerInfo) :- CallerInfo = [Caller|_], - flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_MVD(X,Y,Z,CallerInfo)). + flora_check_export_registry(Caller, 'FLORA_THIS_MODULE_NAME', WRAP_MVD(X,Y,Z,CallerInfo)). WRAP_D_IMVD(X,Y,Z,CallerInfo) :- CallerInfo = [Caller|_], Index: flrrefreshtable.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrrefreshtable.fli,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- flrrefreshtable.fli 22 Dec 2005 22:37:19 -0000 1.5 +++ flrrefreshtable.fli 9 Mar 2006 08:58:18 -0000 1.6 @@ -104,6 +104,34 @@ flora_abolish_table_call(WRAP_METH(X,Y,_Caller)) )). +%% BOOLSIG, IBOOLSIG +?- assert(( + FLORA_SYMBOL('refresh_table_for')(WRAP_BOOLSIG(X,Y,_Caller)) :- + !, + flora_abolish_table_call(WRAP_BOOLSIG(X,Y,_Caller)) + )). + +?- assert(( + FLORA_SYMBOL('refresh_table_for')(WRAP_IBOOLSIG(X,Y,_Caller)) :- + !, + flora_abolish_table_call(WRAP_IBOOLSIG(X,Y,_Caller)), + flora_abolish_table_call(WRAP_BOOLSIG(X,Y,_Caller)) + )). + +%% TRANSIG, ITRANSIG +?- assert(( + FLORA_SYMBOL('refresh_table_for')(WRAP_TRANSIG(X,Y,_Caller)) :- + !, + flora_abolish_table_call(WRAP_TRANSIG(X,Y,_Caller)) + )). + +?- assert(( + FLORA_SYMBOL('refresh_table_for')(WRAP_ITRANSIG(X,Y,_Caller)) :- + !, + flora_abolish_table_call(WRAP_ITRANSIG(X,Y,_Caller)), + flora_abolish_table_call(WRAP_TRANSIG(X,Y,_Caller)) + )). + %% EXISTS, OBJEQL ?- assert(( FLORA_SYMBOL('refresh_table_for')(WRAP_EXISTS(X,_Caller)) :- Index: flrindex_P.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrindex_P.fli,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- flrindex_P.fli 22 Dec 2005 22:37:19 -0000 1.10 +++ flrindex_P.fli 9 Mar 2006 08:58:18 -0000 1.11 @@ -35,6 +35,12 @@ FLHEADPREFIX(WRAP_METH)/3-2, FLHEADPREFIX(WRAP_IMETH)/3-2. :- WRAP_INDICES + FLHEADPREFIX(WRAP_BOOLSIG)/3-2, + FLHEADPREFIX(WRAP_IBOOLSIG)/3-2. +:- WRAP_INDICES + FLHEADPREFIX(WRAP_TRANSIG)/3-2, + FLHEADPREFIX(WRAP_ITRANSIG)/3-2. +:- WRAP_INDICES FLHEADPREFIX(WRAP_TRAN)/3-2, FLHEADPREFIX(WRAP_OBJEQL)/3-2. @@ -56,5 +62,11 @@ FLHEADPREFIX(WRAP_METH)/3-1, FLHEADPREFIX(WRAP_IMETH)/3-1. :- WRAP_INDICES + FLHEADPREFIX(WRAP_BOOLSIG)/3-1, + FLHEADPREFIX(WRAP_IBOOLSIG)/3-1. +:- WRAP_INDICES + FLHEADPREFIX(WRAP_TRANSIG)/3-1, + FLHEADPREFIX(WRAP_ITRANSIG)/3-1. +:- WRAP_INDICES FLHEADPREFIX(WRAP_TRAN)/3-1, FLHEADPREFIX(WRAP_OBJEQL)/3-1. Index: flrdynz.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrdynz.fli,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- flrdynz.fli 22 Dec 2005 22:37:19 -0000 1.6 +++ flrdynz.fli 9 Mar 2006 08:58:18 -0000 1.7 @@ -205,6 +205,18 @@ FLHEADPREFIX(WRAP_IMETH)(X,Y,_Caller) :- FLDYNZPREFIX(WRAP_IMETH)(X,Y,_Caller). +FLHEADPREFIX(WRAP_BOOLSIG)(X,Y,_Caller) :- + FLDYNZPREFIX(WRAP_BOOLSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller) :- + FLDYNZPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_TRANSIG)(X,Y,_Caller) :- + FLDYNZPREFIX(WRAP_TRANSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_ITRANSIG)(X,Y,_Caller) :- + FLDYNZPREFIX(WRAP_ITRANSIG)(X,Y,_Caller). + FLHEADPREFIX(WRAP_MVD)(X,Y,Z,_Caller) :- FLDYNZPREFIX(WRAP_MVD)(X,Y,Z,_Caller). Index: flrpatch.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrpatch.fli,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- flrpatch.fli 22 Dec 2005 22:37:19 -0000 1.12 +++ flrpatch.fli 9 Mar 2006 08:58:18 -0000 1.13 @@ -27,6 +27,10 @@ :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDDEF)/3,WRAP_MVDDEF)). :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_METH)/3,WRAP_METH)). :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMETH)/3,WRAP_IMETH)). +:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_BOOLSIG)/3,WRAP_BOOLSIG)). +:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IBOOLSIG)/3,WRAP_IBOOLSIG)). +:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_TRANSIG)/3,WRAP_TRANSIG)). +:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_ITRANSIG)/3,WRAP_ITRANSIG)). :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_TRAN)/3,WRAP_TRAN)). :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDSIG)/4,WRAP_MVDSIG)). :- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDCONDEF)/5,WRAP_MVDCONDEF)). Index: flrdyna.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrdyna.fli,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- flrdyna.fli 22 Dec 2005 22:37:19 -0000 1.9 +++ flrdyna.fli 9 Mar 2006 08:58:18 -0000 1.10 @@ -375,6 +375,10 @@ ?- abolish(FLDYNAPREFIX(WRAP_SUB)/3). ?- abolish(FLDYNAPREFIX(WRAP_METH)/3). ?- abolish(FLDYNAPREFIX(WRAP_IMETH)/3). +?- abolish(FLDYNAPREFIX(WRAP_BOOLSIG)/3). +?- abolish(FLDYNAPREFIX(WRAP_IBOOLSIG)/3). +?- abolish(FLDYNAPREFIX(WRAP_TRANSIG)/3). +?- abolish(FLDYNAPREFIX(WRAP_ITRANSIG)/3). ?- abolish(FLDYNAPREFIX(WRAP_MVD)/4). ?- abolish(FLDYNAPREFIX(WRAP_IMVD)/4). ?- abolish(FLDYNAPREFIX(WRAP_MVDSIG)/4). @@ -393,6 +397,10 @@ ?- abolish(FLDYNZPREFIX(WRAP_SUB)/3). ?- abolish(FLDYNZPREFIX(WRAP_METH)/3). ?- abolish(FLDYNZPREFIX(WRAP_IMETH)/3). +?- abolish(FLDYNZPREFIX(WRAP_BOOLSIG)/3). +?- abolish(FLDYNZPREFIX(WRAP_IBOOLSIG)/3). +?- abolish(FLDYNZPREFIX(WRAP_TRANSIG)/3). +?- abolish(FLDYNZPREFIX(WRAP_ITRANSIG)/3). ?- abolish(FLDYNZPREFIX(WRAP_MVD)/4). ?- abolish(FLDYNZPREFIX(WRAP_IMVD)/4). ?- abolish(FLDYNZPREFIX(WRAP_MVDSIG)/4). @@ -416,6 +424,14 @@ :- dynamic FLDYNAPREFIX(WRAP_IMETH)/3,FLDYNZPREFIX(WRAP_IMETH)/3. :- dynamic + FLDYNAPREFIX(WRAP_BOOLSIG)/3,FLDYNZPREFIX(WRAP_BOOLSIG)/3. +:- dynamic + FLDYNAPREFIX(WRAP_IBOOLSIG)/3,FLDYNZPREFIX(WRAP_IBOOLSIG)/3. +:- dynamic + FLDYNAPREFIX(WRAP_TRANSIG)/3,FLDYNZPREFIX(WRAP_TRANSIG)/3. +:- dynamic + FLDYNAPREFIX(WRAP_ITRANSIG)/3,FLDYNZPREFIX(WRAP_ITRANSIG)/3. +:- dynamic FLDYNAPREFIX(WRAP_MVD)/4,FLDYNZPREFIX(WRAP_MVD)/4. :- dynamic FLDYNAPREFIX(WRAP_IMVD)/4,FLDYNZPREFIX(WRAP_IMVD)/4. @@ -454,6 +470,18 @@ FLHEADPREFIX(WRAP_IMETH)(X,Y,_Caller) :- FLDYNAPREFIX(WRAP_IMETH)(X,Y,_Caller). +FLHEADPREFIX(WRAP_BOOLSIG)(X,Y,_Caller) :- + FLDYNAPREFIX(WRAP_BOOLSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller) :- + FLDYNAPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_TRANSIG)(X,Y,_Caller) :- + FLDYNAPREFIX(WRAP_TRANSIG)(X,Y,_Caller). + +FLHEADPREFIX(WRAP_ITRANSIG)(X,Y,_Caller) :- + FLDYNAPREFIX(WRAP_ITRANSIG)(X,Y,_Caller). + FLHEADPREFIX(WRAP_MVD)(X,Y,Z,_Caller) :- FLDYNAPREFIX(WRAP_MVD)(X,Y,Z,_Caller). Index: flrpreddef.fli =================================================================== RCS file: /cvsroot/flora/flora2/genincludes/flrpreddef.fli,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- flrpreddef.fli 22 Dec 2005 23:28:40 -0000 1.21 +++ flrpreddef.fli 9 Mar 2006 08:58:18 -0000 1.22 @@ -61,6 +61,44 @@ WRAP_D_IMETH(X,Y,_Caller) :- WRAP_IMETH(X,Y,_Caller). +WRAP_D_BOOLSIG(X,Y,_Caller) :- + debugging, + \+ FLORA_IGNORE_UNDEFCHECK(WRAP_D_BOOLSIG(X,Y,_Caller)), + FLCHECKPREFIX(WRAP_BOOLSIG)(X,Y,_Caller), + FLCHECKPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller), + flora_error_undefined(WRAP_BOOLSIG(X,Y,_Caller)). + +WRAP_D_BOOLSIG(X,Y,_Caller) :- + WRAP_BOOLSIG(X,Y,_Caller). + +WRAP_D_IBOOLSIG(X,Y,_Caller) :- + debugging, + \+ FLORA_IGNORE_UNDEFCHECK(WRAP_D_IBOOLSIG(X,Y,_Caller)), + FLCHECKPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller), + flora_error_undefined(WRAP_IBOOLSIG(X,Y,_Caller)). + +WRAP_D_IBOOLSIG(X,Y,_Caller) :- + WRAP_IBOOLSIG(X,Y,_Caller). + +WRAP_D_TRANSIG(X,Y,_Caller) :- + debugging, + \+ FLORA_IGNORE_UNDEFCHECK(WRAP_D_TRANSIG(X,Y,_Caller)), + FLCHECKPREFIX(WRAP_TRANSIG)(X,Y,_Caller), + FLCHECKPREFIX(WRAP_ITRANSIG)(X,Y,_Caller), + flora_error_undefined(WRAP_TRANSIG(X,Y,_Caller)). + +WRAP_D_TRANSIG(X,Y,_Caller) :- + WRAP_TRANSIG(X,Y,_Caller). + +WRAP_D_ITRANSIG(X,Y,_Caller) :- + debugging, + \+ FLORA_IGNORE_UNDEFCHECK(WRAP_D_ITRANSIG(X,Y,_Caller)), + FLCHECKPREFIX(WRAP_ITRANSIG)(X,Y,_Caller), + flora_error_undefined(WRAP_ITRANSIG(X,Y,_Caller)). + +WRAP_D_ITRANSIG(X,Y,_Caller) :- + WRAP_ITRANSIG(X,Y,_Caller). + WRAP_D_MVD(X,Y,Z,_Caller) :- debugging, \+ FLORA_IGNORE_UNDEFCHECK(WRAP_D_MVD(X,Y,Z,_Caller)), @@ -278,6 +316,18 @@ FLCHECKPREFIX(WRAP_IMETH)(X,Y,_Caller) :- FLDEFINEDPREFIX(WRAP_IMETH)(X,Y,_Caller), !, fail. FLCHECKPREFIX(WRAP_IMETH)(X,Y,_Caller). +FLCHECKPREFIX(WRAP_BOOLSIG)(X,Y,_Caller) :- FLDEFINEDPREFIX(WRAP_BOOLSIG)(X,Y,_Caller), !, fail. +FLCHECKPREFIX(WRAP_BOOLSIG)(X,Y,_Caller). + +FLCHECKPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller) :- FLDEFINEDPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller), !, fail. +FLCHECKPREFIX(WRAP_IBOOLSIG)(X,Y,_Caller). + +FLCHECKPREFIX(WRAP_TRANSIG)(X,Y,_Caller) :- FLDEFINEDPREFIX(WRAP_TRANSIG)(X,Y,_Caller), !, fail. +FLCHECKPREFIX(WRAP_TRANSIG)(X,Y,_Caller). + +FLCHECKPREFIX(WRAP_ITRANSIG)(X,Y,_Caller) :- FLDEFINEDPREFIX(WRAP_ITRANSIG)(X,Y,_Caller), !, fail. +FLCHECKPREFIX(WRAP_ITRANSIG)(X,Y,_Caller). + FLCHECKPREFIX(WRAP_MVD)(X,Y,Z,_Caller) :- FLDEFINEDPREFIX(WRAP_MVD)(X,Y,Z,_Caller), !, fail. FLCHECKPREFIX(WRAP_MVD)(X,Y,Z,_Caller). @@ -314,6 +364,10 @@ :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_SUB)/3,WRAP_SUB,fld)). :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_METH)/3,WRAP_METH,fld)). :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMETH)/3,WRAP_IMETH,fld)). +:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_BOOLSIG)/3,WRAP_BOOLSIG,fld)). +:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IBOOLSIG)/3,WRAP_IBOOLSIG,fld)). +:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_TRANSIG)/3,WRAP_TRANSIG,fld)). +:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_ITRANSIG)/3,WRAP_ITRANSIG,fld)). :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVD)/4,WRAP_MVD,fld)). :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMVD)/4,WRAP_IMVD,fld)). :- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVDSIG)/4,WRAP_MVDSIG,fld)). |
|
From: Michael K. <ki...@us...> - 2006-03-03 04:12:52
|
Update of /cvsroot/flora/flora2/syslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25552/syslib Modified Files: flrmetaops.P Log Message: fix in the def of =.. Index: flrmetaops.P =================================================================== RCS file: /cvsroot/flora/flora2/syslib/flrmetaops.P,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- flrmetaops.P 4 Jan 2006 08:59:10 -0000 1.25 +++ flrmetaops.P 3 Mar 2006 04:12:39 -0000 1.26 @@ -400,7 +400,9 @@ %% libraries like insert ; fllib_wrapper(Wrapper) -> fail %% Aggregates look like (fllibavg(...), ...) - ; Args=[Head|_], Head=..[Library|_], fllib_wrapper(Library) -> fail + ; Args=[Head|_], nonvar(Head), Head=..[Library|_], + fllib_wrapper(Library) + -> fail ; Y = [PredName|Args] ) ; |