Ticket #768: started.patch

ARBDB/adlang1.cxx

@@ -314 +314 @@
  *
  * 3. operator(x, y)
  *
- *    @@@ this decription does not match behavior!
- *    @@@ check description in helpfile as well
+ *    The operator is applied to the arguments.
+ *    If an argument is a command (starts with one of "|:/"),
+ *    it will get executed on inputstream and the result will be used.
  *
- *    Inputstreams will be ignored and the operator is applied
- *    to the arguments
- *
  *    Example : a;b | plus(c,d)
  *    Result  : c+d
  */
@@ -354 +352 @@
 
         case 2:
             for (int i = 0; i<args->input.size(); ++i) {
+                // @@@ need a getter method for params (pass number of param + number of input-stream (or -1 to use ""))
                 char *result1       = args->get_callEnv().interpret_subcommand(args->input.get(i), args->get_param(0)); // @@@ EVALUATED_PARAM (#768)
                 if (!result1) error = GB_await_error();
                 else {

HELP_SOURCE/oldhelp/aci.hlp

@@ -95 +95 @@
         Multiple parameters have to be separated by ',' or ';'.
 
         There are two distinct ways to specify such a parameter:
-        - unquoted
 
+         - unquoted
+
           Unquoted parameters are taken as specified, despite the following exceptions:
            - ',;"|\)' need to be escaped by prefixing one '\'
            - spaces will get removed if unprefixed by '\'
 
-        - quoted
+         - quoted
 
           Quoted parameters begin and end with a '"'. You can use any character,
           but you need to escape '\' and '"' by preceeding a '\'.
@@ -109 +110 @@
           Example: 'remove("\"")' will remove all double quotes from input.
                    'remove("\\")' will remove all backslashes from input.
 
-        [@@@ behavior currently not strictly implemented]
+        If the first character of a parameter is ':', '|' or '/' the value of the
+        parameter is interpreted as SRT, ACI or REG expression and will be
+        applied (to an empty input string) and its result will be used as the actual parameter.
 
 SECTION COMMANDLIST
 
@@ -302 +305 @@
                     - has 1 argument, it accepts one to many input streams. The operator
                       is applied to each input stream together with the argument.
                       For each input stream one output stream is generated.
-                    - has 2 arguments, it is applied to these. The arguments are interpreted as
-                      ACI commands and are applied for each input stream. The results of
-                      the commands are passed as arguments to the binary operator. For each input
-                      stream one output stream is generated.
+                    - has 2 arguments, it is applied to these (once for each input stream).
 
         CONDITIONAL