From 89ac407f4bf5ed9d219978cd678252ce1b175fa8 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Mon, 27 Feb 2006 00:38:47 -0600
Subject: [PATCH] Added more builtin functions; added python code support

---
 moo/mooedit/syntax/ms.lang                 |   7 +
 moo/mooutils/mooscript/Makefile.incl       |   1 +
 moo/mooutils/mooscript/mooscript-builtin.c | 203 ++++++
 moo/mooutils/mooscript/mooscript-context.c |  57 +-
 moo/mooutils/mooscript/mooscript-context.h |   4 +-
 moo/mooutils/mooscript/mooscript-node.c    |  71 ++
 moo/mooutils/mooscript/mooscript-node.h    |  22 +
 moo/mooutils/mooscript/mooscript-parser.c  |  77 +-
 moo/mooutils/mooscript/mooscript-parser.h  |   2 +
 moo/mooutils/mooscript/mooscript-value.c   |  16 +-
 moo/mooutils/mooscript/mooscript-value.h   |   4 +-
 moo/mooutils/mooscript/mooscript-yacc.c    | 803 +++++++++++----------
 moo/mooutils/mooscript/mooscript-yacc.h    |  82 ++-
 moo/mooutils/mooscript/mooscript-yacc.y    |  13 +-
 14 files changed, 865 insertions(+), 497 deletions(-)
 create mode 100644 moo/mooutils/mooscript/mooscript-builtin.c

diff --git a/moo/mooedit/syntax/ms.lang b/moo/mooedit/syntax/ms.lang
index 56952c9a..d92a6f64 100644
--- a/moo/mooedit/syntax/ms.lang
+++ b/moo/mooedit/syntax/ms.lang
@@ -6,6 +6,7 @@
 
   <syntax>
     <context name="Normal">
+      <String string="===" bol-only="TRUE" context="Python" style="Python"/>
       <Char char="&quot;" context="String" style="String"/>
       <Char char="&apos;" context="String" style="String"/>
       <Char char="#" context="Comment" style="Comment"/>
@@ -13,6 +14,10 @@
       <Keyword keyword="SpecialVars" style="SpecialVars"/>
       <Regex pattern="\b[_\w][_\w\d]*(?=[\s]*[(])" style="Function"/>
     </context>
+    <context name="Python" eol-context="#stay">
+      <String string="===" bol-only="TRUE" context="#pop" style="Python"/>
+      <IncludeRules from="##Python##Normal"/>
+    </context>
     <context name="String" style="String" eol-context="#pop">
       <Char char="&quot;" context="#pop" style="String"/>
     </context>
@@ -49,9 +54,11 @@
     <style name="Keyword"     default-style="Keyword"/>
     <style name="SpecialVars" default-style="Others" bold="TRUE"/>
     <style name="Function"    default-style="Function"/>
+    <style name="Python"      default-style="Others" bold="TRUE"/>
   </styles>
 
   <general>
+    <brackets>()[]</brackets>
     <comments>
       <single-line start="#"/>
     </comments>
diff --git a/moo/mooutils/mooscript/Makefile.incl b/moo/mooutils/mooscript/Makefile.incl
index 0237982d..c748b23c 100644
--- a/moo/mooutils/mooscript/Makefile.incl
+++ b/moo/mooutils/mooscript/Makefile.incl
@@ -14,6 +14,7 @@ $(mooscript)/mooscript-yacc.h: $(mooscript)/mooscript-yacc.y
 	bison -d -o $(mooscript_srcdir)/mooscript-yacc.c $(mooscript_srcdir)/mooscript-yacc.y
 
 mooscript_sources =                     \
+    $(mooscript)/mooscript-builtin.c    \
     $(mooscript)/mooscript-context.c    \
     $(mooscript)/mooscript-context.h    \
     $(mooscript)/mooscript-func.c       \
diff --git a/moo/mooutils/mooscript/mooscript-builtin.c b/moo/mooutils/mooscript/mooscript-builtin.c
new file mode 100644
index 00000000..484eb1c5
--- /dev/null
+++ b/moo/mooutils/mooscript/mooscript-builtin.c
@@ -0,0 +1,203 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4; coding: utf-8 -*-
+ *
+ *   mooscript-builtin.c
+ *
+ *   Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   See COPYING file that comes with this distribution.
+ */
+
+#include "mooscript-context.h"
+#include "mooscript-parser.h"
+#include "mooscript-zenity.h"
+#include "mooutils/moopython.h"
+
+
+static MSValue*
+print_func (MSValue   **args,
+            guint       n_args,
+            MSContext  *ctx)
+{
+    guint i;
+
+    for (i = 0; i < n_args; ++i)
+    {
+        char *s = ms_value_print (args[i]);
+        ctx->print_func (s, ctx);
+        g_free (s);
+    }
+
+    ctx->print_func ("\n", ctx);
+    return ms_value_none ();
+}
+
+
+static MSValue*
+str_func (MSValue    *arg,
+          G_GNUC_UNUSED MSContext *ctx)
+{
+    char *str;
+    MSValue *ret;
+
+    str = ms_value_print (arg);
+    ret = ms_value_take_string (str);
+
+    return ret;
+}
+
+
+static MSValue*
+int_func (MSValue    *arg,
+          MSContext  *ctx)
+{
+    int ival;
+
+    if (!ms_value_get_int (arg, &ival))
+    {
+        char *str = ms_value_print (arg);
+        ms_context_format_error (ctx, MS_ERROR_TYPE,
+                                 "could not convert '%s' to int",
+                                 str);
+        g_free (str);
+        return NULL;
+    }
+
+    return ms_value_int (ival);
+}
+
+
+static MSValue*
+python_func (MSValue    *arg,
+             MSContext  *ctx)
+{
+    char *script;
+    MooPyObject *ret;
+
+    if (!moo_python_running())
+        return ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                        "Python support not available");
+
+    script = ms_value_print (arg);
+    ret = moo_python_run_string (script);
+    g_free (script);
+
+    if (ret)
+    {
+        moo_Py_DECREF (ret);
+        return ms_value_none ();
+    }
+    else
+    {
+        moo_PyErr_Print ();
+        return ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                        "python script raised exception");
+    }
+}
+
+
+static MSValue*
+include_func (MSValue    *arg,
+              MSContext  *ctx)
+{
+    char *file = NULL, *script = NULL;
+    GError *error = NULL;
+    MSNode *node = NULL;
+    MSValue *ret;
+
+    file = ms_value_print (arg);
+
+    if (!g_file_get_contents (file, &script, NULL, &error))
+    {
+        ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                 "%s", error->message);
+        goto error;
+    }
+
+    node = ms_script_parse (script);
+
+    if (!node)
+    {
+        ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                 "%s", error->message);
+        goto error;
+    }
+
+    ret = ms_node_eval (node, ctx);
+
+    g_free (file);
+    g_free (script);
+    g_object_unref (node);
+
+    return ret;
+
+error:
+    g_error_free (error);
+    g_free (file);
+    g_free (script);
+    if (node)
+        g_object_unref (node);
+    return NULL;
+}
+
+
+#define ADD_FUNC(type_,func_,name_)             \
+G_STMT_START {                                  \
+    MSFunc *msfunc__;                           \
+    msfunc__ = type_ (func_);                   \
+    ms_context_set_func (ctx, name_, msfunc__); \
+    g_object_unref (msfunc__);                  \
+} G_STMT_END
+
+#define ADD_FUNC_OBJ(factory_,name_)            \
+G_STMT_START {                                  \
+    MSFunc *msfunc__;                           \
+    msfunc__ = factory_ ();                     \
+    ms_context_set_func (ctx, name_, msfunc__); \
+    g_object_unref (msfunc__);                  \
+} G_STMT_END
+
+#define ADD_CONSTANT(func_,name_)               \
+G_STMT_START {                                  \
+    MSVariable *var_;                           \
+    MSValue *val_;                              \
+    val_ = func_ ();                            \
+    var_ = ms_variable_new_value (val_);        \
+    ms_context_set_var (ctx, name_, var_);      \
+    ms_variable_unref (var_);                   \
+    ms_value_unref (val_);                      \
+} G_STMT_END;
+
+void
+_ms_context_add_builtin (MSContext *ctx)
+{
+    guint i;
+
+    ADD_CONSTANT (ms_value_none, "none");
+    ADD_CONSTANT (ms_value_true, "true");
+    ADD_CONSTANT (ms_value_false, "false");
+
+    for (i = 0; i < MS_BINARY_OP_LAST; ++i)
+        ADD_FUNC (ms_cfunc_new_2,
+                  ms_binary_op_cfunc (i),
+                  ms_binary_op_name (i));
+
+    for (i = 0; i < MS_UNARY_OP_LAST; ++i)
+        ADD_FUNC (ms_cfunc_new_1,
+                  ms_unary_op_cfunc (i),
+                  ms_unary_op_name (i));
+
+    ADD_FUNC (ms_cfunc_new_var, print_func, "Print");
+    ADD_FUNC (ms_cfunc_new_1, python_func, "Python");
+    ADD_FUNC (ms_cfunc_new_1, include_func, "Include");
+    ADD_FUNC (ms_cfunc_new_1, str_func, "Str");
+    ADD_FUNC (ms_cfunc_new_1, int_func, "Int");
+
+    ADD_FUNC_OBJ (ms_zenity_entry, "Entry");
+    ADD_FUNC_OBJ (ms_zenity_info, "Info");
+    ADD_FUNC_OBJ (ms_zenity_error, "Error");
+}
diff --git a/moo/mooutils/mooscript/mooscript-context.c b/moo/mooutils/mooscript/mooscript-context.c
index 5e7924c0..9655579c 100644
--- a/moo/mooutils/mooscript/mooscript-context.c
+++ b/moo/mooutils/mooscript/mooscript-context.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4; coding: utf-8 -*-
  *
- *   as-script-context.c
+ *   mooscript-context.c
  *
  *   Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
  *
@@ -75,51 +75,6 @@ default_print_func (const char  *string,
 }
 
 
-static MSValue*
-print_func (MSValue   **args,
-            guint       n_args,
-            MSContext  *ctx)
-{
-    guint i;
-
-    for (i = 0; i < n_args; ++i)
-    {
-        char *s = ms_value_print (args[i]);
-        ctx->print_func (s, ctx);
-        g_free (s);
-    }
-
-    ctx->print_func ("\n", ctx);
-    return ms_value_none ();
-}
-
-
-static void
-add_builtin_funcs (MSContext *ctx)
-{
-    guint i;
-    MSFunc *func;
-
-    for (i = 0; i < MS_BINARY_OP_LMST; ++i)
-    {
-        func = ms_cfunc_new_2 (ms_binary_op_cfunc (i));
-        ms_context_set_func (ctx, ms_binary_op_name (i), func);
-        g_object_unref (func);
-    }
-
-    for (i = 0; i < MS_UNARY_OP_LMST; ++i)
-    {
-        func = ms_cfunc_new_1 (ms_unary_op_cfunc (i));
-        ms_context_set_func (ctx, ms_unary_op_name (i), func);
-        g_object_unref (func);
-    }
-
-    func = ms_cfunc_new_var (print_func);
-    ms_context_set_func (ctx, "print", func);
-    g_object_unref (func);
-}
-
-
 static void
 ms_context_init (MSContext *ctx)
 {
@@ -129,7 +84,8 @@ ms_context_init (MSContext *ctx)
                                        (GDestroyNotify) ms_variable_unref);
 
     ctx->print_func = default_print_func;
-    add_builtin_funcs (ctx);
+
+    _ms_context_add_builtin (ctx);
 }
 
 
@@ -400,12 +356,13 @@ ms_context_clear_error (MSContext *ctx)
 const char *
 ms_context_get_error_msg (MSContext *ctx)
 {
-    static const char *msgs[MS_ERROR_LMST] = {
-        NULL, "Type error", "Value error", "Name error"
+    static const char *msgs[MS_ERROR_LAST] = {
+        NULL, "Type error", "Value error", "Name error",
+        "Runtime error"
     };
 
     g_return_val_if_fail (MS_IS_CONTEXT (ctx), NULL);
-    g_return_val_if_fail (ctx->error < MS_ERROR_LMST, NULL);
+    g_return_val_if_fail (ctx->error < MS_ERROR_LAST, NULL);
 
     if (ctx->error_msg)
         return ctx->error_msg;
diff --git a/moo/mooutils/mooscript/mooscript-context.h b/moo/mooutils/mooscript/mooscript-context.h
index e86a1db4..9d8f4d8e 100644
--- a/moo/mooutils/mooscript/mooscript-context.h
+++ b/moo/mooutils/mooscript/mooscript-context.h
@@ -41,7 +41,8 @@ typedef enum {
     MS_ERROR_TYPE,
     MS_ERROR_VALUE,
     MS_ERROR_NAME,
-    MS_ERROR_LMST
+    MS_ERROR_RUNTIME,
+    MS_ERROR_LAST
 } MSError;
 
 typedef void (*MSPrintFunc) (const char *string,
@@ -71,6 +72,7 @@ MSVariable  *ms_variable_ref                (MSVariable *var);
 void         ms_variable_unref              (MSVariable *var);
 
 MSContext   *ms_context_new                 (void);
+void         _ms_context_add_builtin        (MSContext  *ctx);
 
 MSValue     *ms_context_eval_variable       (MSContext  *ctx,
                                              const char *name);
diff --git a/moo/mooutils/mooscript/mooscript-node.c b/moo/mooutils/mooscript/mooscript-node.c
index c5b0691e..c7c8413e 100644
--- a/moo/mooutils/mooscript/mooscript-node.c
+++ b/moo/mooutils/mooscript/mooscript-node.c
@@ -15,6 +15,7 @@
 #include "mooscript-node.h"
 #include "mooscript-func.h"
 #include "mooscript-context.h"
+#include "mooutils/moopython.h"
 #include <string.h>
 
 #define UNREF(obj_)             \
@@ -1008,3 +1009,73 @@ ms_node_val_range_new (MSNode *first,
 
     return node;
 }
+
+
+/****************************************************************************/
+/* MSNodePython
+ */
+
+G_DEFINE_TYPE(MSNodePython, ms_node_python, MS_TYPE_NODE)
+
+
+static void
+ms_node_python_finalize (GObject *object)
+{
+    g_free (MS_NODE_PYTHON(object)->script);
+    G_OBJECT_CLASS(ms_node_python_parent_class)->finalize (object);
+}
+
+
+static MSValue *
+ms_node_python_eval (MSNode    *node_,
+                     MSContext *ctx)
+{
+    MSNodePython *node = MS_NODE_PYTHON (node_);
+    MooPyObject *ret;
+
+    if (!moo_python_running())
+        return ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                        "Python support not available");
+
+    ret = moo_python_run_string (node->script);
+
+    if (ret)
+    {
+        moo_Py_DECREF (ret);
+        return ms_value_none ();
+    }
+    else
+    {
+        moo_PyErr_Print ();
+        return ms_context_format_error (ctx, MS_ERROR_RUNTIME,
+                                        "python script raised exception");
+    }
+}
+
+
+static void
+ms_node_python_class_init (MSNodePythonClass *klass)
+{
+    G_OBJECT_CLASS(klass)->finalize = ms_node_python_finalize;
+    MS_NODE_CLASS(klass)->eval = ms_node_python_eval;
+}
+
+
+static void
+ms_node_python_init (G_GNUC_UNUSED MSNodePython *node)
+{
+}
+
+
+MSNodePython *
+ms_node_python_new (const char *script)
+{
+    MSNodePython *node;
+
+    g_return_val_if_fail (script != NULL, NULL);
+
+    node = g_object_new (MS_TYPE_NODE_PYTHON, NULL);
+    node->script = g_strdup (script);
+
+    return node;
+}
diff --git a/moo/mooutils/mooscript/mooscript-node.h b/moo/mooutils/mooscript/mooscript-node.h
index d797ce50..6f7fa556 100644
--- a/moo/mooutils/mooscript/mooscript-node.h
+++ b/moo/mooutils/mooscript/mooscript-node.h
@@ -90,6 +90,13 @@ G_BEGIN_DECLS
 #define MS_IS_NODE_VAL_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MS_TYPE_NODE_VAL_LIST))
 #define MS_NODE_VAL_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MS_TYPE_NODE_VAL_LIST, MSNodeValListClass))
 
+#define MS_TYPE_NODE_PYTHON              (ms_node_python_get_type ())
+#define MS_NODE_PYTHON(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MS_TYPE_NODE_PYTHON, MSNodePython))
+#define MS_NODE_PYTHON_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MS_TYPE_NODE_PYTHON, MSNodePythonClass))
+#define MS_IS_NODE_PYTHON(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MS_TYPE_NODE_PYTHON))
+#define MS_IS_NODE_PYTHON_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MS_TYPE_NODE_PYTHON))
+#define MS_NODE_PYTHON_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MS_TYPE_NODE_PYTHON, MSNodePythonClass))
+
 typedef struct _MSNode MSNode;
 typedef struct _MSNodeClass MSNodeClass;
 typedef struct _MSNodeList MSNodeList;
@@ -110,6 +117,8 @@ typedef struct _MSNodeValue MSNodeValue;
 typedef struct _MSNodeValueClass MSNodeValueClass;
 typedef struct _MSNodeValList MSNodeValList;
 typedef struct _MSNodeValListClass MSNodeValListClass;
+typedef struct _MSNodePython MSNodePython;
+typedef struct _MSNodePythonClass MSNodePythonClass;
 
 
 typedef MSValue* (*MSNodeEval) (MSNode *node, MSContext *ctx);
@@ -220,6 +229,16 @@ struct _MSNodeValueClass {
 };
 
 
+struct _MSNodePython {
+    MSNode node;
+    char *script;
+};
+
+struct _MSNodePythonClass {
+    MSNodeClass node_class;
+};
+
+
 typedef enum {
     MS_VAL_LIST,
     MS_VAL_RANGE
@@ -248,6 +267,7 @@ GType           ms_node_for_get_type        (void) G_GNUC_CONST;
 GType           ms_node_assign_get_type     (void) G_GNUC_CONST;
 GType           ms_node_val_list_get_type   (void) G_GNUC_CONST;
 GType           ms_node_value_get_type      (void) G_GNUC_CONST;
+GType           ms_node_python_get_type     (void) G_GNUC_CONST;
 
 MSValue        *ms_node_eval                (MSNode     *node,
                                              MSContext  *ctx);
@@ -285,6 +305,8 @@ MSNodeValList  *ms_node_val_range_new       (MSNode     *first,
 
 MSNodeVar      *ms_node_var_new             (const char *name);
 
+MSNodePython   *ms_node_python_new          (const char *script);
+
 
 G_END_DECLS
 
diff --git a/moo/mooutils/mooscript/mooscript-parser.c b/moo/mooutils/mooscript/mooscript-parser.c
index bc18c5d9..861acc87 100644
--- a/moo/mooutils/mooscript/mooscript-parser.c
+++ b/moo/mooutils/mooscript/mooscript-parser.c
@@ -54,7 +54,8 @@ struct _MSParser {
 
 
 #define IS_QUOTE(c__)   (c__ == '"' || c__ == '\'')
-#define IS_SPACE(c__)   (c__ == ' ' || c__ == '\t' || c__ == '\r' || c__ == '\n')
+#define IS_EOL(c__)     (c__ == '\r' || c__ == '\n')
+#define IS_SPACE(c__)   (c__ == ' ' || c__ == '\t' || IS_EOL (c__))
 #define IS_DIGIT(c__)   ('0' <= c__ && c__ <= '9')
 #define IS_LETTER(c__)  (('a' <= c__ && c__ <= 'z') || ('A' <= c__ && c__ <= 'Z'))
 #define IS_WORD(c__)    (IS_LETTER (c__) || IS_DIGIT (c__) || c__ == '_')
@@ -71,10 +72,15 @@ ms_lex_error (MSParser *parser)
 static char *
 ms_lex_add_string (MSLex      *lex,
                    const char *string,
-                   guint       len)
+                   int         len)
 {
     gpointer orig, dummy;
-    char *copy = g_strndup (string, len);
+    char *copy;
+
+    if (len < 0)
+        len = strlen (string);
+
+    copy = g_strndup (string, len);
 
     if (g_hash_table_lookup_extended (lex->hash, copy, &orig, &dummy))
     {
@@ -241,8 +247,45 @@ ms_lex_parse_word (MSLex    *lex,
 }
 
 
+static int
+ms_lex_parse_python (MSLex *lex)
+{
+    guint ptr = lex->ptr;
+    const char *input = (const char *) lex->input;
+
+    g_assert (input[ptr] == input[ptr+1] &&
+              input[ptr+1] == input[ptr+2] &&
+              input[ptr] == '=');
+
+    while (TRUE)
+    {
+        while (ptr < lex->len && !IS_EOL(input[ptr]))
+            ptr++;
+
+        if (ptr == lex->len)
+        {
+            _ms_script_yylval.str = ms_lex_add_string (lex, input + lex->ptr + 3, -1);
+            lex->ptr = lex->len;
+            return PYTHON;
+        }
+
+        while (IS_EOL (input[ptr]))
+            ptr++;
+
+        if (input[ptr] == '=' && input[ptr+1] == '=' && input[ptr+2] == '=')
+        {
+            _ms_script_yylval.str = ms_lex_add_string (lex, input + lex->ptr + 3,
+                                                       ptr - lex->ptr - 3);
+            lex->ptr = ptr + 3;
+            return PYTHON;
+        }
+    }
+}
+
+
 #define THIS            (lex->input[lex->ptr])
 #define NEXT            (lex->input[lex->ptr+1])
+#define NEXT2           (lex->input[lex->ptr+2])
 
 #define RETURN1(what)               \
 G_STMT_START {                      \
@@ -289,6 +332,21 @@ _ms_script_yylex (MSParser *parser)
         return ms_lex_error (parser);
     }
 
+    if (c == '=' && NEXT == '=' && NEXT2 == '=')
+        return ms_lex_parse_python (lex);
+
+    if (c == '#')
+    {
+        while (lex->ptr < lex->len && !IS_EOL(lex->input[lex->ptr]))
+            lex->ptr++;
+
+        if (lex->ptr == lex->len)
+            return 0;
+
+        lex->ptr++;
+        return _ms_script_yylex (parser);
+    }
+
     if (IS_QUOTE (c))
         return ms_lex_parse_string (lex, parser);
 
@@ -636,6 +694,19 @@ _ms_parser_node_string (MSParser   *parser,
 }
 
 
+MSNode *
+_ms_parser_node_python (MSParser   *parser,
+                        const char *string)
+{
+    MSNodePython *node;
+
+    node = ms_node_python_new (string);
+    parser_add_node (parser, node);
+
+    return MS_NODE (node);
+}
+
+
 MSNode *
 _ms_parser_node_var (MSParser   *parser,
                      const char *name)
diff --git a/moo/mooutils/mooscript/mooscript-parser.h b/moo/mooutils/mooscript/mooscript-parser.h
index a29fb9e0..03c801d6 100644
--- a/moo/mooutils/mooscript/mooscript-parser.h
+++ b/moo/mooutils/mooscript/mooscript-parser.h
@@ -72,6 +72,8 @@ MSNode     *_ms_parser_node_int         (MSParser   *parser,
                                          int         n);
 MSNode     *_ms_parser_node_string      (MSParser   *parser,
                                          const char *string);
+MSNode     *_ms_parser_node_python      (MSParser   *parser,
+                                         const char *string);
 MSNode     *_ms_parser_node_value_list  (MSParser   *parser,
                                          MSNodeList *list);
 MSNode     *_ms_parser_node_value_range (MSParser   *parser,
diff --git a/moo/mooutils/mooscript/mooscript-value.c b/moo/mooutils/mooscript/mooscript-value.c
index aafca6c2..0101d72b 100644
--- a/moo/mooutils/mooscript/mooscript-value.c
+++ b/moo/mooutils/mooscript/mooscript-value.c
@@ -218,12 +218,12 @@ ms_value_unref (MSValue *val)
 const char *
 ms_binary_op_name (MSBinaryOp op)
 {
-    static const char *names[MS_BINARY_OP_LMST] = {
+    static const char *names[MS_BINARY_OP_LAST] = {
         "@PLUS", "@MINUS", "@MULT", "@DIV", "@AND", "@OR",
         "@EQ", "@NEQ", "@LT", "@GT", "@LE", "@GE", "@FORMAT"
     };
 
-    g_return_val_if_fail (op < MS_BINARY_OP_LMST, NULL);
+    g_return_val_if_fail (op < MS_BINARY_OP_LAST, NULL);
     return names[op];
 }
 
@@ -231,11 +231,11 @@ ms_binary_op_name (MSBinaryOp op)
 const char *
 ms_unary_op_name (MSUnaryOp op)
 {
-    static const char *names[MS_UNARY_OP_LMST] = {
+    static const char *names[MS_UNARY_OP_LAST] = {
         "@UMINUS", "@NOT", "@LEN"
     };
 
-    g_return_val_if_fail (op < MS_UNARY_OP_LMST, NULL);
+    g_return_val_if_fail (op < MS_UNARY_OP_LAST, NULL);
     return names[op];
 }
 
@@ -808,14 +808,14 @@ func_format (MSValue *format, MSValue *tuple, MSContext *ctx)
 gpointer
 ms_binary_op_cfunc (MSBinaryOp op)
 {
-    static gpointer funcs[MS_BINARY_OP_LMST] = {
+    static gpointer funcs[MS_BINARY_OP_LAST] = {
         func_plus, func_minus, func_mult, func_div,
         func_and, func_or,
         func_eq, func_neq, func_lt, func_gt, func_le, func_ge,
         func_format
     };
 
-    g_return_val_if_fail (op < MS_BINARY_OP_LMST, NULL);
+    g_return_val_if_fail (op < MS_BINARY_OP_LAST, NULL);
     return funcs[op];
 }
 
@@ -857,10 +857,10 @@ func_len (MSValue    *val,
 gpointer
 ms_unary_op_cfunc (MSUnaryOp op)
 {
-    static gpointer funcs[MS_UNARY_OP_LMST] = {
+    static gpointer funcs[MS_UNARY_OP_LAST] = {
         func_uminus, func_not, func_len
     };
 
-    g_return_val_if_fail (op < MS_UNARY_OP_LMST, NULL);
+    g_return_val_if_fail (op < MS_UNARY_OP_LAST, NULL);
     return funcs[op];
 }
diff --git a/moo/mooutils/mooscript/mooscript-value.h b/moo/mooutils/mooscript/mooscript-value.h
index 5fb57246..f62393dd 100644
--- a/moo/mooutils/mooscript/mooscript-value.h
+++ b/moo/mooutils/mooscript/mooscript-value.h
@@ -45,14 +45,14 @@ typedef enum {
     MS_OP_LE,
     MS_OP_GE,
     MS_OP_FORMAT,
-    MS_BINARY_OP_LMST
+    MS_BINARY_OP_LAST
 } MSBinaryOp;
 
 typedef enum {
     MS_OP_UMINUS,
     MS_OP_NOT,
     MS_OP_LEN,
-    MS_UNARY_OP_LMST
+    MS_UNARY_OP_LAST
 } MSUnaryOp;
 
 struct _MSValue {
diff --git a/moo/mooutils/mooscript/mooscript-yacc.c b/moo/mooutils/mooscript/mooscript-yacc.c
index b6cc4948..1eefa11e 100644
--- a/moo/mooutils/mooscript/mooscript-yacc.c
+++ b/moo/mooutils/mooscript/mooscript-yacc.c
@@ -67,56 +67,58 @@
      IDENTIFIER = 258,
      LITERAL = 259,
      VARIABLE = 260,
-     NUMBER = 261,
-     IF = 262,
-     THEN = 263,
-     ELSE = 264,
-     FI = 265,
-     WHILE = 266,
-     DO = 267,
-     OD = 268,
-     FOR = 269,
-     IN = 270,
-     EQ = 271,
-     NEQ = 272,
-     LE = 273,
-     GE = 274,
-     AND = 275,
-     OR = 276,
-     NOT = 277,
-     UMINUS = 278,
-     TWODOTS = 279
+     PYTHON = 261,
+     NUMBER = 262,
+     IF = 263,
+     THEN = 264,
+     ELSE = 265,
+     FI = 266,
+     WHILE = 267,
+     DO = 268,
+     OD = 269,
+     FOR = 270,
+     IN = 271,
+     EQ = 272,
+     NEQ = 273,
+     LE = 274,
+     GE = 275,
+     AND = 276,
+     OR = 277,
+     NOT = 278,
+     UMINUS = 279,
+     TWODOTS = 280
    };
 #endif
 /* Tokens.  */
 #define IDENTIFIER 258
 #define LITERAL 259
 #define VARIABLE 260
-#define NUMBER 261
-#define IF 262
-#define THEN 263
-#define ELSE 264
-#define FI 265
-#define WHILE 266
-#define DO 267
-#define OD 268
-#define FOR 269
-#define IN 270
-#define EQ 271
-#define NEQ 272
-#define LE 273
-#define GE 274
-#define AND 275
-#define OR 276
-#define NOT 277
-#define UMINUS 278
-#define TWODOTS 279
+#define PYTHON 261
+#define NUMBER 262
+#define IF 263
+#define THEN 264
+#define ELSE 265
+#define FI 266
+#define WHILE 267
+#define DO 268
+#define OD 269
+#define FOR 270
+#define IN 271
+#define EQ 272
+#define NEQ 273
+#define LE 274
+#define GE 275
+#define AND 276
+#define OR 277
+#define NOT 278
+#define UMINUS 279
+#define TWODOTS 280
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 1 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
 
 #include "mooscript-parser.h"
 #include "mooscript-yacc.h"
@@ -132,6 +134,7 @@
 #define UNARY_OP(op, val)                   _ms_parser_node_unary_op (parser, op, val)
 #define NODE_NUMBER(n)                      _ms_parser_node_int (parser, n)
 #define NODE_STRING(n)                      _ms_parser_node_string (parser, n)
+#define NODE_PYTHON(string)                 _ms_parser_node_python (parser, string)
 #define NODE_VALUE_LIST(list)               _ms_parser_node_value_list (parser, MS_NODE_LIST (list))
 #define NODE_VALUE_RANGE(first,second)      _ms_parser_node_value_range (parser, first, second)
 #define NODE_VAR(string)                    _ms_parser_node_var (parser, string)
@@ -158,14 +161,14 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 25 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 26 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
 typedef union YYSTYPE {
     int ival;
     const char *str;
     MSNode *node;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 169 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.c"
+#line 172 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -177,7 +180,7 @@ typedef union YYSTYPE {
 
 
 /* Line 219 of yacc.c.  */
-#line 181 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.c"
+#line 184 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -326,22 +329,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  38
+#define YYFINAL  40
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   410
+#define YYLAST   450
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  42
+#define YYNTOKENS  43
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  14
+#define YYNNTS  15
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  47
+#define YYNRULES  49
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  99
+#define YYNSTATES  100
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   279
+#define YYMAXUTOK   280
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -352,13 +355,13 @@ static const unsigned char yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,    32,     2,    29,     2,     2,
-      37,    38,    27,    26,    41,    25,     2,    28,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    36,    34,
-      30,    33,    31,    35,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,    33,     2,    30,     2,     2,
+      38,    39,    28,    27,    42,    26,     2,    29,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    37,    35,
+      31,    34,    32,    36,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    39,     2,    40,     2,     2,     2,     2,     2,     2,
+       2,    40,     2,    41,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -376,7 +379,8 @@ static const unsigned char yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25
 };
 
 #if YYDEBUG
@@ -384,43 +388,43 @@ static const unsigned char yytranslate[] =
    YYRHS.  */
 static const unsigned char yyprhs[] =
 {
-       0,     0,     3,     5,     8,    12,    13,    15,    17,    19,
-      25,    30,    38,    44,    52,    54,    56,    58,    60,    62,
-      66,    72,    76,    80,    84,    88,    92,    96,   100,   104,
-     108,   112,   116,   120,   122,   124,   126,   130,   134,   140,
-     144,   147,   150,   153,   154,   156,   160,   162
+       0,     0,     3,     5,     7,    10,    13,    15,    16,    18,
+      20,    22,    28,    33,    41,    47,    55,    57,    59,    61,
+      63,    65,    69,    75,    79,    83,    87,    91,    95,    99,
+     103,   107,   111,   115,   119,   123,   125,   127,   129,   133,
+     137,   143,   147,   150,   153,   156,   157,   159,   163,   165
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const yysigned_char yyrhs[] =
 {
-      43,     0,    -1,    44,    -1,    45,    34,    -1,    44,    45,
-      34,    -1,    -1,    48,    -1,    47,    -1,    46,    -1,    11,
-      48,    12,    44,    13,    -1,    12,    44,    11,    48,    -1,
-      14,    54,    15,    48,    12,    44,    13,    -1,     7,    48,
-       8,    44,    10,    -1,     7,    48,     8,    44,     9,    44,
-      10,    -1,    52,    -1,    51,    -1,    49,    -1,    55,    -1,
-      50,    -1,     3,    33,    48,    -1,    52,    35,    52,    36,
-      52,    -1,    48,    26,    48,    -1,    48,    25,    48,    -1,
-      48,    28,    48,    -1,    48,    27,    48,    -1,    48,    20,
-      48,    -1,    48,    21,    48,    -1,    48,    16,    48,    -1,
-      48,    17,    48,    -1,    48,    30,    48,    -1,    48,    31,
-      48,    -1,    48,    18,    48,    -1,    48,    19,    48,    -1,
-       6,    -1,     4,    -1,    54,    -1,    37,    45,    38,    -1,
-      39,    53,    40,    -1,    39,    48,    24,    48,    40,    -1,
-      52,    29,    52,    -1,    32,    52,    -1,    22,    52,    -1,
-      25,    52,    -1,    -1,    48,    -1,    53,    41,    48,    -1,
-       3,    -1,     3,    37,    53,    38,    -1
+      44,     0,    -1,    45,    -1,    46,    -1,    45,    46,    -1,
+      47,    35,    -1,     6,    -1,    -1,    50,    -1,    49,    -1,
+      48,    -1,    12,    50,    13,    45,    14,    -1,    13,    45,
+      12,    50,    -1,    15,    56,    16,    50,    13,    45,    14,
+      -1,     8,    50,     9,    45,    11,    -1,     8,    50,     9,
+      45,    10,    45,    11,    -1,    54,    -1,    53,    -1,    51,
+      -1,    57,    -1,    52,    -1,     3,    34,    50,    -1,    54,
+      36,    54,    37,    54,    -1,    50,    27,    50,    -1,    50,
+      26,    50,    -1,    50,    29,    50,    -1,    50,    28,    50,
+      -1,    50,    21,    50,    -1,    50,    22,    50,    -1,    50,
+      17,    50,    -1,    50,    18,    50,    -1,    50,    31,    50,
+      -1,    50,    32,    50,    -1,    50,    19,    50,    -1,    50,
+      20,    50,    -1,     7,    -1,     4,    -1,    56,    -1,    38,
+      47,    39,    -1,    40,    55,    41,    -1,    40,    50,    25,
+      50,    41,    -1,    54,    30,    54,    -1,    33,    54,    -1,
+      23,    54,    -1,    26,    54,    -1,    -1,    50,    -1,    55,
+      42,    50,    -1,     3,    -1,     3,    38,    55,    39,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned char yyrline[] =
 {
-       0,    64,    64,    67,    68,    71,    72,    73,    74,    77,
-      78,    79,    83,    84,    87,    88,    89,    90,    91,    95,
-      98,   102,   103,   104,   105,   107,   108,   110,   111,   112,
-     113,   114,   115,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   131,   132,   133,   136,   139
+       0,    66,    66,    69,    70,    74,    75,    78,    79,    80,
+      81,    84,    85,    86,    90,    91,    94,    95,    96,    97,
+      98,   102,   105,   109,   110,   111,   112,   114,   115,   117,
+     118,   119,   120,   121,   122,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   138,   139,   140,   143,   146
 };
 #endif
 
@@ -430,12 +434,13 @@ static const unsigned char yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "IDENTIFIER", "LITERAL", "VARIABLE",
-  "NUMBER", "IF", "THEN", "ELSE", "FI", "WHILE", "DO", "OD", "FOR", "IN",
-  "EQ", "NEQ", "LE", "GE", "AND", "OR", "NOT", "UMINUS", "TWODOTS", "'-'",
-  "'+'", "'*'", "'/'", "'%'", "'<'", "'>'", "'#'", "'='", "';'", "'?'",
-  "':'", "'('", "')'", "'['", "']'", "','", "$accept", "script", "program",
-  "stmt", "loop", "if_stmt", "expr", "assignment", "ternary",
-  "compound_expr", "simple_expr", "list_elms", "variable", "function", 0
+  "PYTHON", "NUMBER", "IF", "THEN", "ELSE", "FI", "WHILE", "DO", "OD",
+  "FOR", "IN", "EQ", "NEQ", "LE", "GE", "AND", "OR", "NOT", "UMINUS",
+  "TWODOTS", "'-'", "'+'", "'*'", "'/'", "'%'", "'<'", "'>'", "'#'", "'='",
+  "';'", "'?'", "':'", "'('", "')'", "'['", "']'", "','", "$accept",
+  "script", "program", "stmt_or_python", "stmt", "loop", "if_stmt", "expr",
+  "assignment", "ternary", "compound_expr", "simple_expr", "list_elms",
+  "variable", "function", 0
 };
 #endif
 
@@ -446,30 +451,30 @@ static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,    45,    43,    42,    47,    37,
-      60,    62,    35,    61,    59,    63,    58,    40,    41,    91,
-      93,    44
+     275,   276,   277,   278,   279,   280,    45,    43,    42,    47,
+      37,    60,    62,    35,    61,    59,    63,    58,    40,    41,
+      91,    93,    44
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,    42,    43,    44,    44,    45,    45,    45,    45,    46,
-      46,    46,    47,    47,    48,    48,    48,    48,    48,    49,
-      50,    51,    51,    51,    51,    51,    51,    51,    51,    51,
-      51,    51,    51,    52,    52,    52,    52,    52,    52,    52,
-      52,    52,    52,    53,    53,    53,    54,    55
+       0,    43,    44,    45,    45,    46,    46,    47,    47,    47,
+      47,    48,    48,    48,    49,    49,    50,    50,    50,    50,
+      50,    51,    52,    53,    53,    53,    53,    53,    53,    53,
+      53,    53,    53,    53,    53,    54,    54,    54,    54,    54,
+      54,    54,    54,    54,    54,    55,    55,    55,    56,    57
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
-       0,     2,     1,     2,     3,     0,     1,     1,     1,     5,
-       4,     7,     5,     7,     1,     1,     1,     1,     1,     3,
-       5,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     1,     1,     1,     3,     3,     5,     3,
-       2,     2,     2,     0,     1,     3,     1,     4
+       0,     2,     1,     1,     2,     2,     1,     0,     1,     1,
+       1,     5,     4,     7,     5,     7,     1,     1,     1,     1,
+       1,     3,     5,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     1,     1,     1,     3,     3,
+       5,     3,     2,     2,     2,     0,     1,     3,     1,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -477,160 +482,168 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-       5,    46,    34,    33,     0,     0,     5,     0,     0,     0,
-       0,     5,    43,     0,     2,     0,     8,     7,     6,    16,
-      18,    15,    14,    35,    17,     0,    43,     0,     0,     5,
-      46,     0,    41,    42,    40,     0,    44,     0,     1,     0,
-       3,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    19,    44,     0,     5,     5,
-       0,     0,    36,     0,    37,     0,     4,    27,    28,    31,
-      32,    25,    26,    22,    21,    24,    23,    29,    30,    39,
-       0,    47,     5,     5,    10,     0,     0,    45,     0,     5,
-      12,     9,     5,    38,    20,     5,     5,    13,    11
+       7,    48,    36,     6,    35,     0,     0,     7,     0,     0,
+       0,     0,     7,    45,     0,     2,     3,     0,    10,     9,
+       8,    18,    20,    17,    16,    37,    19,     0,    45,     0,
+       0,     7,    48,     0,    43,    44,    42,     0,    46,     0,
+       1,     4,     5,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    21,    46,     0,
+       7,     7,     0,     0,    38,     0,    39,     0,    29,    30,
+      33,    34,    27,    28,    24,    23,    26,    25,    31,    32,
+      41,     0,    49,     7,     7,    12,     0,     0,    47,     0,
+       7,    14,    11,     7,    40,    22,     7,     7,    15,    13
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const yysigned_char yydefgoto[] =
 {
-      -1,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    37,    23,    24
+      -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    39,    25,    26
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -37
+#define YYPACT_NINF -30
 static const short int yypact[] =
 {
-     233,   -18,   -37,   -37,    10,    10,   233,     4,   107,   107,
-     107,   233,    10,    17,   111,   -30,   -37,   -37,   363,   -37,
-     -37,   -37,   -17,   -37,   -37,    10,    10,   297,   314,   257,
-     -37,     5,   -37,   -37,   -37,   -16,   347,    -7,   -37,     7,
-     -37,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,   107,   107,   -37,   363,   -36,   233,   233,
-      10,    10,   -37,    10,   -37,    10,   -37,    30,    30,    30,
-      30,   -37,    18,     9,     9,   379,   379,    30,    30,   -37,
-     -28,   -37,    87,   148,   314,   331,   281,   363,   107,   233,
-     -37,   -37,   233,   -37,    14,   172,   209,   -37,   -37
+     232,   -22,   -30,   -30,   -30,     1,     1,   232,    -1,   102,
+     102,   102,   280,     1,    18,   108,   -30,   -20,   -30,   -30,
+     386,   -30,   -30,   -30,   -29,   -30,   -30,     1,     1,   320,
+     337,   256,   -30,    13,   -30,   -30,   -30,    -9,   370,   -19,
+     -30,   -30,   -30,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,   102,   102,   -30,   386,   -25,
+     232,   232,     1,     1,   -30,     1,   -30,     1,     4,     4,
+       4,     4,   -30,    10,   402,   402,   418,   418,     4,     4,
+     -30,   -24,   -30,    84,   146,   337,   354,   304,   386,   102,
+     232,   -30,   -30,   232,   -30,     2,   170,   208,   -30,   -30
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yysigned_char yypgoto[] =
 {
-     -37,   -37,    -6,    -8,   -37,   -37,    19,   -37,   -37,   -37,
-       1,    20,    41,   -37
+     -30,   -30,    -7,   -12,    21,   -30,   -30,    15,   -30,   -30,
+     -30,     0,     7,    28,   -30
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -6
+#define YYTABLE_NINF -8
 static const yysigned_char yytable[] =
 {
-      29,    53,    81,    35,    40,    65,    39,    30,    88,    32,
-      33,    34,    53,     1,     2,    25,     3,    38,    54,    26,
-      61,    39,    62,    27,    28,    41,    42,    43,    44,    45,
-      46,    36,     8,    64,    65,     9,    49,    50,    45,    51,
-      52,    66,    10,    53,    55,    56,    57,    11,    31,    12,
-      45,    46,    82,    83,    79,    80,     0,     0,     0,     0,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,     0,     0,    39,    39,     0,     0,     0,    84,
-      85,     0,    86,    95,    87,     0,    96,    39,    39,    94,
-       1,     2,     0,     3,     4,     0,    89,    90,     5,     6,
-       0,     7,     0,     0,     0,     0,     0,     0,     0,     8,
-      30,     2,     9,     3,     1,     2,     0,     3,     4,    10,
-       0,     0,     5,     6,    11,     7,    12,     0,     0,     8,
-       0,     0,     9,     8,     0,     0,     9,     0,     0,    10,
-       0,     0,     0,    10,    11,    -5,    12,     0,    11,     0,
-      12,     1,     2,     0,     3,     4,     0,     0,     0,     5,
-       6,    91,     7,     0,     0,     0,     0,     0,     0,     0,
-       8,     0,     0,     9,     0,     1,     2,     0,     3,     4,
-      10,     0,    97,     5,     6,    11,     7,    12,     0,     0,
-       0,     0,     0,     0,     8,     0,     0,     9,     0,     0,
-       0,     0,     0,     0,    10,     0,     0,     0,     0,    11,
-       0,    12,     1,     2,     0,     3,     4,     0,     0,     0,
-       5,     6,    98,     7,     0,     0,     0,     0,     0,     0,
-       0,     8,     0,     0,     9,     0,     1,     2,     0,     3,
-       4,    10,     0,     0,     5,     6,    11,     7,    12,     0,
-       0,     0,     0,     0,     0,     8,     0,     0,     9,     0,
-       1,     2,     0,     3,     4,    10,     0,     0,    60,     6,
-      11,     7,    12,     0,     0,     0,     0,     0,     0,     8,
-       0,     0,     9,     0,     0,     0,     0,     0,     0,    10,
-       0,     0,     0,     0,    11,     0,    12,    41,    42,    43,
-      44,    45,    46,     0,     0,    58,    47,    48,    49,    50,
-       0,    51,    52,    41,    42,    43,    44,    45,    46,     0,
-       0,    93,    47,    48,    49,    50,    59,    51,    52,     0,
-      41,    42,    43,    44,    45,    46,     0,     0,     0,    47,
-      48,    49,    50,    92,    51,    52,     0,    41,    42,    43,
-      44,    45,    46,     0,     0,     0,    47,    48,    49,    50,
-       0,    51,    52,    41,    42,    43,    44,    45,    46,     0,
-       0,    63,    47,    48,    49,    50,     0,    51,    52,    41,
-      42,    43,    44,    45,    46,     0,     0,     0,    47,    48,
-      49,    50,     0,    51,    52,    41,    42,    43,    44,    45,
-      46,     0,     0,     0,     0,     0,     0,     0,     0,    51,
-      52
+      31,    55,    32,    41,     1,     2,    55,    56,     4,    34,
+      35,    36,    27,    89,    82,    42,    28,    67,    40,    41,
+      29,    30,    66,    67,     9,    47,    48,    10,    38,    63,
+      64,    47,    55,    37,    11,    59,    33,     0,     0,    12,
+       0,    13,    57,    58,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    83,    84,    80,    81,     0,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+       0,    41,    41,     0,     0,     0,     0,    85,    86,     0,
+      87,     0,    88,    96,    41,    41,    97,     1,     2,    95,
+       3,     4,     5,     0,    90,    91,     6,     7,     0,     8,
+       0,     0,     0,     0,     0,    32,     2,     9,     0,     4,
+      10,     1,     2,     0,     3,     4,     5,    11,     0,     0,
+       6,     7,    12,     8,    13,     9,     0,     0,    10,     0,
+       0,     9,     0,     0,    10,    11,     0,     0,     0,     0,
+      12,    11,    13,    -7,     0,     0,    12,     0,    13,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,     6,     7,
+      92,     8,     0,     0,     0,     0,     0,     0,     0,     9,
+       0,     0,    10,     1,     2,     0,     3,     4,     5,    11,
+       0,    98,     6,     7,    12,     8,    13,     0,     0,     0,
+       0,     0,     0,     9,     0,     0,    10,     0,     0,     0,
+       0,     0,     0,    11,     0,     0,     0,     0,    12,     0,
+      13,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       6,     7,    99,     8,     0,     0,     0,     0,     0,     0,
+       0,     9,     0,     0,    10,     1,     2,     0,     3,     4,
+       5,    11,     0,     0,     6,     7,    12,     8,    13,     0,
+       0,     0,     0,     0,     0,     9,     0,     0,    10,     1,
+       2,     0,     3,     4,     5,    11,     0,     0,    62,     7,
+      12,     8,    13,     0,     0,     0,     0,     0,     0,     9,
+       0,     0,    10,     1,     2,     0,     0,     4,     5,    11,
+       0,     0,     6,     7,    12,     8,    13,     0,     0,     0,
+       0,     0,     0,     9,     0,     0,    10,     0,     0,     0,
+       0,     0,     0,    11,     0,     0,     0,     0,    12,     0,
+      13,    43,    44,    45,    46,    47,    48,     0,     0,    60,
+      49,    50,    51,    52,     0,    53,    54,    43,    44,    45,
+      46,    47,    48,     0,     0,    94,    49,    50,    51,    52,
+      61,    53,    54,     0,    43,    44,    45,    46,    47,    48,
+       0,     0,     0,    49,    50,    51,    52,    93,    53,    54,
+       0,    43,    44,    45,    46,    47,    48,     0,     0,     0,
+      49,    50,    51,    52,     0,    53,    54,    43,    44,    45,
+      46,    47,    48,     0,     0,    65,    49,    50,    51,    52,
+       0,    53,    54,    43,    44,    45,    46,    47,    48,     0,
+       0,     0,    49,    50,    51,    52,     0,    53,    54,    43,
+      44,    45,    46,    47,    48,     0,     0,     0,     0,     0,
+      51,    52,     0,    53,    54,    43,    44,    45,    46,    47,
+      48,     0,     0,     0,     0,     0,     0,     0,     0,    53,
+      54
 };
 
 static const yysigned_char yycheck[] =
 {
-       6,    29,    38,    11,    34,    41,    14,     3,    36,     8,
-       9,    10,    29,     3,     4,    33,     6,     0,    35,    37,
-      15,    29,    38,     4,     5,    16,    17,    18,    19,    20,
-      21,    12,    22,    40,    41,    25,    27,    28,    20,    30,
-      31,    34,    32,    29,    25,    26,    26,    37,     7,    39,
-      20,    21,    58,    59,    53,    54,    -1,    -1,    -1,    -1,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    -1,    -1,    82,    83,    -1,    -1,    -1,    60,
-      61,    -1,    63,    89,    65,    -1,    92,    95,    96,    88,
-       3,     4,    -1,     6,     7,    -1,     9,    10,    11,    12,
-      -1,    14,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,
-       3,     4,    25,     6,     3,     4,    -1,     6,     7,    32,
-      -1,    -1,    11,    12,    37,    14,    39,    -1,    -1,    22,
-      -1,    -1,    25,    22,    -1,    -1,    25,    -1,    -1,    32,
-      -1,    -1,    -1,    32,    37,    34,    39,    -1,    37,    -1,
-      39,     3,     4,    -1,     6,     7,    -1,    -1,    -1,    11,
-      12,    13,    14,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      22,    -1,    -1,    25,    -1,     3,     4,    -1,     6,     7,
-      32,    -1,    10,    11,    12,    37,    14,    39,    -1,    -1,
-      -1,    -1,    -1,    -1,    22,    -1,    -1,    25,    -1,    -1,
-      -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    37,
-      -1,    39,     3,     4,    -1,     6,     7,    -1,    -1,    -1,
-      11,    12,    13,    14,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    22,    -1,    -1,    25,    -1,     3,     4,    -1,     6,
-       7,    32,    -1,    -1,    11,    12,    37,    14,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    22,    -1,    -1,    25,    -1,
-       3,     4,    -1,     6,     7,    32,    -1,    -1,    11,    12,
-      37,    14,    39,    -1,    -1,    -1,    -1,    -1,    -1,    22,
-      -1,    -1,    25,    -1,    -1,    -1,    -1,    -1,    -1,    32,
-      -1,    -1,    -1,    -1,    37,    -1,    39,    16,    17,    18,
-      19,    20,    21,    -1,    -1,     8,    25,    26,    27,    28,
-      -1,    30,    31,    16,    17,    18,    19,    20,    21,    -1,
-      -1,    40,    25,    26,    27,    28,    12,    30,    31,    -1,
-      16,    17,    18,    19,    20,    21,    -1,    -1,    -1,    25,
-      26,    27,    28,    12,    30,    31,    -1,    16,    17,    18,
-      19,    20,    21,    -1,    -1,    -1,    25,    26,    27,    28,
-      -1,    30,    31,    16,    17,    18,    19,    20,    21,    -1,
-      -1,    24,    25,    26,    27,    28,    -1,    30,    31,    16,
-      17,    18,    19,    20,    21,    -1,    -1,    -1,    25,    26,
-      27,    28,    -1,    30,    31,    16,    17,    18,    19,    20,
-      21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
-      31
+       7,    30,     3,    15,     3,     4,    30,    36,     7,     9,
+      10,    11,    34,    37,    39,    35,    38,    42,     0,    31,
+       5,     6,    41,    42,    23,    21,    22,    26,    13,    16,
+      39,    21,    30,    12,    33,    28,     8,    -1,    -1,    38,
+      -1,    40,    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    60,    61,    55,    56,    -1,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      -1,    83,    84,    -1,    -1,    -1,    -1,    62,    63,    -1,
+      65,    -1,    67,    90,    96,    97,    93,     3,     4,    89,
+       6,     7,     8,    -1,    10,    11,    12,    13,    -1,    15,
+      -1,    -1,    -1,    -1,    -1,     3,     4,    23,    -1,     7,
+      26,     3,     4,    -1,     6,     7,     8,    33,    -1,    -1,
+      12,    13,    38,    15,    40,    23,    -1,    -1,    26,    -1,
+      -1,    23,    -1,    -1,    26,    33,    -1,    -1,    -1,    -1,
+      38,    33,    40,    35,    -1,    -1,    38,    -1,    40,     3,
+       4,    -1,     6,     7,     8,    -1,    -1,    -1,    12,    13,
+      14,    15,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    23,
+      -1,    -1,    26,     3,     4,    -1,     6,     7,     8,    33,
+      -1,    11,    12,    13,    38,    15,    40,    -1,    -1,    -1,
+      -1,    -1,    -1,    23,    -1,    -1,    26,    -1,    -1,    -1,
+      -1,    -1,    -1,    33,    -1,    -1,    -1,    -1,    38,    -1,
+      40,     3,     4,    -1,     6,     7,     8,    -1,    -1,    -1,
+      12,    13,    14,    15,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    23,    -1,    -1,    26,     3,     4,    -1,     6,     7,
+       8,    33,    -1,    -1,    12,    13,    38,    15,    40,    -1,
+      -1,    -1,    -1,    -1,    -1,    23,    -1,    -1,    26,     3,
+       4,    -1,     6,     7,     8,    33,    -1,    -1,    12,    13,
+      38,    15,    40,    -1,    -1,    -1,    -1,    -1,    -1,    23,
+      -1,    -1,    26,     3,     4,    -1,    -1,     7,     8,    33,
+      -1,    -1,    12,    13,    38,    15,    40,    -1,    -1,    -1,
+      -1,    -1,    -1,    23,    -1,    -1,    26,    -1,    -1,    -1,
+      -1,    -1,    -1,    33,    -1,    -1,    -1,    -1,    38,    -1,
+      40,    17,    18,    19,    20,    21,    22,    -1,    -1,     9,
+      26,    27,    28,    29,    -1,    31,    32,    17,    18,    19,
+      20,    21,    22,    -1,    -1,    41,    26,    27,    28,    29,
+      13,    31,    32,    -1,    17,    18,    19,    20,    21,    22,
+      -1,    -1,    -1,    26,    27,    28,    29,    13,    31,    32,
+      -1,    17,    18,    19,    20,    21,    22,    -1,    -1,    -1,
+      26,    27,    28,    29,    -1,    31,    32,    17,    18,    19,
+      20,    21,    22,    -1,    -1,    25,    26,    27,    28,    29,
+      -1,    31,    32,    17,    18,    19,    20,    21,    22,    -1,
+      -1,    -1,    26,    27,    28,    29,    -1,    31,    32,    17,
+      18,    19,    20,    21,    22,    -1,    -1,    -1,    -1,    -1,
+      28,    29,    -1,    31,    32,    17,    18,    19,    20,    21,
+      22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,
+      32
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,     3,     4,     6,     7,    11,    12,    14,    22,    25,
-      32,    37,    39,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    54,    55,    33,    37,    48,    48,    44,
-       3,    54,    52,    52,    52,    45,    48,    53,     0,    45,
-      34,    16,    17,    18,    19,    20,    21,    25,    26,    27,
-      28,    30,    31,    29,    35,    48,    48,    53,     8,    12,
-      11,    15,    38,    24,    40,    41,    34,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    52,
-      52,    38,    44,    44,    48,    48,    48,    48,    36,     9,
-      10,    13,    12,    40,    52,    44,    44,    10,    13
+       0,     3,     4,     6,     7,     8,    12,    13,    15,    23,
+      26,    33,    38,    40,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    56,    57,    34,    38,    50,
+      50,    45,     3,    56,    54,    54,    54,    47,    50,    55,
+       0,    46,    35,    17,    18,    19,    20,    21,    22,    26,
+      27,    28,    29,    31,    32,    30,    36,    50,    50,    55,
+       9,    13,    12,    16,    39,    25,    41,    42,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+      54,    54,    39,    45,    45,    50,    50,    50,    50,    37,
+      10,    11,    14,    13,    41,    54,    45,    45,    11,    14
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1300,187 +1313,197 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 64 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 66 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
     { SET_TOP_NODE ((yyvsp[0].node)); ;}
     break;
 
   case 3:
-#line 67 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_LIST_ADD (NULL, (yyvsp[-1].node)); ;}
-    break;
-
-  case 4:
-#line 68 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_LIST_ADD ((yyvsp[-2].node), (yyvsp[-1].node)); ;}
-    break;
-
-  case 5:
-#line 71 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NULL; ;}
-    break;
-
-  case 9:
-#line 77 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_WHILE ((yyvsp[-3].node), (yyvsp[-1].node)); ;}
-    break;
-
-  case 10:
-#line 78 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_DO_WHILE ((yyvsp[0].node), (yyvsp[-2].node)); ;}
-    break;
-
-  case 11:
-#line 79 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_FOR ((yyvsp[-5].node), (yyvsp[-3].node), (yyvsp[-1].node)); ;}
-    break;
-
-  case 12:
-#line 83 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-3].node), (yyvsp[-1].node), NULL); ;}
-    break;
-
-  case 13:
-#line 84 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-5].node), (yyvsp[-3].node), (yyvsp[-1].node)); ;}
-    break;
-
-  case 19:
-#line 95 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_ASSIGNMENT ((yyvsp[-2].str), (yyvsp[0].node)); ;}
-    break;
-
-  case 20:
-#line 98 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 21:
-#line 102 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_PLUS, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 22:
-#line 103 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_MINUS, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 23:
-#line 104 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_DIV, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 24:
-#line 105 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_MULT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 25:
-#line 107 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_AND, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 26:
-#line 108 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_OR, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 27:
-#line 110 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_EQ, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 28:
-#line 111 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_NEQ, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 29:
-#line 112 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_LT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 30:
-#line 113 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_GT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 31:
-#line 114 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_LE, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 32:
-#line 115 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_GE, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 33:
-#line 119 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_NUMBER ((yyvsp[0].ival)); ;}
-    break;
-
-  case 34:
-#line 120 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_STRING ((yyvsp[0].str)); ;}
-    break;
-
-  case 36:
-#line 122 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = (yyvsp[-1].node); ;}
-    break;
-
-  case 37:
-#line 123 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_VALUE_LIST ((yyvsp[-1].node)); ;}
-    break;
-
-  case 38:
-#line 124 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_VALUE_RANGE ((yyvsp[-3].node), (yyvsp[-1].node)); ;}
-    break;
-
-  case 39:
-#line 125 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = BINARY_OP (MS_OP_FORMAT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
-    break;
-
-  case 40:
-#line 126 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = UNARY_OP (MS_OP_LEN, (yyvsp[0].node)); ;}
-    break;
-
-  case 41:
-#line 127 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = UNARY_OP (MS_OP_NOT, (yyvsp[0].node)); ;}
-    break;
-
-  case 42:
-#line 128 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = UNARY_OP (MS_OP_UMINUS, (yyvsp[0].node)); ;}
-    break;
-
-  case 43:
-#line 131 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NULL; ;}
-    break;
-
-  case 44:
-#line 132 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 69 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
     { (yyval.node) = NODE_LIST_ADD (NULL, (yyvsp[0].node)); ;}
     break;
 
+  case 4:
+#line 70 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_LIST_ADD ((yyvsp[-1].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 5:
+#line 74 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = (yyvsp[-1].node); ;}
+    break;
+
+  case 6:
+#line 75 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_PYTHON ((yyvsp[0].str)); ;}
+    break;
+
+  case 7:
+#line 78 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NULL; ;}
+    break;
+
+  case 11:
+#line 84 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_WHILE ((yyvsp[-3].node), (yyvsp[-1].node)); ;}
+    break;
+
+  case 12:
+#line 85 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_DO_WHILE ((yyvsp[0].node), (yyvsp[-2].node)); ;}
+    break;
+
+  case 13:
+#line 86 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_FOR ((yyvsp[-5].node), (yyvsp[-3].node), (yyvsp[-1].node)); ;}
+    break;
+
+  case 14:
+#line 90 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-3].node), (yyvsp[-1].node), NULL); ;}
+    break;
+
+  case 15:
+#line 91 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-5].node), (yyvsp[-3].node), (yyvsp[-1].node)); ;}
+    break;
+
+  case 21:
+#line 102 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_ASSIGNMENT ((yyvsp[-2].str), (yyvsp[0].node)); ;}
+    break;
+
+  case 22:
+#line 105 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_IF_ELSE ((yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 23:
+#line 109 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_PLUS, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 24:
+#line 110 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_MINUS, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 25:
+#line 111 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_DIV, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 26:
+#line 112 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_MULT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 27:
+#line 114 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_AND, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 28:
+#line 115 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_OR, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 29:
+#line 117 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_EQ, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 30:
+#line 118 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_NEQ, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 31:
+#line 119 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_LT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 32:
+#line 120 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_GT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 33:
+#line 121 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_LE, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 34:
+#line 122 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_GE, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 35:
+#line 126 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_NUMBER ((yyvsp[0].ival)); ;}
+    break;
+
+  case 36:
+#line 127 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_STRING ((yyvsp[0].str)); ;}
+    break;
+
+  case 38:
+#line 129 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = (yyvsp[-1].node); ;}
+    break;
+
+  case 39:
+#line 130 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_VALUE_LIST ((yyvsp[-1].node)); ;}
+    break;
+
+  case 40:
+#line 131 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_VALUE_RANGE ((yyvsp[-3].node), (yyvsp[-1].node)); ;}
+    break;
+
+  case 41:
+#line 132 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = BINARY_OP (MS_OP_FORMAT, (yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 42:
+#line 133 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = UNARY_OP (MS_OP_LEN, (yyvsp[0].node)); ;}
+    break;
+
+  case 43:
+#line 134 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = UNARY_OP (MS_OP_NOT, (yyvsp[0].node)); ;}
+    break;
+
+  case 44:
+#line 135 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = UNARY_OP (MS_OP_UMINUS, (yyvsp[0].node)); ;}
+    break;
+
   case 45:
-#line 133 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_LIST_ADD ((yyvsp[-2].node), (yyvsp[0].node)); ;}
+#line 138 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NULL; ;}
     break;
 
   case 46:
-#line 136 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
-    { (yyval.node) = NODE_VAR ((yyvsp[0].str)); ;}
+#line 139 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_LIST_ADD (NULL, (yyvsp[0].node)); ;}
     break;
 
   case 47:
-#line 139 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 140 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_LIST_ADD ((yyvsp[-2].node), (yyvsp[0].node)); ;}
+    break;
+
+  case 48:
+#line 143 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
+    { (yyval.node) = NODE_VAR ((yyvsp[0].str)); ;}
+    break;
+
+  case 49:
+#line 146 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
     { (yyval.node) = NODE_COMMAND ((yyvsp[-3].str), (yyvsp[-1].node)); ;}
     break;
 
@@ -1489,7 +1512,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1493 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.c"
+#line 1516 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1757,6 +1780,6 @@ yyreturn:
 }
 
 
-#line 142 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 149 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
 
 
diff --git a/moo/mooutils/mooscript/mooscript-yacc.h b/moo/mooutils/mooscript/mooscript-yacc.h
index 1a3a426d..d55f605e 100644
--- a/moo/mooutils/mooscript/mooscript-yacc.h
+++ b/moo/mooutils/mooscript/mooscript-yacc.h
@@ -32,63 +32,65 @@
      IDENTIFIER = 258,
      LITERAL = 259,
      VARIABLE = 260,
-     NUMBER = 261,
-     IF = 262,
-     THEN = 263,
-     ELSE = 264,
-     FI = 265,
-     WHILE = 266,
-     DO = 267,
-     OD = 268,
-     FOR = 269,
-     IN = 270,
-     EQ = 271,
-     NEQ = 272,
-     LE = 273,
-     GE = 274,
-     AND = 275,
-     OR = 276,
-     NOT = 277,
-     UMINUS = 278,
-     TWODOTS = 279
+     PYTHON = 261,
+     NUMBER = 262,
+     IF = 263,
+     THEN = 264,
+     ELSE = 265,
+     FI = 266,
+     WHILE = 267,
+     DO = 268,
+     OD = 269,
+     FOR = 270,
+     IN = 271,
+     EQ = 272,
+     NEQ = 273,
+     LE = 274,
+     GE = 275,
+     AND = 276,
+     OR = 277,
+     NOT = 278,
+     UMINUS = 279,
+     TWODOTS = 280
    };
 #endif
 /* Tokens.  */
 #define IDENTIFIER 258
 #define LITERAL 259
 #define VARIABLE 260
-#define NUMBER 261
-#define IF 262
-#define THEN 263
-#define ELSE 264
-#define FI 265
-#define WHILE 266
-#define DO 267
-#define OD 268
-#define FOR 269
-#define IN 270
-#define EQ 271
-#define NEQ 272
-#define LE 273
-#define GE 274
-#define AND 275
-#define OR 276
-#define NOT 277
-#define UMINUS 278
-#define TWODOTS 279
+#define PYTHON 261
+#define NUMBER 262
+#define IF 263
+#define THEN 264
+#define ELSE 265
+#define FI 266
+#define WHILE 267
+#define DO 268
+#define OD 269
+#define FOR 270
+#define IN 271
+#define EQ 272
+#define NEQ 273
+#define LE 274
+#define GE 275
+#define AND 276
+#define OR 277
+#define NOT 278
+#define UMINUS 279
+#define TWODOTS 280
 
 
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 25 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.y"
+#line 26 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.y"
 typedef union YYSTYPE {
     int ival;
     const char *str;
     MSNode *node;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 92 "/home/muntyan/projects/ggap/ggap/moo/mooutils/mooscript/mooscript-yacc.h"
+#line 94 "/home/muntyan/projects/moo/moo/mooutils/mooscript/mooscript-yacc.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/moo/mooutils/mooscript/mooscript-yacc.y b/moo/mooutils/mooscript/mooscript-yacc.y
index 2a8ed194..dde9749f 100644
--- a/moo/mooutils/mooscript/mooscript-yacc.y
+++ b/moo/mooutils/mooscript/mooscript-yacc.y
@@ -13,6 +13,7 @@
 #define UNARY_OP(op, val)                   _ms_parser_node_unary_op (parser, op, val)
 #define NODE_NUMBER(n)                      _ms_parser_node_int (parser, n)
 #define NODE_STRING(n)                      _ms_parser_node_string (parser, n)
+#define NODE_PYTHON(string)                 _ms_parser_node_python (parser, string)
 #define NODE_VALUE_LIST(list)               _ms_parser_node_value_list (parser, MS_NODE_LIST (list))
 #define NODE_VALUE_RANGE(first,second)      _ms_parser_node_value_range (parser, first, second)
 #define NODE_VAR(string)                    _ms_parser_node_var (parser, string)
@@ -31,9 +32,10 @@
 %token <str> IDENTIFIER
 %token <str> LITERAL
 %token <str> VARIABLE
+%token <str> PYTHON
 %token <ival> NUMBER
 
-%type <node> program stmt
+%type <node> program stmt stmt_or_python
 %type <node> function if_stmt ternary loop assignment
 %type <node> simple_expr compound_expr expr variable list_elms
 
@@ -64,8 +66,13 @@
 script:   program           { SET_TOP_NODE ($1); }
 ;
 
-program:  stmt ';'          { $$ = NODE_LIST_ADD (NULL, $1); }
-        | program stmt ';'  { $$ = NODE_LIST_ADD ($1, $2); }
+program:  stmt_or_python            { $$ = NODE_LIST_ADD (NULL, $1); }
+        | program stmt_or_python    { $$ = NODE_LIST_ADD ($1, $2); }
+;
+
+stmt_or_python:
+          stmt ';'          { $$ = $1; }
+        | PYTHON            { $$ = NODE_PYTHON ($1); }
 ;
 
 stmt:   /* empty */         { $$ = NULL; }