merge changes from branch 17.05 onto trunk

git-svn-id: https://svn.eiffel.com/eiffel-org/trunk@1941 abb3cda0-5349-4a8f-a601-0c33ac3a8c38
This commit is contained in:
eiffel-org
2018-02-06 13:41:39 +00:00
parent 0b47147042
commit 265a446dab
14 changed files with 293 additions and 307 deletions

View File

@@ -36,7 +36,7 @@ Note that for performance reasons it is usually better to use predefined criteri
===Agent Criteria===
An agent criterion will filter the objects according to the result of an agent applied to them.
The criterion is initialized with an agent of type <e>PREDICATE [ANY, TUPLE [ANY]]</e>.
The criterion is initialized with an agent of type <e>PREDICATE [TUPLE [ANY]]</e>.
There should be either an open target or a single open argument, and the type of the objects in the query result should conform to the agent's open operand.
==Creating criteria objects==
@@ -57,7 +57,7 @@ feature -- Creating a criterion
-- containing either a single PREDICATE or three
-- values of type [STRING, STRING, ANY].
new_agent (a_predicate: PREDICATE [ANY, TUPLE [ANY]]): PS_CRITERION
new_agent (a_predicate: PREDICATE [TUPLE [ANY]]): PS_CRITERION
-- Creates an agent criterion.
new_predefined (object_attribute: STRING; operator: STRING; value: ANY): PS_CRITERION