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
(9) |
2
|
3
|
4
|
5
|
|
6
|
7
|
8
|
9
|
10
|
11
(5) |
12
|
|
13
(20) |
14
(9) |
15
|
16
(12) |
17
(3) |
18
|
19
(9) |
|
20
(4) |
21
(7) |
22
(12) |
23
(16) |
24
(6) |
25
|
26
|
|
27
|
28
(20) |
29
(10) |
30
(6) |
31
(6) |
|
|
|
From: Michael K. <ki...@us...> - 2007-05-31 18:18:33
|
Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs17:/tmp/cvs-serv3560
Modified Files:
flrutils.P flrutils.H flrshell.H flrregistry.P flora2.P
Removed Files:
flrcallflora.P
Log Message:
make flora_query cache previously compiled queries
Index: flrutils.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.P,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- flrutils.P 28 May 2007 21:46:50 -0000 1.86
+++ flrutils.P 31 May 2007 18:18:27 -0000 1.87
@@ -36,18 +36,9 @@
#include "flora_porting.flh"
#include "flora_extensions.flh"
#include "flora_exceptions.flh"
+#include "flora_status_codes.flh"
-#define FLORA_FAILURE failure
-#define FLORA_SUCCESS success
-#define FLORA_NOOP noop
-#define FLORA_INVALID_INPUT invalid_input
-#define FLORA_ALL all
-#define FLORA_FILE file
-#define FLORA_COMMANDLINE commandline
-%% Used in flora_query_from_string - normal termination
-#define FLORA_NORMAL normal
-
?- bootstrap_flora.
@@ -2071,16 +2062,6 @@
/*************************************************************************
- flora_good_command(+Status)
- flora_bad_command(+Status)
- flora_noop_command(+Status)
-*************************************************************************/
-flora_good_command(Status) :- member(FLORA_SUCCESS,Status).
-flora_bad_command(Status) :- member(FLORA_FAILURE,Status).
-flora_noop_command(Status) :- member(FLORA_NOOP,Status).
-
-
-/*************************************************************************
flora_shell_command_line(-Code,-Options,-Status)
*************************************************************************/
flora_shell_command_line(Code,Options,Status) :-
@@ -2494,111 +2475,6 @@
/*************************************************************************
- flora_string_command_line(+String,-Code,-Options,-Status)
-
- Read, parse, then compile a query from a string
-*************************************************************************/
-flora_string_command_line(String,Code,Options,Status) :-
- %% Note: oprn(atom(String),...) permits String to be
- %% a list of characters or an atom
- see_source(atom(String),IOPort,OldStdin),
- !,
- flora_shell_command_line(Code,Options,Status),
- seen_source(IOPort,OldStdin).
-
-
-
-/*************************************************************************
- flora_call_string_command(+String,+Vars,-Status,-Exception)
-
- Execute a query specified in String.
-
- String: A query string
- Vars: A list of the form [Name1=Var1, Name2=Var2,...].
- Name is a name of a variable mentioned in String, for instance,
- '?X' (note: must be quoted, since it is a name).
- Var is a variable where you want the bonding for the variable
- Name in String to be returned. For instance,
- if String is 'p(?X,?Y).'
- Vars can be ['?X' = Xyz, '?Y' = Qpr]
- Then Xyz will be bound to the value of ?X in p(?X,?Y) after
- the execution and Qpr will be bound to the value of ?Y in p(?X,?Y).
- Status: indicates the status of compilation of the command in String.
- Exception: is a possible exception during the runtime execution
- of the command in String.
-*************************************************************************/
-
-flora_call_string_command(String,_UserVars,Status,_Exception) :-
- \+ atom(String),
- \+ is_charlist(String),
- !,
- Status = [FLORA_INVALID_INPUT, FLORA_FAILURE].
-flora_call_string_command(String,UserVars,Status,Exception) :-
- flora_string_command_line(String,Code,Options,Status),
- %% there may be import directives
- flora_handle_import_directive(Code,ShellCode),
- %% strip FLLIBSHELLANS from code and extract variables - we
- %% want to control delivery of answers by an external caller
- ShellCode = FLLIBSHELLANS(Code1,Vars),
- ( flora_good_command(Status) ->
- flora_init_for_external_calls,
- findall(SysLibOp,member(FLSYSLIB(SysLibOp),Options),SysLibList),
- flora_load_library(SysLibList),
- findall(SysModOp,member(FLSYSMOD(SysModOp),Options),SysModList),
- flora_load_system_module(SysModList),
- catch(call(Code1),
- Exception,
- flora_string_command_handler(Exception)),
- (var(Exception)
- -> Exception = FLORA_NORMAL,
- flora_bind_variables(UserVars,Vars)
- ;
- true
- )
- ;
- true
- ).
-
-flora_handle_import_directive(FLLIBSHELLANS(Code,Vars),FLLIBSHELLANS(Code,Vars)) :- !.
-flora_handle_import_directive(','(ImportCode,Code),ShellCode) :-
- ImportCode = import(_),
- call(ImportCode),
- flora_handle_import_directive(Code,ShellCode).
-
-%% The error handler for executing commands read from strings.
-flora_string_command_handler(Exception) :-
- seen,
- xsb_flag(backtrace_on_error,BT),
- (Exception = error(_Error,_Msg,Backtrace), BT == on
- ->
- print_backtrace(Backtrace)
- ;
- true
- ).
-
-flora_bind_variables([],_ResultVars).
-%% special case for obtaining all bindings in 1-variable case in javaAPI
-flora_bind_variables(['?'=Var|RestUserVars],ResultVars) :-
- !, %% the cut prevents unbound vars among answers
- (member(_=Var, ResultVars) -> true ; true),
- flora_bind_variables(RestUserVars,ResultVars).
-flora_bind_variables([Name=Var|RestUserVars],ResultVars) :-
- (is_charlist(Name) -> atom_codes(AtomicName,Name)
- ; atom(Name) -> AtomicName = Name
- ; flora_abort(['Invalid variable specification in flora_query/4: ',
- Name])
- ),
- (member(AtomicName=Var, ResultVars) -> true ; true),
- flora_bind_variables(RestUserVars,ResultVars).
-
-flora_init_for_external_calls :-
- flora_load_library(FLLIBLOAD),
- flora_load_library(FLLIBDISPLAY),
- flora_load_library(FLLIBIMPORTEDCALLS),
- flloadtrailer([FL_EQUALITY(NONE)],FLORA_DEFAULT_WORKSPACE).
-
-
-/*************************************************************************
_dump/1
*************************************************************************/
FL_DUMP(InFile>>Workspace) :-
--- flrcallflora.P DELETED ---
Index: flrshell.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrshell.H,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- flrshell.H 28 Mar 2007 22:11:27 -0000 1.15
+++ flrshell.H 31 May 2007 18:18:27 -0000 1.16
@@ -103,11 +103,12 @@
flloadtrailer/2,
flora_shell_command_line/3,
flora_load_module_internal/1,
- flora_good_command/1,
flora_end_of_input/1,
flora_check_filename/1
from flrutils.
+:- import flora_good_command/1 from flrcallflora.
+
:- import flora_trace/0,
flora_notrace/0
from flrdebugger.
Index: flora2.P
===================================================================
RCS file: /cvsroot/flora/flora2/flora2.P,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- flora2.P 28 May 2007 21:46:51 -0000 1.24
+++ flora2.P 31 May 2007 18:18:27 -0000 1.25
@@ -53,7 +53,7 @@
from flrregistry.
:- import flora_sysmod_file/3 from flrlibman.
-:- import flora_call_string_command/4 from flrutils.
+:- import flora_call_string_command/4 from flrcallflora.
:- import
flora_concat_atoms/2,
@@ -117,10 +117,10 @@
!,
asserta(library_directory(FloraDir)),
[flrversion],
- flora_assert_directories([syslib,datatypes,lib,debugger,pkgs,PkgsProlog,p2h])
+ flora_assert_directories([syslib,datatypes,lib,debugger,pkgs,PkgsProlog,p2h,cc])
;
%% running FLORA as an XSB package
- bootstrap_package([flora2,syslib,lib,debugger,pkgs,PkgsProlog,p2h],
+ bootstrap_package([flora2,syslib,lib,debugger,pkgs,PkgsProlog,p2h,cc],
flora),
[flrversion]
),
Index: flrutils.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.H,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- flrutils.H 28 May 2007 21:46:50 -0000 1.47
+++ flrutils.H 31 May 2007 18:18:27 -0000 1.48
@@ -64,7 +64,6 @@
:- import xpp_options/1, xpp_process_file/3 from parse.
:- import
- is_charlist/1,
parse_filename/4
from machine.
@@ -105,10 +104,6 @@
flora_nth_token/2
from flrcomposer.
-:- import
- print_backtrace/1
- from error_handler.
-
:- import flora_reset_operator/0 from flroperator.
:- import flora_reset_arguments/0 from flrarguments.
@@ -177,9 +172,7 @@
:- import
flora_include/2,
- flora_sysmod_file/3,
- flora_load_library/1,
- flora_load_system_module/1
+ flora_sysmod_file/3
from flrlibman.
@@ -237,11 +230,6 @@
flora_end_of_input/1,
flora_not_end_of_input/1,
flora_shell_command_line/3,
- flora_string_command_line/4,
- flora_call_string_command/4,
- flora_good_command/1,
- flora_bad_command/1,
- flora_noop_command/1,
flora_check_filename/1,
flora_set_xpp_options_for_compile/0,
flora_set_xpp_options_for_compile/1,
Index: flrregistry.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrregistry.P,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- flrregistry.P 11 May 2007 16:56:51 -0000 1.12
+++ flrregistry.P 31 May 2007 18:18:27 -0000 1.13
@@ -41,10 +41,13 @@
:- dynamic flora_disabled_undefinedness_check_registry/3.
+:- dynamic flora_query_registry/5.
+
:- index(flora_in_debug_mode/1,trie).
:- index(flora_debug_module_registry/1,trie).
:- index(flora_storage_registry/1,trie).
:- index(flora_module_registry/1,trie).
+:- index(flora_query_registry/5,trie).
:- dynamic flora_coder_prefixdef/2.
@@ -58,6 +61,7 @@
flora_trailer_registry/2,
flora_optimizer_registry/2,
flora_export_registry/4,
+ flora_query_registry/5,
flora_disabled_undefinedness_check_registry/3,
flora_configuration/2,
flora_coder_prefixdef/2,
|
|
From: Michael K. <ki...@us...> - 2007-05-31 18:18:26
|
Update of /cvsroot/flora/flora2/flrincludes In directory sc8-pr-cvs17:/tmp/cvs-serv3560/flrincludes Modified Files: flora_terms.flh flora_errors.flh Added Files: flora_status_codes.flh Log Message: make flora_query cache previously compiled queries Index: flora_terms.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_terms.flh,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- flora_terms.flh 28 May 2007 21:46:49 -0000 1.86 +++ flora_terms.flh 31 May 2007 18:18:26 -0000 1.87 @@ -4,7 +4,7 @@ ** ** Contact: flo...@li... ** -** Copyright (C) The Research Foundation of SUNY, 1999-2001 +** Copyright (C) The Research Foundation of SUNY, 1999-2007 ** ** FLORA-2 is free software; you can redistribute it and/or modify it under the ** terms of the GNU Library General Public License as published by the Free --- NEW FILE: flora_status_codes.flh --- /* File: flora_status_codes.flh -- Status codes in flrutils, flrcallflora ** ** Author(s): Michael Kifer ** ** Contact: flo...@li... ** ** Copyright (C) The Research Foundation of SUNY, 2007 ** ** FLORA-2 is free software; you can redistribute it and/or modify it under the ** terms of the GNU Library General Public License as published by the Free ** Software Foundation; either version 2 of the License, or (at your option) ** any later version. ** ** FLORA-2 is distributed in the hope that it will be useful, but WITHOUT ANY ** WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS ** FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for ** more details. ** ** You should have received a copy of the GNU Library General Public License ** along with FLORA-2; if not, write to the Free Software Foundation, ** Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** */ #define FLORA_FAILURE failure #define FLORA_SUCCESS success #define FLORA_NOOP noop #define FLORA_INVALID_INPUT invalid_input #define FLORA_ALL all #define FLORA_FILE file #define FLORA_COMMANDLINE commandline %% Used in flora_exec_prepared_query - normal termination #define FLORA_NORMAL normal Index: flora_errors.flh =================================================================== RCS file: /cvsroot/flora/flora2/flrincludes/flora_errors.flh,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- flora_errors.flh 28 May 2007 21:46:49 -0000 1.52 +++ flora_errors.flh 31 May 2007 18:18:26 -0000 1.53 @@ -4,7 +4,7 @@ ** ** Contact: flo...@li... ** -** Copyright (C) The Research Foundation of SUNY, 1999-2001 +** Copyright (C) The Research Foundation of SUNY, 1999-2007 ** ** FLORA-2 is free software; you can redistribute it and/or modify it under the ** terms of the GNU Library General Public License as published by the Free |
|
From: Michael K. <ki...@us...> - 2007-05-31 18:18:26
|
Update of /cvsroot/flora/flora2/syslib
In directory sc8-pr-cvs17:/tmp/cvs-serv3560/syslib
Modified Files:
NMakefile.mak Makefile
Added Files:
flrcallflora.P
Log Message:
make flora_query cache previously compiled queries
Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/NMakefile.mak,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- NMakefile.mak 8 May 2006 06:23:17 -0000 1.17
+++ NMakefile.mak 31 May 2007 18:18:26 -0000 1.18
@@ -41,6 +41,7 @@
flrnewoid$(OBJEXT) \
flrhooks$(OBJEXT) \
flrimport$(OBJEXT) \
+ flrcallflora$(OBJEXT) \
flrprefixdef$(OBJEXT)
OPTIONS = [optimize]
--- NEW FILE: flrcallflora.P ---
/* File: flrcallflora.P
**
** Author(s): Michael Kifer
**
** Contact: flo...@li...
**
** Copyright (C) The Research Foundation of SUNY, 2007
**
** FLORA-2 is free software; you can redistribute it and/or modify it under the
** terms of the GNU Library General Public License as published by the Free
** Software Foundation; either version 2 of the License, or (at your option)
** any later version.
**
** FLORA-2 is distributed in the hope that it will be useful, but WITHOUT ANY
** WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
** FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for
** more details.
**
** You should have received a copy of the GNU Library General Public License
** along with FLORA-2; if not, write to the Free Software Foundation,
** Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
**
*/
:- compiler_options([xpp_on]).
#include "flora_terms.flh"
#include "flora_exceptions.flh"
#include "flora_status_codes.flh"
#define OLD_TERM 1
#define NEW_TERM 0
:- import flora_query_registry/5 from flrregistry.
:- import new_trie/1, trie_intern/5 from intern.
:- import
flora_shell_command_line/3,
flloadtrailer/2,
flora_abort/1
from flrutils.
:- import
flora_load_library/1,
flora_load_system_module/1
from flrlibman.
:- import print_backtrace/1 from error_handler.
:- import is_charlist/1 from machine.
:- import member/2 from basics.
:- dynamic flora_query_trie/1.
:- export
flora_good_command/1,
flora_bad_command/1,
flora_noop_command/1,
flora_string_command_line/4,
flora_call_string_command/4.
?- \+ flora_query_trie(_),
new_trie(TrieRoot),
assert(flora_query_trie(TrieRoot)).
/*************************************************************************
flora_call_string_command(+String,+Vars,-Status,-Exception)
Execute a query specified in String.
String: A query string
Vars: A list of the form [Name1=Var1, Name2=Var2,...].
Name is a name of a variable mentioned in String, for instance,
'?X' (note: must be quoted, since it is a name).
Var is a variable where you want the bonding for the variable
Name in String to be returned. For instance,
if String is 'p(?X,?Y).'
Vars can be ['?X' = Xyz, '?Y' = Qpr]
Then Xyz will be bound to the value of ?X in p(?X,?Y) after
the execution and Qpr will be bound to the value of ?Y in p(?X,?Y).
Status: indicates the status of compilation of the command in String.
Exception: is a possible exception during the runtime execution
of the command in String.
*************************************************************************/
flora_call_string_command(String,_UserVars,Status,_Exception) :-
\+ atom(String),
\+ is_charlist(String),
!,
Status = [FLORA_INVALID_INPUT, FLORA_FAILURE].
flora_call_string_command(String,UserVars,Status,Exception) :-
flora_query_registry(String,QueryCode,ArgList,SysModLst,SysLibLst),
!,
Status = [FLORA_SUCCESS],
flora_exec_prepared_query(QueryCode,ArgList,SysModLst,SysLibLst,UserVars,Exception).
flora_call_string_command(String,UserVars,Status,Exception) :-
flora_string_command_line(String,Code,Options,Status),
%% there may be import directives
handle_import_directive(Code,ShellCode),
%% strip FLLIBSHELLANS from code and extract variables - we
%% want to control delivery of answers by an external caller
ShellCode = FLLIBSHELLANS(Code1,Vars),
( flora_good_command(Status) ->
findall(SysLibOp,member(FLSYSLIB(SysLibOp),Options),SysLibLst),
findall(SysModOp,member(FLSYSMOD(SysModOp),Options),SysModLst),
flora_store_prepared_query(String,Code1,Vars,SysModLst,SysLibLst),
flora_exec_prepared_query(Code1,Vars,SysModLst,SysLibLst,UserVars,Exception)
;
true
).
/*************************************************************************
flora_string_command_line(+String,-Code,-Options,-Status)
Read, parse, then compile a query from a string
*************************************************************************/
flora_string_command_line(String,Code,Options,Status) :-
%% Note: oprn(atom(String),...) permits String to be
%% a list of characters or an atom
see_source(atom(String),IOPort,OldStdin),
!,
flora_shell_command_line(Code,Options,Status),
seen_source(IOPort,OldStdin).
flora_store_prepared_query(QString,QCode,QArgs,SysModList,SysLibList) :-
flora_query_trie(TrieRoot),
trie_intern(QCode,TrieRoot,_QHandle,Flag,_Skeleton),
(Flag == NEW_TERM ->
%% _Skeleton =.. [_,QVars],
assert(flora_query_registry(QString,QCode,QArgs,SysModList,SysLibList))
;
true
).
flora_exec_prepared_query(QueryCode,QArgs,QSysModList,QSysLibList,UserVars,Exception) :-
flora_init_for_external_calls,
flora_load_library(QSysLibList),
flora_load_system_module(QSysModList),
catch(call(QueryCode),
Exception,
string_command_handler(Exception)),
(var(Exception)
-> Exception = FLORA_NORMAL,
bind_q_variables(UserVars,QArgs)
;
true
).
flora_init_for_external_calls :-
flora_load_library(FLLIBLOAD),
flora_load_library(FLLIBDISPLAY),
flora_load_library(FLLIBIMPORTEDCALLS),
flloadtrailer([FL_EQUALITY(NONE)],FLORA_DEFAULT_WORKSPACE).
%% The error handler for executing commands read from strings.
string_command_handler(Exception) :-
seen,
xsb_flag(backtrace_on_error,BT),
(Exception = error(_Error,_Msg,Backtrace), BT == on
->
print_backtrace(Backtrace)
;
true
).
bind_q_variables([],_ResultVars).
%% special case for obtaining all bindings in 1-variable case in javaAPI
bind_q_variables(['?'=Var|RestUserVars],ResultVars) :-
!, %% the cut prevents unbound vars among answers
(member(_=Var, ResultVars) -> true ; true),
bind_q_variables(RestUserVars,ResultVars).
bind_q_variables([Name=Var|RestUserVars],ResultVars) :-
(is_charlist(Name) -> atom_codes(AtomicName,Name)
; atom(Name) -> AtomicName = Name
; flora_abort(['Invalid variable specification in flora_query/4: ',
Name])
),
(member(AtomicName=Var, ResultVars) -> true ; true),
bind_q_variables(RestUserVars,ResultVars).
handle_import_directive(FLLIBSHELLANS(Code,Vars),FLLIBSHELLANS(Code,Vars)) :- !.
handle_import_directive(','(ImportCode,Code),ShellCode) :-
ImportCode = import(_),
call(ImportCode),
handle_import_directive(Code,ShellCode).
/*************************************************************************
flora_good_command(+Status)
flora_bad_command(+Status)
flora_noop_command(+Status)
*************************************************************************/
flora_good_command(Status) :- member(FLORA_SUCCESS,Status).
flora_bad_command(Status) :- member(FLORA_FAILURE,Status).
flora_noop_command(Status) :- member(FLORA_NOOP,Status).
see_source(Source,IOPort,OldStdin) :-
seeing(OldStdin),
open(Source, read, IOPort),
see(IOPort).
seen_source(IOPort,OldStdin) :-
seen,
see(OldStdin),
close(IOPort).
/*
%% all this needs to start using the flora_query conventions
flora_compile_query(QHandle,Query) :-
flora_query_trie(TrieRoot),
trie_intern(Query,TrieRoot,QHandle,Flag,Skeleton),
(Flag == NEW_TERM ->
Skeleton =.. [_,VarList],
assert(flora_query_registry(QHandle,Query,VarList))
;
true
).
flora_execute_query(QHandle,ArgList) :-
flora_query_registry(QHandle,Query,ArgList),
call(Query).
*/
Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile 17 May 2006 06:52:28 -0000 1.25
+++ Makefile 31 May 2007 18:18:26 -0000 1.26
@@ -67,6 +67,7 @@
flrnewoid$(OBJEXT) \
flrimport$(OBJEXT) \
flrhooks$(OBJEXT) \
+ flrcallflora$(OBJEXT) \
flrprefixdef$(OBJEXT)
FLORA_INCLUDES_DIR = ../flrincludes
|
|
From: Michael K. <ki...@us...> - 2007-05-31 14:43:39
|
Update of /cvsroot/flora/flora-website In directory sc8-pr-cvs17:/tmp/cvs-serv14656 Modified Files: florahome.php Added Files: syntaxconversion.html Log Message: added info on syntax conversion --- NEW FILE: syntaxconversion.html --- <html> <head> <title>FLORA-2 Syntax Conversion </title> <link rel="shortcut icon" href="images/flora.ico"> </head> <h1>Converting from Old to New F-logic Syntax: V. 0.94 to 0.95</h1> <p> FLORA-2 users who have knowledge bases that use the old F-logic syntax should convert to the new syntax in order to use Release 0.95 and later. The <tt>Misc/</tt> subdirectory in the FLORA-2 distribution includes a Perl script, convert.pl, and a README file, which explains how to use the script to convert to the new syntax. </p> <p> The convert.pl script does not guarantee complete conversion, but it does 95% of the job. It does not handle correctly the #define macros in that it adds ? to all of them. These should be undone manually. It also does not convert the code that appears inside comments or strings. </p> </body> </html> Index: florahome.php =================================================================== RCS file: /cvsroot/flora/flora-website/florahome.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- florahome.php 30 May 2007 16:19:56 -0000 1.17 +++ florahome.php 31 May 2007 14:43:38 -0000 1.18 @@ -59,6 +59,8 @@ Details of these changes can be found on the Web site of the <a href="http://forum.projects.semwebcentral.org">F-logic Forum working group</a>. + There is a <a href="syntaxconversion.html">utility to help with syntax + conversion</a> from earlier versions. </p> <p> |
|
From: Michael K. <ki...@us...> - 2007-05-31 14:30:56
|
Update of /cvsroot/flora/flora2/Misc
In directory sc8-pr-cvs17:/tmp/cvs-serv8947/Misc
Modified Files:
README
Log Message:
typo
Index: README
===================================================================
RCS file: /cvsroot/flora/flora2/Misc/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README 8 Feb 2007 08:11:57 -0000 1.5
+++ README 31 May 2007 14:29:56 -0000 1.6
@@ -44,8 +44,8 @@
(3) This program doesn't add '?' in comments and quoted text.
(4) There may be places where # was used other than for specifying
- procedural predicates and terms. These #'s may have to be converted
- back to %.
+ procedural predicates and terms. These #'s may get converted into %'s by
+ the script and may have to be converted back to # manually.
(5) There may be other limitations or bugs. If you find any, please contact:
flo...@li...
|
|
From: Michael K. <ki...@us...> - 2007-05-31 11:16:33
|
Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs17:/tmp/cvs-serv27214
Modified Files:
visualizer.html tutorial.php
Log Message:
updates
Index: tutorial.php
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tutorial.php 30 May 2007 16:19:56 -0000 1.5
+++ tutorial.php 31 May 2007 11:16:30 -0000 1.6
@@ -24,8 +24,6 @@
execution strategy, and tabling
<br/>
<a href="tutorial/part1-foundations.ppt">Powerpoint version</a>
- <br/>
- <a href="tutorial/part1-foundations.pdf">PDF version</a>
</li>
<li>
<i>Part 2: Programming in FLORA-2.</i> Covers the main parts of the
@@ -34,15 +32,12 @@
are embodied in a concrete knowledge-base programming language
<br/>
<a href="tutorial/part2-programming.ppt">Powerpoint version</a>
- <br/>
- <a href="tutorial/part2-programming.pdf">PDF version</a>
</li>
</ul>
</p>
-The PowerPoint slides are best viewed using Office XP.
-<br>
-The PDF slides are OK, but those that rely on animation
-are messed up due to overlaying of the animated parts.
+The PowerPoint slides are best viewed using Office XP or later.
+Although the slides are in Powerpoint, they can be viewed quite well
+using <a href="http://www.openoffice.org/">OpenOffice</a> 2.0 or later.
<p>
Part 2 of the tutorial uses a large number of little examples that illustrate
various subtle points of FLORA-2. These examples are found <a
Index: visualizer.html
===================================================================
RCS file: /cvsroot/flora/flora-website/visualizer.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- visualizer.html 30 May 2007 16:19:56 -0000 1.3
+++ visualizer.html 31 May 2007 11:16:30 -0000 1.4
@@ -17,18 +17,18 @@
<h2>Visualizer Update Site</h2>
-<p>To install the Flora-2 Visualizer from the update site, please use the Help
- menu.
-Select "Software Updates" and then "Find and Install". In the resulting dialog,
- select "Search for new features to install" and click "Next." In the next
- dialog, click on "New Remote
-Site" to insert this URL:</p>
+<p>To install the Flora-2 Visualizer from the update site, you need
+ <a href="http://www.eclipse.org/">Eclipse</a> installed on your system.
+ Start Eclipse and select "Software Updates" and then "Find and Install" from
+ the Help menu. In the resulting dialog, select "Search for new features to
+ install" and click "Next." In the next dialog, click on "New Remote Site" to
+ insert this URL:</p>
<ul>
<p style="font-weight: bold;">http://flora.sourceforge.net/visualizer</p>
</ul>
-<h2>Prepackaged Visualizer Standalone Versions</h2>
+<h2>Prepackaged Standalone Versions</h2>
<p><a href="visualizer/flora2visualizer.win32.win32.x86.zip">Windows
version</a></p>
@@ -36,10 +36,20 @@
<p><a href="visualizer/flora2visualizer.linux.gtk.x86.zip">Linux
version (x86, GTK+)</a></p>
+<h2>Developer's Version from CVS</h2>
+
+<p>
+ Check out the CVS module <em>flora2-visualizer</em>
+ from the <a href="http://sourceforge.net/cvs/?group_id=50604">FLORA-2 CVS
+ repository</a>. Then download
+ the <a href="visualizer/manual.pdf">Visualizer's manual</a> and follow the
+ installation instructions.
+</p>
+
<h2>Documentation</h2>
-<p>Instructions on how to use and install FLORA-2 Visualizer
- are found <a href="visualizer/manual.pdf">here</a>.
+<p>Instructions on how to use FLORA-2 Visualizer
+ can be found <a href="visualizer/manual.pdf">here</a>.
</p>
</body>
|
|
From: Michael K. <ki...@us...> - 2007-05-30 16:19:59
|
Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs17:/tmp/cvs-serv5942
Modified Files:
visualizer.html tutorial.php release_notes.html
relatedWorks.php installation.html index.php florahome.php
florabar.php download.php documentation.php contactus.php
acknowledgements.html aboutTR.php aboutHiLog.php
aboutFlora.php aboutFlogic.php
Log Message:
added favicon, but it is hard to see
Index: tutorial.php
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tutorial.php 2 May 2005 02:05:22 -0000 1.4
+++ tutorial.php 30 May 2007 16:19:56 -0000 1.5
@@ -1,4 +1,8 @@
-<html><head><title>Tutorial on FLORA-2</title></head>
+<html>
+ <head>
+ <title>Tutorial on FLORA-2</title>
+ <link rel="shortcut icon" href="images/flora.ico">
+ </head>
<body bgcolor="#FFFFFF">
<h1>
Index: installation.html
===================================================================
RCS file: /cvsroot/flora/flora-website/installation.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- installation.html 1 May 2005 03:29:51 -0000 1.11
+++ installation.html 30 May 2007 16:19:56 -0000 1.12
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>FLORA-2 Installation</title>
+ <link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: contactus.php
===================================================================
RCS file: /cvsroot/flora/flora-website/contactus.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- contactus.php 1 Jun 2004 23:20:31 -0000 1.3
+++ contactus.php 30 May 2007 16:19:56 -0000 1.4
@@ -1,38 +1,39 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Email Us</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
- <FORM ACTION="sendemail.php" METHOD="POST">
- <INPUT TYPE="HIDDEN" NAME="post_message" VALUE="y">
- <TABLE>
- <TR>
- <tr>
- <td colspan=2>You can send us email using this form:</td>
- </tr>
- <tr>
- <td>
-
- </td>
- </tr>
- <TD><b>Subject:</b></TD><TD>
- <INPUT TYPE="TEXT" NAME="subject" VALUE="" SIZE="15" MAXLENGTH="40">
- </TD></TR>
- <TR><TD><B>Return Address:</b></TD><TD>
- <INPUT TYPE="TEXT" NAME="address" VALUE="" SIZE="15" MAXLENGTH="45">
- </TD></TR>
- <TR><TD><B>Message:</b></TD><TD>
- <TEXTAREA NAME="body" VALUE="" ROWS="5" COLS="50" WRAP="SOFT"></TEXTAREA>
- </TD></TR>
- <TR><TD COLSPAN="2" ALIGN="MIDDLE">
- <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Send Email">
- </TD></TR></TABLE>
- </FORM>
-<br>
-</body>
-
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<title>Email Us</title>
+<link rel="shortcut icon" href="images/flora.ico">
+</head>
+
+<body bgcolor="#FFFFFF">
+
+ <FORM ACTION="sendemail.php" METHOD="POST">
+ <INPUT TYPE="HIDDEN" NAME="post_message" VALUE="y">
+ <TABLE>
+ <TR>
+ <tr>
+ <td colspan=2>You can send us email using this form:</td>
+ </tr>
+ <tr>
+ <td>
+
+ </td>
+ </tr>
+ <TD><b>Subject:</b></TD><TD>
+ <INPUT TYPE="TEXT" NAME="subject" VALUE="" SIZE="15" MAXLENGTH="40">
+ </TD></TR>
+ <TR><TD><B>Return Address:</b></TD><TD>
+ <INPUT TYPE="TEXT" NAME="address" VALUE="" SIZE="15" MAXLENGTH="45">
+ </TD></TR>
+ <TR><TD><B>Message:</b></TD><TD>
+ <TEXTAREA NAME="body" VALUE="" ROWS="5" COLS="50" WRAP="SOFT"></TEXTAREA>
+ </TD></TR>
+ <TR><TD COLSPAN="2" ALIGN="MIDDLE">
+ <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Send Email">
+ </TD></TR></TABLE>
+ </FORM>
+<br>
+</body>
+
</html>
Index: aboutHiLog.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutHiLog.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aboutHiLog.php 13 Mar 2005 00:16:01 -0000 1.4
+++ aboutHiLog.php 30 May 2007 16:19:56 -0000 1.5
@@ -4,6 +4,7 @@
semantic web, logic, HiLog, knowledge
representation, database, meta-data, meta-programming">
<title>HiLog</title>
+<link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: index.php
===================================================================
RCS file: /cvsroot/flora/flora-website/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index.php 30 May 2007 15:46:00 -0000 1.10
+++ index.php 30 May 2007 16:19:56 -0000 1.11
@@ -3,7 +3,7 @@
<meta name="keywords" content="deductive, object-oriented, frame-based,
semantic web, F-logic, Frame logic, HiLog, Transaction Logic, knowledge
representation, database, meta-data, meta-programming">
-<link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico">
+<link rel="shortcut icon" href="images/flora.ico">
<title> FLORA-2 </title>
<frameset cols="20%,80%" frameborder="yes" border="1" framespacing="0">
<frame SRC="florabar.php" NAME="left_window" SCROLLING="auto"
Index: aboutTR.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutTR.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- aboutTR.php 22 Mar 2005 21:10:40 -0000 1.8
+++ aboutTR.php 30 May 2007 16:19:56 -0000 1.9
@@ -3,6 +3,7 @@
<meta name="keywords" content="deductive, semantic web, Transaction Logic,
knowledge representation, database, workflow, planning, web services">
<title>Transaction Logic</title>
+<link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: acknowledgements.html
===================================================================
RCS file: /cvsroot/flora/flora-website/acknowledgements.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- acknowledgements.html 28 Jun 2003 01:25:11 -0000 1.2
+++ acknowledgements.html 30 May 2007 16:19:56 -0000 1.3
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>FLORA-2 Acknowledgement</title>
+<link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: visualizer.html
===================================================================
RCS file: /cvsroot/flora/flora-website/visualizer.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- visualizer.html 30 May 2007 11:37:11 -0000 1.2
+++ visualizer.html 30 May 2007 16:19:56 -0000 1.3
@@ -1,13 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>Flora-2 Visualizer</title>
-
-
-</head>
-
-
-
+ <head>
+ <title>Flora-2 Visualizer</title>
+ <link rel="shortcut icon" href="images/flora.ico">
+ </head>
<body>
Index: documentation.php
===================================================================
RCS file: /cvsroot/flora/flora-website/documentation.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- documentation.php 30 May 2007 15:00:53 -0000 1.8
+++ documentation.php 30 May 2007 16:19:56 -0000 1.9
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>FLORA-2 Documentation</title>
+ <link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: relatedWorks.php
===================================================================
RCS file: /cvsroot/flora/flora-website/relatedWorks.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- relatedWorks.php 22 Mar 2005 21:10:39 -0000 1.8
+++ relatedWorks.php 30 May 2007 16:19:56 -0000 1.9
@@ -1,4 +1,8 @@
-<html><head><title>Related Works</title></head>
+<html>
+ <head>
+ <title>Related Works</title>
+ <link rel="shortcut icon" href="images/flora.ico">
+ </head>
<body bgcolor="#FFFFFF">
<h1>
Index: florahome.php
===================================================================
RCS file: /cvsroot/flora/flora-website/florahome.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- florahome.php 30 May 2007 15:46:00 -0000 1.16
+++ florahome.php 30 May 2007 16:19:56 -0000 1.17
@@ -4,7 +4,7 @@
<meta name="keywords" content="deductive, object-oriented, frame-based,
semantic web, F-logic, Frame logic, HiLog, Transaction Logic, knowledge
representation, database, meta-data, meta-programming">
- <link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico">
+ <link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: download.php
===================================================================
RCS file: /cvsroot/flora/flora-website/download.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- download.php 30 May 2007 15:00:53 -0000 1.13
+++ download.php 30 May 2007 16:19:56 -0000 1.14
@@ -1,4 +1,8 @@
-<html><head><title>Download FLORA-2</title></head>
+<html>
+ <head>
+ <title>Download FLORA-2</title>
+ <link rel="shortcut icon" href="images/flora.ico">
+ </head>
<body bgcolor="#FFFFFF">
<h1>
Index: florabar.php
===================================================================
RCS file: /cvsroot/flora/flora-website/florabar.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- florabar.php 30 May 2007 15:46:00 -0000 1.7
+++ florabar.php 30 May 2007 16:19:56 -0000 1.8
@@ -1,6 +1,6 @@
<html>
<head>
- <link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico">
+ <link rel="shortcut icon" href="images/flora.ico">
<title>FLORA-2 Side Bar </title>
</head>
Index: release_notes.html
===================================================================
RCS file: /cvsroot/flora/flora-website/release_notes.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- release_notes.html 28 May 2007 17:26:27 -0000 1.29
+++ release_notes.html 30 May 2007 16:19:56 -0000 1.30
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>FLORA-2 Release Notes</title>
+ <link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: aboutFlogic.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutFlogic.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- aboutFlogic.php 7 Jul 2005 23:22:52 -0000 1.9
+++ aboutFlogic.php 30 May 2007 16:19:56 -0000 1.10
@@ -4,6 +4,7 @@
semantic web, F-logic, Frame logic, knowledge
representation, database">
<title>Frame Logic</title>
+<link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
Index: aboutFlora.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutFlora.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aboutFlora.php 7 Jul 2005 23:22:52 -0000 1.1
+++ aboutFlora.php 30 May 2007 16:19:56 -0000 1.2
@@ -4,6 +4,7 @@
semantic web, F-logic, Frame logic, knowledge
representation, database">
<title>Papers about FLORA-2</title>
+<link rel="shortcut icon" href="images/flora.ico">
</head>
<body bgcolor="#FFFFFF">
|
|
From: Michael K. <ki...@us...> - 2007-05-30 15:46:15
|
Update of /cvsroot/flora/flora-website In directory sc8-pr-cvs17:/tmp/cvs-serv24777 Modified Files: index.php florahome.php florabar.php Log Message: link to a favicon, but it does not work Index: florabar.php =================================================================== RCS file: /cvsroot/flora/flora-website/florabar.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- florabar.php 23 Aug 2006 05:11:48 -0000 1.6 +++ florabar.php 30 May 2007 15:46:00 -0000 1.7 @@ -1,4 +1,8 @@ -<html><head><title>FLORA-2 Side Bar </title></head> +<html> + <head> + <link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico"> + <title>FLORA-2 Side Bar </title> + </head> <body bgcolor="#7999af"> <h1> Index: florahome.php =================================================================== RCS file: /cvsroot/flora/flora-website/florahome.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- florahome.php 30 May 2007 15:00:53 -0000 1.15 +++ florahome.php 30 May 2007 15:46:00 -0000 1.16 @@ -1,9 +1,10 @@ <html> <head> -<title>FLORA-2 Home Page </title> -<meta name="keywords" content="deductive, object-oriented, frame-based, - semantic web, F-logic, Frame logic, HiLog, Transaction Logic, knowledge - representation, database, meta-data, meta-programming"> + <title>FLORA-2 Home Page </title> + <meta name="keywords" content="deductive, object-oriented, frame-based, + semantic web, F-logic, Frame logic, HiLog, Transaction Logic, knowledge + representation, database, meta-data, meta-programming"> + <link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico"> </head> <body bgcolor="#FFFFFF"> Index: index.php =================================================================== RCS file: /cvsroot/flora/flora-website/index.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- index.php 23 Aug 2006 05:11:48 -0000 1.9 +++ index.php 30 May 2007 15:46:00 -0000 1.10 @@ -3,6 +3,7 @@ <meta name="keywords" content="deductive, object-oriented, frame-based, semantic web, F-logic, Frame logic, HiLog, Transaction Logic, knowledge representation, database, meta-data, meta-programming"> +<link rel="shortcut icon" href="http://flora.sourceforge.net/images/flora.ico"> <title> FLORA-2 </title> <frameset cols="20%,80%" frameborder="yes" border="1" framespacing="0"> <frame SRC="florabar.php" NAME="left_window" SCROLLING="auto" |
|
From: Michael K. <ki...@us...> - 2007-05-30 15:01:06
|
Update of /cvsroot/flora/flora-website In directory sc8-pr-cvs17:/tmp/cvs-serv6624 Modified Files: florahome.php download.php documentation.php Log Message: updates Index: florahome.php =================================================================== RCS file: /cvsroot/flora/flora-website/florahome.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- florahome.php 1 May 2005 03:29:51 -0000 1.14 +++ florahome.php 30 May 2007 15:00:53 -0000 1.15 @@ -46,37 +46,36 @@ <p> <IMG src="images/new.gif" alt="New"> -May 1, 2005: After more than 1 year of development, FLORA-2 <a href="download.php">version -0.94 (Narumigata)</a> has been released. -Many new features and bug fixes. -See <a href="release_notes.html">release notes</a> for details. +July 1, 2007: After more than 2 years of development, FLORA-2 <a href="download.php">version +0.95 (Androcymbium)</a> has been released. +This release includes a major makeover of the syntax, which both simplifies it +and extends it with new features. +These changes ensure +greater compatibility with other F-logic based languages, such as + <a href="http://www.ontoprise.de/products/ontobroker_en">OntoBroker</a> + and <a href="http://www.informatik.uni-freiburg.de/~dbis/florid/"> + FLORID</a>. + Details of these changes can be found on the Web site of + the <a href="http://forum.projects.semwebcentral.org">F-logic Forum working + group</a>. </p> + <p> -FLORA-2 comes with a comprehensive <a -href="documentation.php">manual</a> and a -<a href="tutorial.php">tutorial</a>, which provides an overview of -the theoretical foundations as well as of -the actual knowledge representation language. The tutorial is -accompanied by programming examples and exercises. + In addition to the syntax, +a wealth of libraries and packages has been added, including +a new Java API and +<a href="visualizer.html">FLORA-2 Visualizer and Editor</a>. +Please <a href="release_notes.html">release notes</a> for details. </p> <p> -<IMG src="images/new.gif" alt="New"> -<a href="http://ontotext.com/">Ontotext</a> has recently released a -<a href="http://ontotext.com/downloads/index.html">Java to FLORA-2 -utility</a>, which allows Java programs to send queries to FLORA-2 -knowledge bases and get back the results. +FLORA-2 comes with comprehensive <a +href="documentation.php">manuals</a> and a +<a href="tutorial.php">tutorial</a>, which provides an overview of +theoretical foundations as well as of +the FLORA-2 language and system. The tutorial is +accompanied by programming examples and exercises. </p> -<P> - Future plans for FLORA-2 include standardization of the syntax, which will - bring greater compatibility with other F-logic based languages, such as - <a href="http://www.ontoprise.de/products/ontobroker_en">OntoBroker</a>, - <a href="http://www.wsmo.org/wsml/">WSML</a>, - and <a href="http://www.daml.org/services/swsl/">SWSL-Rules</a>. - Details of these changes can be found on the Web site of - the <a href="http://forum.projects.semwebcentral.org">FORUM working - group</a>. -</P> <p> @@ -87,24 +86,21 @@ <A href="http://www.ontoprise.de/">Ontoprise</a> - A provider of semantic Web solutions, which uses an F-logic engine to power its products. </li> +<li> <a href="http://www.informatik.uni-freiburg.de/~dbis/florid/"> + FLORID</a>: A C++-based implementation of F-logic from Freiburg University. +</li> <li> <a href="http://www.wsmo.org/wsml/">WSML</a>: Web Services Modeling Language </li> <li> - <a href="http://www.daml.org/services/swsl/">SWSL</a>: Semantic Web Services - Language + <a href="http://www.w3.org/Submission/SWSF-SWSL/">SWSL</a>: Semantic Web + Services Language </li> <li> - <a href="http://forum.projects.semwebcentral.org/">FORUM Working Group</a> + <a href="http://forum.projects.semwebcentral.org/">The F-logic Forum Working Group</a> </li> <li> <A href="http://www.SemanticWeb.org/">Semantic Web Resources</a> </li> -<li> <a href="http://www.informatik.uni-freiburg.de/~dbis/florid/"> - FLORID</a>: A C++-based implementation of F-logic from Freiburg University. -</li> -<li> <A href="http://www.dsic.upv.es/~pcarsi/tfl/">Transaction F-logic - prototype</a> from the University of Valencia, Spain. -</li> <li> The <a href="http://www.cs.toronto.edu/~bonner/transaction-logic.html"> Transaction Logic</a> and <a href="http://www.cs.toronto.edu/~bonner/ctr/index.html">Concurrent Index: documentation.php =================================================================== RCS file: /cvsroot/flora/flora-website/documentation.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- documentation.php 1 May 2005 03:34:27 -0000 1.7 +++ documentation.php 30 May 2007 15:00:53 -0000 1.8 @@ -11,11 +11,14 @@ <p> Currently there are two documents: the main FLORA-2 manual and a manual describing the - XML package, which provides parsing capabilities for XML, HTML, and also - supports XPath. -</P> + packages that are not core part of the system, but are important additions + and are distributed with the system. + In addition, <a href="visualizer.html">FLORA-2 Visualizer and editor</a> + has its own documentation, which is accessible + href="visualizer.html">here</a>. +</p> -<P> +<p> The following two files are PDF versions of the manuals for the latest released version of FLORA-2. </p> @@ -23,15 +26,16 @@ <p> <ul> <li><a href="docs/floraManual.pdf">Manual for FLORA-2</a> - - Release 0.94. + Release 0.95. </li> <li> - <a href="docs/floraXML.pdf">FLORA-XML</a> - XML support in FLORA-2. + <a href="docs/floraPackages.pdf">FLORA-2 Packages</a> - Various packages + that extend the core system. </li> </ul> </p> <p> - The LaTeX source of the FLORA-2 Documentation is available from CVS. You need + The LaTeX source files of the Documentation are available from CVS. You need LaTeX and the associated tools in order to create a printable version. </p> @@ -46,7 +50,7 @@ $Date$ </pre> -<P> +<p> <?php include "counter.php"; ?> <!-- update counter --> <?php $number = CounterImage(); ?> Index: download.php =================================================================== RCS file: /cvsroot/flora/flora-website/download.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- download.php 1 Mar 2005 23:13:19 -0000 1.12 +++ download.php 30 May 2007 15:00:53 -0000 1.13 @@ -8,9 +8,13 @@ </pre> <p> - FLORA-2 relies the XSB inference engine to run. + FLORA-2 relies on the XSB inference engine to run. One can install either the latest released version of FLORA-2, - Version 0.94 (Narumigata), or the current development version from CVS. + Version 0.95 (Androcymbium), or the current development version from CVS. +</p> +<p> + The FLORA-2 Visualizer and Editor has its own <a href="visualizer.html">page + with download instructions</a>. </p> @@ -22,7 +26,7 @@ Download and install <a href="http://sourceforge.net/project/showfiles.php?group_id=1176" target="new_window"> - Release 2.7.1 of XSB</a>. + Release 3.0.1+ of XSB or later</a>. </li> <li> Download the <a |
|
From: Michael K. <ki...@us...> - 2007-05-30 11:57:44
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/docs/manual
In directory sc8-pr-cvs17:/tmp/cvs-serv31154
Modified Files:
manual.tex
Log Message:
small improvements
Index: manual.tex
===================================================================
RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/docs/manual/manual.tex,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- manual.tex 29 May 2007 10:46:42 -0000 1.18
+++ manual.tex 30 May 2007 11:57:37 -0000 1.19
@@ -228,17 +228,18 @@
If no standalone version of the \FVIZ exists for your
OS, this (and CVS) would also be your only option.
-To install \FVIZ from the update site, select
-\emph{Help} $\rightarrow$ \emph{Software Updates} $\rightarrow$
-\emph{Find and Install} from the menu.
-Choose \emph{Search for new features} and click Next.
-Click New Remote Site to add an update the site with the URL:
+ To install \FVIZ from the update site, select
+ \emph{Software Updates} $\rightarrow$ \emph{Find and Install} from the
+ {\rm Help} menu. In the resulting dialog, choose \emph{Search for new features} and
+ click Next. In the next dialog, click \emph{New Remote Site} and add the
+ following URL:
\url{http://flora.sourceforge.net/visualizer/}
-To use the visualizer, you should start Eclipse and choose \FVIZ
-Perspective from the \emph{Windows} $\rightarrow$ \emph{Open Perspective}
-$\rightarrow$ \emph{Other}. Then choose \emph{Flora} and press \emph{OK}.
+ To use the visualizer, you should start Eclipse and choose \FVIZ
+ Perspective from the \emph{Windows} menu by selecting the item
+ \emph{Open Perspective} $\rightarrow$ \emph{Other}. Then choose
+ \emph{Flora} and press \emph{OK}.
\item \emph{CVS version}:\\
The CVS version is for people who want to use the latest development
@@ -260,8 +261,8 @@
get the files checked out of the CVS repository manually and then import
them to Eclipse. Note that each \emph{net.sourceforge.flora*} directory
must be a separate project. This is done with the Eclipse import wizard
- (\emph{File} $\rightarrow$ \emph{Import} $\rightarrow$ \emph{Existing
- Projects into Workspace}).
+ by selecting the following item from the \emph{File} menu:
+ \emph{Import} $\rightarrow$ \emph{Existing Projects into Workspace}.
Next, you should create an eclipse plugin or a standalone
application. The latter might be useful if you want to, for example, use
@@ -313,8 +314,8 @@
site. To do so open the \emph{net.sourceforge.flora.eclipse.updatesite}
project. Then click the \emph{Build All} button on the \emph{Site Map}
tab. Place the resulting file on the Web site of your choice and add the
- site to Eclipse as follows:
- \emph{Help} $\rightarrow$ \emph{Software Updates} $\rightarrow$
+ site to Eclipse by selecting the following item from the \emph{Help}
+ menu: \emph{Software Updates} $\rightarrow$
\emph{Find and Install...} $\rightarrow$ \emph{Search for new features
to install} $\rightarrow$ \emph{Add Local Site...}\footnote{
\url{http://wiki.eclipse.org/index.php/FAQ\_How\_do\_I\_create\_an\_update\_site\_\%28site.xml\%29\%3F}
@@ -337,7 +338,7 @@
To configure the visualizer to use your installed version of \FLORA,
-choose
+choose the following menu item:
\emph{Window} $\rightarrow$ \emph{Preferences}.
At the preference page you can specify the following:
@@ -379,8 +380,9 @@
To begin working with \FVIZ, Eclipse (or the \FVIZ standalone application)
has to be started. You will be asked to select a directory for a
workspace. This location specifies where the projects and preferences will
-be stored. To create a new project, select \emph{File} $\rightarrow$
-\emph{New} $\rightarrow$ \emph{Project}. A dialog will appear and prompt for
+be stored. To create a new project, select
+\emph{New} $\rightarrow$ \emph{Project} from the file menu.
+A dialog will appear and prompt for
the name of a new project. For more information have a look at the Eclipse
help\footnote{
\url{http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/gettingStarted/qs-07a.htm}
@@ -392,8 +394,8 @@
Once the project is created, you can either import existing \FLORA files or
use \FVIZ to create new knowledge bases.
-Files can be imported by choosing
-\emph{File} $\rightarrow$ \emph{Import}.
+Files can be imported by choosing the
+\emph{File} $\rightarrow$ \emph{Import} menu item.
A dialog will appear and lead you through the process of
importing files to the project.
The imported files will then be copied to your project directory.
@@ -414,7 +416,8 @@
}.
To create a new file, choose
-\emph{File} $\rightarrow$ \emph{New} $\rightarrow$ \emph{Other...} $\rightarrow$ \emph{File}.
+\emph{New} $\rightarrow$ \emph{Other...}
+$\rightarrow$ \emph{File} from the \emph{File} menu.
Then give the name to the new file (do not forget the file ending
e.g. \emph{new\_file.flr}) and choose a project.\footnote{
\url{http://help.eclipse.org/help32/topic/org.eclipse.platform.doc.user/reference/ref-39.htm}
@@ -573,7 +576,7 @@
There is no need to configure the text editor unless you dislike its
default settings. If you decide to change those settings,
the \FVIZ Text Editor configuration page is located at the \emph{Flora-2
- Preferences} $\rightarrow$ \emph{Flora-2 Text Editor} menu.
+ Preferences} $\rightarrow$ \emph{Flora-2 Text Editor} menu item.
The preference page allows the user to change the following settings:
\begin{itemize}
\item \emph{Tab width} \\
@@ -617,7 +620,7 @@
\item \emph{Open Buffer}\\
This action opens a new blank buffer in the editor and allows the user to
start typing new text. This text can be saved as usual, through the
- \emph{File} $\rightarrow$ \emph{Save as} menu.
+ \emph{File} $\rightarrow$ \emph{Save as} menu item.
\item \emph{Add Region to Module}\\
This action adds the rules and the facts in the
|
|
From: Michael K. <ki...@us...> - 2007-05-30 11:37:17
|
Update of /cvsroot/flora/flora-website In directory sc8-pr-cvs17:/tmp/cvs-serv22500 Modified Files: visualizer.html Log Message: spruced up the viz. page, made wording clearer Index: visualizer.html =================================================================== RCS file: /cvsroot/flora/flora-website/visualizer.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- visualizer.html 28 May 2007 16:12:05 -0000 1.1 +++ visualizer.html 30 May 2007 11:37:11 -0000 1.2 @@ -11,33 +11,40 @@ <body> -<h1> <center> +<h1> <i>FLORA</i>-2 Visualizer +</h1> +<img align=middle src="images/visualizer.jpg" width=650 height=550> </center> -</h1> -<h2>Update Site</h2> +<h2>Visualizer Update Site</h2> -<p>To install the Flora-2 Visualizer from the update site, in the -Help menu select Software Updates and then Find and Install, Select -Search for new features to install and click Next. Click New Remote -Site to add an update site with the URL:</p> +<p>To install the Flora-2 Visualizer from the update site, please use the Help + menu. +Select "Software Updates" and then "Find and Install". In the resulting dialog, + select "Search for new features to install" and click "Next." In the next + dialog, click on "New Remote +Site" to insert this URL:</p> +<ul> <p style="font-weight: bold;">http://flora.sourceforge.net/visualizer</p> +</ul> -<h2>Standalone Program</h2> +<h2>Prepackaged Visualizer Standalone Versions</h2> <p><a href="visualizer/flora2visualizer.win32.win32.x86.zip">Windows version</a></p> <p><a href="visualizer/flora2visualizer.linux.gtk.x86.zip">Linux -version</a></p> +version (x86, GTK+)</a></p> <h2>Documentation</h2> -<p>Read this <a href="visualizer/manual.pdf">PDF</a></p> +<p>Instructions on how to use and install FLORA-2 Visualizer + are found <a href="visualizer/manual.pdf">here</a>. +</p> </body> </html> |
|
From: Michael K. <ki...@us...> - 2007-05-30 11:37:17
|
Update of /cvsroot/flora/flora-website/images In directory sc8-pr-cvs17:/tmp/cvs-serv22500/images Added Files: visualizer.jpg Log Message: spruced up the viz. page, made wording clearer --- NEW FILE: visualizer.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:40
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.console/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv6191/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.console/META-INF/MANIFEST.MF,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MANIFEST.MF 10 Apr 2007 12:16:33 -0000 1.2 +++ MANIFEST.MF 29 May 2007 10:48:38 -0000 1.3 @@ -2,14 +2,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Console Plug-in Bundle-SymbolicName: net.sourceforge.flora.eclipse.console;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.console.FloraConsolePlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, +Require-Bundle: net.sourceforge.flora.eclipse, org.eclipse.core.runtime, - org.eclipse.ui.console;visibility:=reexport, org.eclipse.jface.text, - net.sourceforge.flora.eclipse + org.eclipse.ui, + org.eclipse.ui.console;visibility:=reexport Eclipse-LazyStart: true Export-Package: net.sourceforge.flora.eclipse.console, net.sourceforge.flora.eclipse.console.preference |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:34
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.feature
In directory sc8-pr-cvs17:/tmp/cvs-serv6175
Modified Files:
feature.xml
Log Message:
update version to 0.1.0
Index: feature.xml
===================================================================
RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.feature/feature.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- feature.xml 13 May 2007 22:32:23 -0000 1.1
+++ feature.xml 29 May 2007 10:48:32 -0000 1.2
@@ -2,7 +2,7 @@
<feature
id="net.sourecforge.flora.eclipse.feature"
label="Flora-2 Feature"
- version="1.0.0"
+ version="0.1.0"
plugin="net.sourceforge.flora.eclipse">
<description url="http://flora.sourceforge.net">
@@ -36,42 +36,42 @@
id="net.sourceforge.flora.eclipse"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
<plugin
id="net.sourceforge.flora.eclipse.console"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
<plugin
id="net.sourceforge.flora.eclipse.module"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
<plugin
id="net.sourceforge.flora.eclipse.reasoner"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
<plugin
id="net.sourceforge.flora.eclipse.texteditor"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
<plugin
id="net.sourceforge.flora.eclipse.visualizer"
download-size="0"
install-size="0"
- version="1.0.0"
+ version="0.1.0"
unpack="false"/>
</feature>
|
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:32
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse
In directory sc8-pr-cvs17:/tmp/cvs-serv6153
Modified Files:
flora.product
Log Message:
update version to 0.1.0
Index: flora.product
===================================================================
RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/flora.product,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flora.product 14 May 2007 13:44:54 -0000 1.5
+++ flora.product 29 May 2007 10:48:26 -0000 1.6
@@ -44,7 +44,6 @@
</launcher>
<plugins>
- <plugin id="com.aptana.ide.libraries"/>
<plugin id="com.ibm.icu"/>
<plugin id="net.sourceforge.flora.eclipse"/>
<plugin id="net.sourceforge.flora.eclipse.console"/>
|
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:27
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv6153/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/META-INF/MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MANIFEST.MF 13 Mar 2007 22:26:30 -0000 1.1 +++ MANIFEST.MF 29 May 2007 10:48:26 -0000 1.2 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Flora plug-in Bundle-SymbolicName: net.sourceforge.flora.eclipse;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.FloraPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:22
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.texteditor/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv6139/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.texteditor/META-INF/MANIFEST.MF,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MANIFEST.MF 10 Apr 2007 12:16:19 -0000 1.2 +++ MANIFEST.MF 29 May 2007 10:48:21 -0000 1.3 @@ -2,19 +2,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: Flora Sourceeditor Bundle-SymbolicName: net.sourceforge.flora.eclipse.texteditor;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.texteditor.FloraSourceEditorPlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, +Require-Bundle: net.sourceforge.flora.eclipse, + net.sourceforge.flora.eclipse.reasoner, + org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.jface.text, + org.eclipse.ui, org.eclipse.ui.editors, - org.eclipse.ui.workbench.texteditor, + org.eclipse.ui.ide, org.eclipse.ui.views, - net.sourceforge.flora.eclipse, - net.sourceforge.flora.eclipse.reasoner, - org.eclipse.core.resources, - org.eclipse.ui.ide + org.eclipse.ui.workbench.texteditor Eclipse-LazyStart: true Export-Package: net.sourceforge.flora.eclipse.texteditor, net.sourceforge.flora.eclipse.texteditor.actions, |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:17
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.reasoner/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv6121/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.reasoner/META-INF/MANIFEST.MF,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MANIFEST.MF 13 May 2007 19:06:23 -0000 1.8 +++ MANIFEST.MF 29 May 2007 10:48:15 -0000 1.9 @@ -2,17 +2,17 @@ Bundle-ManifestVersion: 2 Bundle-Name: Reasoner Plug-in Bundle-SymbolicName: net.sourceforge.flora.eclipse.reasoner;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.reasoner.FloraReasonerPlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, +Require-Bundle: net.sourceforge.flora.eclipse, + net.sourceforge.flora.eclipse.console, + org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.jface.text, - org.junit, - net.sourceforge.flora.eclipse.console, - net.sourceforge.flora.eclipse, + org.eclipse.ui, org.eclipse.ui.ide, - org.eclipse.core.resources + org.junit Eclipse-LazyStart: true Export-Package: net.sourceforge.flora.eclipse.reasoner, net.sourceforge.flora.eclipse.reasoner.action, |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:11
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.updatesite In directory sc8-pr-cvs17:/tmp/cvs-serv5940 Modified Files: site.xml Log Message: update version to 0.1.0 Index: site.xml =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.updatesite/site.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- site.xml 13 May 2007 22:30:11 -0000 1.1 +++ site.xml 29 May 2007 10:48:04 -0000 1.2 @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/net.sourecforge.flora.eclipse.feature_1.0.0.jar" id="net.sourecforge.flora.eclipse.feature" version="1.0.0"/> + <feature url="features/net.sourecforge.flora.eclipse.feature_0.1.0.jar" id="net.sourecforge.flora.eclipse.feature" version="0.1.0"/> </site> |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:48:00
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.module/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv5738/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.module/META-INF/MANIFEST.MF,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MANIFEST.MF 17 Apr 2007 02:02:09 -0000 1.5 +++ MANIFEST.MF 29 May 2007 10:47:59 -0000 1.6 @@ -2,13 +2,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: Module Plug-in Bundle-SymbolicName: net.sourceforge.flora.eclipse.module; singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.module.ModulePlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, +Require-Bundle: net.sourceforge.flora.eclipse.reasoner, + net.sourceforge.flora.eclipse.visualizer, org.eclipse.core.runtime, - net.sourceforge.flora.eclipse.reasoner, - net.sourceforge.flora.eclipse.visualizer + org.eclipse.ui Eclipse-LazyStart: true Export-Package: net.sourceforge.flora.eclipse.module, net.sourceforge.flora.eclipse.module.dialog, |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:47:55
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.visualizer/META-INF In directory sc8-pr-cvs17:/tmp/cvs-serv5725/META-INF Modified Files: MANIFEST.MF Log Message: update version to 0.1.0 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse.visualizer/META-INF/MANIFEST.MF,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MANIFEST.MF 21 Apr 2007 20:26:40 -0000 1.5 +++ MANIFEST.MF 29 May 2007 10:47:54 -0000 1.6 @@ -2,13 +2,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: Visualizer Plug-in Bundle-SymbolicName: net.sourceforge.flora.eclipse.visualizer; singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 0.1.0 Bundle-Activator: net.sourceforge.flora.eclipse.visualizer.FloraVisualizerPlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, +Require-Bundle: net.sourceforge.flora.eclipse, net.sourceforge.flora.eclipse.reasoner, - net.sourceforge.flora.eclipse + org.eclipse.core.runtime, + org.eclipse.ui Eclipse-LazyStart: true Bundle-ClassPath: ., lib/jpowergraph.jar |
|
From: Daniel W. <dan...@us...> - 2007-05-29 10:46:45
|
Update of /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/docs/manual
In directory sc8-pr-cvs17:/tmp/cvs-serv5265/docs/manual
Modified Files:
manual.tex
Log Message:
updated manual
Index: manual.tex
===================================================================
RCS file: /cvsroot/flora/flora2-visualizer/net.sourceforge.flora.eclipse/docs/manual/manual.tex,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- manual.tex 28 May 2007 11:44:33 -0000 1.17
+++ manual.tex 29 May 2007 10:46:42 -0000 1.18
@@ -234,7 +234,7 @@
Choose \emph{Search for new features} and click Next.
Click New Remote Site to add an update the site with the URL:
- \url{http://homepage.uibk.ac.at/~csaf4368/flora}
+ \url{http://flora.sourceforge.net/visualizer/}
To use the visualizer, you should start Eclipse and choose \FVIZ
Perspective from the \emph{Windows} $\rightarrow$ \emph{Open Perspective}
|
|
From: Michael K. <ki...@us...> - 2007-05-28 21:50:05
|
Update of /cvsroot/flora/flora2/pkgs In directory sc8-pr-cvs17:/tmp/cvs-serv19762/pkgs Added Files: README Log Message: technical docs --- NEW FILE: README --- Conventions for packages: This directory should contain only .flr files and makefiles. Other files will be cleaned out with 'make clean'. The permanent include files must be in the 'include' subdirectory and permanent .P files in the 'prolog' subdirectory. |
|
From: Michael K. <ki...@us...> - 2007-05-28 21:50:05
|
Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs17:/tmp/cvs-serv19762/docs
Added Files:
predicate-dependency.txt
Log Message:
technical docs
--- NEW FILE: predicate-dependency.txt ---
Predicate dependencies in FLORA-2
=================================
flrcommon.fli
flrpredeql.fli
flrprednoeql.fli
:
:
:
:
:
v
FLTRAILERPREFIX(inferred_Wrap) <--- FLHEADPREFIX(derived_Wrap)
| ^
| /|\
| |
| flrpatch.fli ---> |
| |
| +-flora_db_find_base
| | (FLORA_THIS_FDB_STORAGE,
| | FLORA_THIS_WORKSPACE(Wrap))
| flrdyna.fli ---> |
| |
| +-- FLDYNAPREFIX(dyna_Wrap)
| |
| flrdynz.fli ---> |
| |
| +-- FLDYNZPREFIX(dynz_Wrap)
| |
| <----- flrpreddef.fli |
| flrnoeqltrailer.fli +-- FLDEBUGPREFIX(d_Wrap) <---- Wrap
| flreqltrailer.fli ^ ^ ^
| /|\ : /|\
| | : |
+-----------------------------------------+-----------------:-----+
| :
| :
| :
flrpreddef.fli ----------> | :
: | flrpreddef.fli
: |
v |
+-----------------------------------------+
|
|
FLCHECKPREFIX(check_Wrap) <--------------- FLDEFINEDPREFIX(defined_Wrap)
^
/|\
|
|
flora_db_find_base(FLORA_THIS_FLD_STORAGE,
FLORA_THIS_WORKSPACE(Wrap))
|
|
From: Michael K. <ki...@us...> - 2007-05-28 21:48:17
|
Update of /cvsroot/flora/flora2/lib
In directory sc8-pr-cvs17:/tmp/cvs-serv19118/lib
Added Files:
flrparse.flr
Log Message:
added read/parse capability and standard library
fixes to datatypes. added methods to string/list datatypes
--- NEW FILE: flrparse.flr ---
/* File: flrparse.flr
**
** Author(s): Michael Kifer
** Contact: flo...@li...
**
** Copyright (C) The Research Foundation of SUNY, 2007
**
** FLORA-2 is free software; you can redistribute it and/or modify it under the
** terms of the GNU Library General Public License as published by the Free
** Software Foundation; either version 2 of the License, or (at your option)
** any later version.
**
** FLORA-2 is distributed in the hope that it will be useful, but WITHOUT ANY
** WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
** FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for
** more details.
**
** You should have received a copy of the GNU Library General Public License
** along with FLORA-2; if not, write to the Free Software Foundation,
** Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** $Id: flrparse.flr,v 1.1 2007/05/28 21:48:17 kifer Exp $
**
*/
:- export
%read(?,?,?),
%readAll(?,?,?),
?[%readAll(?,?)].
/*
Reads a term from std input, parses, compiles, and builds it.
Term can also be a reification.
Molecules or rules not allowed unless represented as reified terms.
Always succeeds (unless there is a bug).
Code: the code of the term read.
If the thing read is not a term then Code is left unbound
Module: If unbound then FLORA_DEFAULT_WORKSPACE is assumed.
If bound and if the term is a reification then the reified formula
is built for this module.
Status: [OutcomeFlag, EOF_flag|ErrorList]
OutcomeFlag = null/or/error
null - a blank line was read, no code generated
(Code will remain unbound)
ok - good code was generated, no errors
error - parsing/compilation errors
EOF_flag = eof/not_eof
not_eof - end-of-file has not been reached
eof - if it has been reached.
ErrorList - if OutcomeFlag=null/ok, then this list would be empty.
if OutcomeFlag=error, then this would be a list of the
form [error(N1,N2,Message), ...]
N1, N2 encode the line and character number, which is
largely irrelevant in this context. Message is an error
message that explains the problem. Error messages are
also printed to stderr.
*/
%read(?Code,?Mod,?Stat) :-
flora_read_parse_compile_build_term(?Code,?Mod,?Stat)@_prolog(flrutils).
/*
Used for reading terms one-by-one and returning answers interactively.
Under one-at-a-time solution (_one), will wait for input, return parsed code,
then wait for input again, if the user types ";". If the user types
RET then succeeds and exits.
Under all-solutions semantics (_all), will wait for inputs and process them,
but will not return answers unless the file is closed (e.g., Ctl-D at
standard input).
*/
%readAll(?Code,?Mod,?Stat) :-
flora_read_parse_compile_build_loop(?Code,?Mod,?Stat)@_prolog(flrutils).
/*
Collects all answers from the source (string(Str) or file(FileName)
and returns them in a list, CodeList, of the form code(TermCode,Status).
TermCode is the compiled code of a term in ?Source, and ?Status is the
status of the compilation for this term.
*/
?Source[%readAll(?Module,?CodeList)] :-
?Source = string(?Str),
!,
?PlgSrc = atom(?Str)@_prolog,
flora_read_parse_compile_build_term_list(?PlgSrc,?CodeList,?Module)@_prolog(flrutils),
!.
?Source[%readAll(?Module,?CodeList)] :-
p2h{?PlgSrc,?Source},
flora_read_parse_compile_build_term_list(?PlgSrc,?CodeList,?Module)@_prolog(flrutils),
!.
|