X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=fml%2Ffmlstr.c;h=44b8d04acbe8a3a970eb2113bb249a5514f08a94;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=c8810a0ce055eb32f6cedf87c323497625afc12b;hpb=22157698623135d4e8a4910eea084c96b46773db;p=egate.git

diff --git a/fml/fmlstr.c b/fml/fmlstr.c
index c8810a0..44b8d04 100644
--- a/fml/fmlstr.c
+++ b/fml/fmlstr.c
@@ -1,8 +1,61 @@
 /*
+ * 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
  *
  * $Log: fmlstr.c,v $
- * Revision 1.4  1995/02/27 09:01:21  adam
+ * Revision 1.7  1995/05/16 09:39:34  adam
+ * LICENSE.
+ *
+ * Revision 1.6  1995/03/27  12:49:51  adam
+ * Removed CFLAGS def. Bug fix (compile error when USE_GNU_REGEX=0).
+ *
+ * Revision 1.5  1995/03/02  08:06:07  adam
+ * Fml function strsub implemented. New test files marc[45].fml.
+ * New test options in fmltest.
+ *
+ * Revision 1.4  1995/02/27  09:01:21  adam
  * Regular expression support. Argument passing by name option. New FML
  * function strlen.
  *
@@ -82,8 +135,6 @@ static int fml_reg_match (struct reg_cache *reg_pat, const char *str)
     return 0;
 }
 
-#endif
-
 static struct fml_node *fml_exec_match (Fml fml, struct fml_node **lp, 
                                          struct token *tp)
 {
@@ -125,6 +176,8 @@ static struct fml_node *fml_exec_match (Fml fml, struct fml_node **lp,
     return NULL;
 }
 
+#endif
+
 static struct fml_node *fml_exec_strlen (Fml fml, struct fml_node **lp, 
                                          struct token *tp)
 {
@@ -145,6 +198,39 @@ static struct fml_node *fml_exec_strlen (Fml fml, struct fml_node **lp,
     return fml_mk_node_val (fml, len);
 }
 
+static struct fml_node *fml_exec_strsub (Fml fml, struct fml_node **lp,
+					 struct token *tp)
+{
+    struct fml_node *fn_str;
+    struct fml_node *fn_offset;
+    struct fml_node *fn_length;
+    struct fml_node *fn_res;
+    int offset, length;
+
+    fml_cmd_lex (lp, tp);
+    fn_str = fml_expr_term (fml, lp, tp);
+    fn_offset = fml_expr_term (fml, lp, tp);
+    fn_length = fml_expr_term (fml, lp, tp);
+    if (!fn_offset->is_atom || !fn_length->is_atom || !fn_str->is_atom)
+    {
+        fml_node_delete (fml, fn_str);
+        fml_node_delete (fml, fn_offset);
+        fml_node_delete (fml, fn_length);
+        return NULL;
+    }
+    offset = fml_atom_val (fn_offset->p[0]);
+    fml_node_delete (fml, fn_offset);
+    length = fml_atom_val (fn_length->p[0]);
+    fml_node_delete (fml, fn_length);
+    if (offset == 0 && fml_atom_len (fn_str->p[0]) < length)
+        return fn_str;
+    fn_res = fml_node_alloc (fml);
+    fn_res->is_atom = 1;
+    fn_res->p[0]= fml_atom_strsub (fml, fn_str->p[0], offset, length);
+    fml_node_delete (fml, fn_str);
+    return fn_res;
+}
+
 static struct fml_node *fml_exec_strcmp (Fml fml, struct fml_node **lp, 
                                          struct token *tp)
 {
@@ -183,6 +269,9 @@ void fml_str_init (Fml fml)
     sym_info = fml_sym_add (fml->sym_tab, "strlen");
     sym_info->kind = FML_CPREFIX;
     sym_info->prefix = fml_exec_strlen;
+    sym_info = fml_sym_add (fml->sym_tab, "strsub");
+    sym_info->kind = FML_CPREFIX;
+    sym_info->prefix = fml_exec_strsub;
 #if USE_GNU_REGEX
     sym_info = fml_sym_add (fml->sym_tab, "match");
     sym_info->kind = FML_CPREFIX;