[Flora-commits] SF.net SVN: flora2 commit:[1229] trunk
Brought to you by:
kifer
Menu
▾
▴
[Flora-commits] SF.net SVN: flora2 commit:[1229] trunk
|
From: <ki...@us...> - 2015-03-28 20:09:27
|
Revision: 1229
http://sourceforge.net/p/flora/src/1229
Author: kifer
Date: 2015-03-28 20:09:25 +0000 (Sat, 28 Mar 2015)
Log Message:
-----------
Merge remote-tracking branch Ergo
Many bug fixes. Some changes in the compiler options. The charlist syntax "..." is disabled by default. Available only in expert mode.
Modified Paths:
--------------
trunk/flora2/.gitignore
trunk/flora2/Makefile
trunk/flora2/NMakefile.mak
trunk/flora2/admin/windows/flora2.iss
trunk/flora2/cc/windows/flora_ground.dll
trunk/flora2/cc/windows/flora_ground.exp
trunk/flora2/cc/windows/flora_ground.lib
trunk/flora2/cc/windows/prolog2hilog.dll
trunk/flora2/cc/windows/prolog2hilog.exp
trunk/flora2/cc/windows/prolog2hilog.lib
trunk/flora2/cc/windows64/flora_ground.dll
trunk/flora2/cc/windows64/flora_ground.exp
trunk/flora2/cc/windows64/flora_ground.lib
trunk/flora2/cc/windows64/prolog2hilog.dll
trunk/flora2/cc/windows64/prolog2hilog.exp
trunk/flora2/cc/windows64/prolog2hilog.lib
trunk/flora2/closure/flreqltrailer_common.fli
trunk/flora2/closure/flrequality_none.inc
trunk/flora2/closure/flrnoeqltrailer_common.fli
trunk/flora2/closure/flrsigaxioms.fli
trunk/flora2/datatypes/flrdatatype.P
trunk/flora2/datatypes/flrdatatype_parse.P
trunk/flora2/datatypes/flrdatatype_utils.P
trunk/flora2/debugger/dynamic_data.in
trunk/flora2/debugger/flrterminyzer.P
trunk/flora2/demos/diamond.flr
trunk/flora2/docs/flora-flrjava.tex
trunk/flora2/docs/flora2-manual.tex
trunk/flora2/flora2.P
trunk/flora2/flrarguments.P
trunk/flora2/flrcompiler.H
trunk/flora2/flrcompiler.P
trunk/flora2/flrcomposer.P
trunk/flora2/flrincludes/flora_datatype_symbols.flh
trunk/flora2/flrincludes/flora_errors.flh
trunk/flora2/flrincludes/flora_terms.flh
trunk/flora2/flrincludes/flora_wspredicates.flh
trunk/flora2/flrlexer.H
trunk/flora2/flrlexer.P
trunk/flora2/flroperator.P
trunk/flora2/flrparser.H
trunk/flora2/flrparser.P
trunk/flora2/flrporting.P
trunk/flora2/flrprint.H
trunk/flora2/flrprint.P
trunk/flora2/flrprolog.P
trunk/flora2/flrregistry.P
trunk/flora2/flrshell.H
trunk/flora2/flrshell.P
trunk/flora2/flrsimpleprimitive.P
trunk/flora2/flrundefined.H
trunk/flora2/flrundefined.P
trunk/flora2/flrutils.H
trunk/flora2/flrutils.P
trunk/flora2/flrwrapper.P
trunk/flora2/genincludes/flrdynamic_connectors.fli
trunk/flora2/includes/flrdefinition.fli
trunk/flora2/java/API/README
trunk/flora2/java/API/build.bat
trunk/flora2/java/API/build.sh
trunk/flora2/java/API/examples/buildExample.bat
trunk/flora2/java/API/examples/buildExample.sh
trunk/flora2/java/API/examples/flogicbasicsExample/flogicbasicsExample.java
trunk/flora2/java/API/examples/flogicbasicsExample/floraVariables.bat
trunk/flora2/java/API/examples/flogicbasicsExample/floraVariables.sh
trunk/flora2/java/API/examples/fooExample/floraVariables.bat
trunk/flora2/java/API/examples/fooExample/floraVariables.sh
trunk/flora2/java/API/examples/fooExample/fooExample.java
trunk/flora2/java/API/examples/runExample.bat
trunk/flora2/java/API/examples/runExample.sh
trunk/flora2/java/API/javaAPI/src/net/sf/flora2/API/FloraObject.java
trunk/flora2/java/API/javaAPI/src/net/sf/flora2/API/PrologFlora.java
trunk/flora2/java/README
trunk/flora2/java/unixVariables.sh
trunk/flora2/java/windowsVariables.bat
trunk/flora2/lib/flrbasetype.flr
trunk/flora2/lib/flrio.flr
trunk/flora2/lib/flrsystem.flr
trunk/flora2/makeflora
trunk/flora2/makeflora.bat
trunk/flora2/pkgs/flrxml_aux.flr
trunk/flora2/pkgs/persistentmodules.flr
trunk/flora2/runflora
trunk/flora2/runflora.bat
trunk/flora2/syslib/Makefile
trunk/flora2/syslib/NMakefile.mak
trunk/flora2/syslib/flranswer.P
trunk/flora2/syslib/flrauxil.P
trunk/flora2/syslib/flrcanon.P
trunk/flora2/syslib/flrdecode.P
trunk/flora2/syslib/flrdynmod.P
trunk/flora2/syslib/flrdynrule.P
trunk/flora2/syslib/flrmetaops.P
trunk/flora2/syslib/flrnegation.P
trunk/flora2/syslib/flrstoragebase.P
trunk/flora2/syslib/flrtruthvalue.P
trunk/flora2/version.flh
trunk/flora2-testsuite/defeasible/atco/atco_specific.flr
trunk/flora2-testsuite/defeasible/atco2/atco_specific.flr
trunk/flora2-testsuite/defeasible/atco2/justification_test_fl.flr
trunk/flora2-testsuite/defeasible/atco3/atco_specific.flr
trunk/flora2-testsuite/delaystests/.gitignore
trunk/flora2-testsuite/delaystests/errors_tests_flora_old
trunk/flora2-testsuite/functions/errors_warnings_tests_flora_old
trunk/flora2-testsuite/functions/test_func_facts_err_flora_old
trunk/flora2-testsuite/functions/test_func_facts_load_err_flora_old
trunk/flora2-testsuite/general_tests/.gitignore
trunk/flora2-testsuite/general_tests/add_load_old
trunk/flora2-testsuite/general_tests/basetypes.flr
trunk/flora2-testsuite/general_tests/basetypes_old
trunk/flora2-testsuite/general_tests/compile_control.flr
trunk/flora2-testsuite/general_tests/compiletest_flora_old
trunk/flora2-testsuite/general_tests/depchecktest_flora_old
trunk/flora2-testsuite/general_tests/guizhen.flr
trunk/flora2-testsuite/general_tests/metavar.flr
trunk/flora2-testsuite/general_tests/neg_meta_unification.flr
trunk/flora2-testsuite/general_tests/neg_meta_unification_old
trunk/flora2-testsuite/general_tests/nonmon_inherit.flr
trunk/flora2-testsuite/general_tests/nonmon_inherit_old
trunk/flora2-testsuite/general_tests/pps.flr
trunk/flora2-testsuite/general_tests/sensortest_err_flora_old
trunk/flora2-testsuite/general_tests/sensortest_load_err_flora_old
trunk/flora2-testsuite/general_tests/textual_load_flora_old
trunk/flora2-testsuite/general_tests/typecheck.flr
trunk/flora2-testsuite/general_tests/typecheck_old
trunk/flora2-testsuite/general_tests/typelist.flr
trunk/flora2-testsuite/general_tests/typelist_old
trunk/flora2-testsuite/symbols/symbol_context_syntax_flora_old
trunk/flora2-testsuite/symbols/symbol_context_syntax_warnings.flr
trunk/flora2-testsuite/symbols/symbols_load_tests_flora_old
trunk/flora2-testsuite/symbols/symbols_nowarn_load_tests_flora_old
trunk/flora2-testsuite/symbols/symbols_tests_flora_old
trunk/flora2-testsuite/symbols/symbols_warnoff_load_tests_flora_old
trunk/flora2-testsuite/symbols/test_udf_hilog_pred_err_flora_old
trunk/flora2-testsuite/test_dir.sh
trunk/flora2-website/installation.html
trunk/flora2-website/release_notes.html
Added Paths:
-----------
trunk/flora2/flrnosymbolcontext.P
trunk/flora2-testsuite/general_tests/in.flr
trunk/flora2-testsuite/general_tests/in_old_flora
trunk/flora2-testsuite/general_tests/inc.flr
trunk/flora2-testsuite/general_tests/inc2.flr
trunk/flora2-testsuite/general_tests/incinc.flr
trunk/flora2-testsuite/general_tests/no_newline.flr
trunk/flora2-testsuite/general_tests/unicode_err.flr
trunk/flora2-testsuite/general_tests/unicodetest_err.flr
trunk/flora2-testsuite/general_tests/unicodetest_err_old_flora
|