diff --git a/docs/builtins.tex b/docs/builtins.tex index 0cf3b1161..b10f9a492 100644 --- a/docs/builtins.tex +++ b/docs/builtins.tex @@ -2,8 +2,6 @@ @node Built-ins, Library, Modules, Top -@chapter Built-In Predicates - @menu Built-ins, Debugging, Syntax, Top @@ -2528,9 +2526,9 @@ Displays term @var{T} on the current output stream. All Prolog terms are written in standard parenthesized prefix notation. @item write_canonical(+@var{T}) [ISO] -@findex display/1 -@syindex display/1 -@cnindex display/1 +@findex write_canonical/1 +@syindex write_canonical/1 +@cnindex write_canonical/1 Displays term @var{T} on the current output stream. Atoms are quoted when necessary, and operators are ignored, that is, the term is written in standard parenthesized prefix notation. @@ -3700,10 +3698,10 @@ true if the predicate is dynamic @findex static/0 (predicate_property flag) true if the predicate is static @item meta_predicate(@var{M}) -@findex meta_predicate/1 (predicate_property flag) +@findex meta_predicate_flag/1 (predicate_property flag) true if the predicate has a meta_predicate declaration @var{M}. @item multifile -@findex multifile/1 (predicate_property flag) +@findex multifile_flag/1 (predicate_property flag) true if the predicate was declared to be multifile @item imported_from(@var{Mod}) @findex imported_from/1 (predicate_property flag) @@ -3720,7 +3718,7 @@ public. true if the predicate is tabled; note that only static predicates can be tabled in YAP. @item source (predicate_property flag) -@findex source/0 (predicate_property flag) +@findex source_flag/0 (predicate_property flag) true if source for the predicate is available. @item number_of_clauses(@var{ClauseCount}) @findex number_of_clauses/1 (predicate_property flag) @@ -3737,7 +3735,7 @@ Given predicate @var{P}, @var{NCls} is the number of clauses for indices to those clauses (in bytes). @item predicate_erased_statistics(@var{P},@var{NCls},@var{Sz},@var{IndexSz}) -@findex predicate_statistics/4 +@findex predicate_erased_statistics/4 Given predicate @var{P}, @var{NCls} is the number of erased clauses for @var{P} that could not be discarded yet, @var{Sz} is the amount of space @@ -3850,9 +3848,9 @@ If a term equal to @var{T} up to variable renaming is stored under key @var{K} and unify @var{R} with its reference. @item recordzifnot(+@var{K},@var{T},-@var{R}) -@findex recorda/3 -@snindex recorda/3 -@cnindex recorda/3 +@findex recordzifnot/3 +@snindex recordzifnot/3 +@cnindex recordzifnot/3 If a term equal to @var{T} up to variable renaming is stored under key @var{K} fail. Otherwise, make term @var{T} the first record under key @var{K} and unify @var{R} with its reference. @@ -4975,9 +4973,9 @@ for the @var{Calls} counter, next the @var{Retries} counter, and last the @var{CallsAndRetries} counter. @item call_count_reset -@findex call_count_data/0 -@snindex call_count_data/0 -@cnindex call_count_data/0 +@findex call_count_reset/0 +@snindex call_count_reset/0 +@cnindex call_count_reset/0 Reset call count counters. All timers are also reset. @item call_count(?@var{CallsMax}, ?@var{RetriesMax}, ?@var{CallsAndRetriesMax}) @@ -5149,9 +5147,9 @@ This built-in will silently fail if the there is no static array with that name. @item mmapped_array(+@var{Name}, +@var{Size}, +@var{Type}, +@var{File}) -@findex static_array/3 -@snindex static_array/3 -@cnindex static_array/3 +@findex mmapped_array/3 +@snindex mmapped_array/3 +@cnindex mmapped_array/3 Similar to @code{static_array/3}, but the array is memory mapped to file @var{File}. This means that the array is initialized from the file, and that any changes to the array will also be stored in the file. diff --git a/docs/conv/texi2doxy b/docs/conv/texi2doxy index 0d0032e4a..62204ed70 100644 --- a/docs/conv/texi2doxy +++ b/docs/conv/texi2doxy @@ -544,6 +544,8 @@ simplify( [0'e,0'E|L]) --> "!", !, simplify(L). simplify( [0'g,0'G|L]) --> ">", !, simplify(L). +simplify( [0'h,0'Y|L]) --> "-", !, + simplify(L). simplify( [0'm,0'M|L]) --> ";", !, simplify(L). simplify( [0'q,0'Q|L]) --> "=", !, @@ -657,11 +659,20 @@ run( L) --> "@code{", !, run(R). run( [C|L]) --> "@", escaped(C), !, run( L ). +run( [0'.,0'.,0'.|L]) --> "@dots", !, + run( L ). +run( [0'\t|L]) --> "@tab", !, + run( L ). run( L) --> "@samp{", !, %' argument(AL, 0'{, 0'}), { run(AL1, AL), format(codes(L, R), '`~s`' , [AL1] ) }, %' run(R). +run( L) --> "@option{", !, %' + argument(AL, 0'{, 0'}), + { run(AL1, AL), + format(codes(L, R), '`~s`' , [AL1] ) }, %' + run(R). run( L) --> "@env{", !, %' argument(AL, 0'{, 0'}), { run(AL1, AL), @@ -683,6 +694,10 @@ run( L) --> "@pxref{", !, argument(AL, 0'{, 0'}), { format(codes(L, R), '`~s`', [AL] ) }, %' run(R). +run( L) --> "@ref{", !, + argument(AL, 0'{, 0'}), + { format(codes(L, R), '[~s](@ref ~s)', [AL,AL] ) }, %' + run(R). run( L) --> "@strong{", !, argument(AL, 0'{, 0'}), { run(AL1, AL), diff --git a/docs/doxygen.rc b/docs/doxygen.rc index 429a99bdd..fc02192c8 100644 --- a/docs/doxygen.rc +++ b/docs/doxygen.rc @@ -51,14 +51,14 @@ PROJECT_BRIEF = # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. -PROJECT_LOGO = /Users/vsc/Yap/yap-6.3/misc/icons/yap_96x96x32.png +PROJECT_LOGO = ../misc/icons/yap_96x96x32.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = /Users/vsc/Yap/doxout +OUTPUT_DIRECTORY = ../../doxout # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -753,7 +753,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = /Users/vsc/Yap/yap-6.3/docs/yap.md +INPUT = yap.md # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/docs/load.tex b/docs/load.tex index 5d656d9f4..52794609c 100644 --- a/docs/load.tex +++ b/docs/load.tex @@ -14,6 +14,9 @@ Loading Programs @end menu +Next, we present the main predicates and directives available to load +files and to control the Prolog environment. + @node Compiling, Setting the Compiler, , Loading Programs @section Program loading and updating diff --git a/docs/syntax.tex b/docs/syntax.tex index 478582f2f..4dcee0096 100644 --- a/docs/syntax.tex +++ b/docs/syntax.tex @@ -154,13 +154,13 @@ numbers in hexadecimal base. Example: the following tokens all denote the same integer @example -@code{10 2'1010 3'101 8'12 16'a 36'a 0xa 0o12} +10 2'1010 3'101 8'12 16'a 36'a 0xa 0o12 @end example Numbers of the form @code{0'a} are used to represent character constants. So, the following tokens denote the same integer: @example -@code{0'd 100} +0'd 100 @end example YAP (version @value{VERSION}) supports integers that can fit @@ -188,7 +188,7 @@ one of '+' or '-'. Examples: @example -@code{10.0 10e3 10e-3 3.1415e+3} +10.0 10e3 10e-3 3.1415e+3 @end example Floating-point numbers are represented as a double in the target @@ -218,7 +218,7 @@ and escape characters. Examples: @example -@code{"" "a string" "a double-quote:""" } +"" "a string" "a double-quote:""" @end example The first string is an empty string, the last string shows the use of @@ -237,7 +237,7 @@ either as an octal or hexadecimal number. The next examples demonstrates the use of escape sequences in YAP: @example -@code{"\x0c\" "\01\" "\f" "\\" } +"\x0c\" "\01\" "\f" "\\" @end example The first three examples return a list including only character 12 (form @@ -246,7 +246,7 @@ feed). The last example escapes the escape character. Escape sequences were not available in C-Prolog and in original versions of YAP up to 4.2.0. Escape sequences can be disable by using: @example -@code{:- yap_flag(character_escapes,false).} +:- yap_flag(character_escapes,false). @end example @@ -283,7 +283,7 @@ follow the same rules. Examples: @example -@code{a a12x '$a' ! => '1 2'} +a a12x '$a' ! => '1 2' @end example Version @code{4.2.0} of YAP removed the previous limit of 256 diff --git a/docs/yap.tex b/docs/yap.tex index 48441229c..5d5f35ca8 100644 --- a/docs/yap.tex +++ b/docs/yap.tex @@ -670,7 +670,7 @@ The original author of this code was Richard O'Keefe. Jan Wielemaker @node Apply, Association Lists, Aggregate, Library -@sectionbui Apply Macros +@section Apply Macros @cindex apply This library provides a SWI-compatible set of utilities for applying a @@ -1955,9 +1955,9 @@ The following routines are available once included with the elements of @var{ListIn}. @item maplist(:@var{Pred}, ?@var{ListIn}) -@findex maplist/3 -@snindex maplist/3 -@cnindex maplist/3 +@findex maplist/2 +@snindex maplist/2 +@cnindex maplist/2 Creates @var{ListOut} by applying the predicate @var{Pred} to all elements of @var{ListIn}. @@ -1991,9 +1991,9 @@ elements of @var{ListIn}. Creates @var{ListOut} of all list elements of @var{ListIn} that pass a given test @item selectlist(:@var{Pred}, +@var{ListIn}, +@var{ListInAux}, ?@var{ListOut}) -@findex selectlist/3 -@snindex selectlist/3 -@cnindex selectlist/3 +@findex selectlist/4 +@snindex selectlist/4 +@cnindex selectlist/4 Creates @var{ListOut} of all list elements of @var{ListIn} that pass the given test @var{Pred} using +@var{ListInAux} as an auxiliary element. @@ -10582,12 +10582,12 @@ are implemented in YAP. They can easily be detected using the Last, by default YAP enables character escapes in strings. You can disable the special interpretation for the escape character by using: @example -@code{:- yap_flag(character_escapes,off).} +:- yap_flag(character_escapes,off). @end example @noindent or by using: @example -@code{:- yap_flag(language,cprolog).} +:- yap_flag(language,cprolog). @end example @node Fully C-Prolog Compatible, Not Strictly C-Prolog Compatible, Major Differences with C-Prolog, C-Prolog diff --git a/packages/raptor b/packages/raptor index 0f77a1e1b..d5c70de04 160000 --- a/packages/raptor +++ b/packages/raptor @@ -1 +1 @@ -Subproject commit 0f77a1e1b90b36bddb1844712380f4f3858123b7 +Subproject commit d5c70de04a6fce6be71a9086d0164dd0b0c9d9d4 diff --git a/packages/zlib b/packages/zlib index a8a43aa09..abd65ae64 160000 --- a/packages/zlib +++ b/packages/zlib @@ -1 +1 @@ -Subproject commit a8a43aa09892c4b7018dc053d8e7653e2f648107 +Subproject commit abd65ae6486993e04dfa883163efdad3bab789ab