resolve merge

This commit is contained in:
Danya Berezun 2023-10-04 12:11:33 +02:00
commit 9fbd99ab7a
5 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@ bug-reports: "https://github.com/PLTools/Lama/issues"
depends: [ depends: [
"ocaml" { >= "4.13.1" } "ocaml" { >= "4.13.1" }
"ocamlfind" { build } "ocamlfind" { build }
"camlp5" { >= "8.00.05"} "camlp5" { >= "8.00.05" }
"ostap" { >= "0.5"} "ostap" { >= "0.5"}
"GT" { >= "0.5.1" } "GT" { >= "0.5.1" }
] ]

Binary file not shown.

View file

@ -234,7 +234,7 @@ extern int LtagHash (char *s) {
p++; p++;
} }
if (strcmp(s, de_hash(h)) != 0) { failure("%s <-> %s\n", s, de_hash(h)); } if (strcmp(s, de_hash(h), 5) != 0) { failure("%s <-> %s\n", s, de_hash(h)); }
return BOX(h); return BOX(h);
} }

View file

@ -40,7 +40,7 @@ property ``$e$ is a reference''. The result of assignment operator coincides wit
assigns 3 to both "\lstinline|x|" and "\lstinline|y|". assigns 3 to both "\lstinline|x|" and "\lstinline|y|".
\begin{figure}[h] \begin{figure}[h]
\renewcommand{\Ref}[1]{\mathcal{R}\,({#1})} \newcommand{\Ref}[1]{\mathcal{R}\,({#1})}
\renewcommand{\arraystretch}{4} \renewcommand{\arraystretch}{4}
\[ \[
\begin{array}{cc} \begin{array}{cc}

View file

@ -238,7 +238,7 @@ The function takes an accumulator and a pair key-value. The bindings are enumera
Sets are immutable structures with the following interface: Sets are immutable structures with the following interface:
\descr{\lstinline|fun emptySet (f)|}{Creates an empty set. An argument is a comparison function, which returns zero, positive or negative integer values depending on \descr{\lstinline|fun emptySet (compare)|}{Creates an empty set. An argument is a comparison function, which returns zero, positive or negative integer values depending on
the order of its arguments.} the order of its arguments.}
\descr{\lstinline|fun isEmptySet (m)|}{Returns true if an argument set is empty.} \descr{\lstinline|fun isEmptySet (m)|}{Returns true if an argument set is empty.}
@ -259,7 +259,7 @@ there is no such element and non-zero otherwise.}
\descr{\lstinline|fun diff (a, b)|}{Returns a difference between sets "\lstinline|a|" and "\lstinline|b|" (a set of those elements \descr{\lstinline|fun diff (a, b)|}{Returns a difference between sets "\lstinline|a|" and "\lstinline|b|" (a set of those elements
of "\lstinline|a|" which are not in "\lstinline|b|") as a new set.} of "\lstinline|a|" which are not in "\lstinline|b|") as a new set.}
\descr{\lstinline|fun listSet (l)|}{Converts a list into a set. } \descr{\lstinline|fun listSet (l, compare)|}{Converts a list into a set. The second argument is a comparison function as per \lstinline|emptySet|.}
\descr{\lstinline|fun iterSet (f, s)|}{Applied a function "\lstinline|f|" to each element of the set "\lstinline|s|". The elements are \descr{\lstinline|fun iterSet (f, s)|}{Applied a function "\lstinline|f|" to each element of the set "\lstinline|s|". The elements are
enumerated in ascending order.} enumerated in ascending order.}