X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=fml%2Ffml.c;h=b08aa4ddf98e11b41d0c95e2434cfbcc0f3399b8;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=82b825de952175019c6076574f6e16524efadee0;hpb=3f6af0f3aa9f114cf562c28f2ed0b954e4c5d659;p=egate.git diff --git a/fml/fml.c b/fml/fml.c index 82b825d..b08aa4d 100644 --- a/fml/fml.c +++ b/fml/fml.c @@ -1,7 +1,60 @@ /* + * Copyright (c) 1995, the EUROPAGATE consortium (see below). + * + * The EUROPAGATE consortium members are: + * + * University College Dublin + * Danmarks Teknologiske Videnscenter + * An Chomhairle Leabharlanna + * Consejo Superior de Investigaciones Cientificas + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation, in whole or in part, for any purpose, is hereby granted, + * provided that: + * + * 1. This copyright and permission notice appear in all copies of the + * software and its documentation. Notices of copyright or attribution + * which appear at the beginning of any file must remain unchanged. + * + * 2. The names of EUROPAGATE or the project partners may not be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * 3. Users of this software (implementors and gateway operators) agree to + * inform the EUROPAGATE consortium of their use of the software. This + * information will be used to evaluate the EUROPAGATE project and the + * software, and to plan further developments. The consortium may use + * the information in later publications. + * + * 4. Users of this software agree to make their best efforts, when + * documenting their use of the software, to acknowledge the EUROPAGATE + * consortium, and the role played by the software in their work. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE + * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF + * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND + * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE + * USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ +/* * FML interpreter. Europagate, 1995 * - * fml.c,v + * $Log: fml.c,v $ + * Revision 1.16 1995/05/16 09:39:32 adam + * LICENSE. + * + * Revision 1.15 1995/02/27 09:01:20 adam + * Regular expression support. Argument passing by name option. New FML + * function strlen. + * + * Revision 1.14 1995/02/23 08:32:04 adam + * Changed header. + * * Revision 1.12 1995/02/22 15:20:13 adam * Bug fix in fml_exec_space. * @@ -204,6 +257,11 @@ void fml_del_token (struct token *tp, Fml fml) void fml_cmd_lex (struct fml_node **np, struct token *tp) { + fml_cmd_lex_s (np, tp, 1); +} + +void fml_cmd_lex_s (struct fml_node **np, struct token *tp, int esc_stop) +{ char *cp; char *dst; if (!*np) @@ -263,7 +321,7 @@ void fml_cmd_lex (struct fml_node **np, struct token *tp) } while (*cp) { - if (*cp == tp->escape_char) + if (*cp == tp->escape_char && esc_stop) { *dst = '\0'; tp->offset = cp - tp->atombuf; @@ -313,7 +371,6 @@ static struct fml_node *fml_exec_space (Fml fml, struct fml_node **lp, (*fml->write_func) ('_'); else (*fml->write_func) (' '); - putchar (' '); return NULL; } @@ -332,7 +389,7 @@ static struct fml_node *fml_exec_prefix (struct fml_sym_info *info, Fml fml, struct fml_node *fn; struct fml_sym_info *arg_info; struct fml_node *return_value; - static char arg[128]; + static char arg_name[128]; if (fml->debug & 1) { @@ -343,28 +400,46 @@ static struct fml_node *fml_exec_prefix (struct fml_sym_info *info, Fml fml, fml_cmd_lex (lp, tp); for (fn = info->args; fn; fn = fn->p[1]) { - assert (fn->is_atom); - fml_atom_strx (fn->p[0], arg, 127); + fml_atom_strx (fn->p[0], arg_name, 127); if (fml->debug & 1) { pr_indent (1); - printf ("%s=", arg); + printf ("%s=", arg_name); } - arg_info = fml_sym_add_local (fml->sym_tab, arg); - arg_info->kind = FML_VAR; - - if (tp->kind == 'g') + if (*arg_name == fml->escape_char) { - arg_info->body = fml_sub0 (fml, tp->sub); + arg_info = fml_sym_add_local (fml->sym_tab, 1+arg_name); + arg_info->kind = FML_CODE; + + if (tp->kind == 'g') + arg_info->body = tp->sub; + else + arg_info->body = NULL; + if (fml->debug & 1) + { + fml_pr_list (arg_info->body); + pr_indent (-1); + } fml_cmd_lex (lp, tp); } else - arg_info->body = fml_sub2 (fml, lp, tp); - if (fml->debug & 1) { - fml_pr_list (arg_info->body); - pr_indent (-1); + arg_info = fml_sym_add_local (fml->sym_tab, arg_name); + arg_info->kind = FML_VAR; + + if (tp->kind == 'g') + { + arg_info->body = fml_sub0 (fml, tp->sub); + fml_cmd_lex (lp, tp); + } + else + arg_info->body = fml_sub2 (fml, lp, tp); + if (fml->debug & 1) + { + fml_pr_list (arg_info->body); + pr_indent (-1); + } } } return_value = fml_exec_group (info->body, fml); @@ -411,13 +486,22 @@ static struct fml_node *fml_sub2 (Fml fml, struct fml_node **lp, if (tp->kind == 'e') { info = fml_sym_lookup (fml->sym_tab, tp->tokenbuf); - assert (info); + if (!info) + { + printf ("<>", tp->tokenbuf); + getchar (); + return NULL; + } switch (info->kind) { case FML_VAR: fn = fml_node_copy (fml, info->body); fml_cmd_lex (lp, tp); break; + case FML_CODE: + fn = fml_node_copy (fml, info->body); + fml_cmd_lex (lp, tp); + break; case FML_PREFIX: fn = fml_exec_prefix (info, fml, lp, tp); break; @@ -807,7 +891,7 @@ struct fml_node *fml_exec_group (struct fml_node *list, Fml fml) while (1) { fml_cmd_lex (&list, &token); - if (token.kind != 't') + if (token.kind != 't' && token.kind != 'e') break; if (!info->args) { @@ -895,14 +979,17 @@ struct fml_node *fml_exec_group (struct fml_node *list, Fml fml) pr_indent (-1); } continue; + case FML_CODE: + fml_exec_group (info->body, fml); + break; default: - printf ("unknown token: `%s'", token.tokenbuf); + printf ("", token.tokenbuf); fml_cmd_lex (&list, &token); } } else { - printf (""); + printf ("", token.tokenbuf); } break; case 't':