Fml function strsub implemented. New test files marc[45].fml.

[egate.git] / fml / fmlstr.c

diff --git a/fml/fmlstr.c b/fml/fmlstr.c
index c8810a0..2bfda57 100644 (file)
--- a/fml/fmlstr.c
+++ b/fml/fmlstr.c
@@ -2,7 +2,11 @@
  * FML interpreter. Europagate, 1995
  *
  * $Log: fmlstr.c,v $
- * Revision 1.4  1995/02/27 09:01:21  adam
+ * 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.
  *
@@ -145,6 +149,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 +220,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;