diff --git a/Makefile.rules b/Makefile.rules
index 7fece58762..38a3be359c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -94,6 +94,7 @@ SOURCES += src/set.c
 SOURCES += src/stats.c
 SOURCES += src/streams.c
 SOURCES += src/stringobj.c
+SOURCES += src/syntaxtree.c
 SOURCES += src/sysfiles.c
 SOURCES += src/sysmem.c
 SOURCES += src/system.c
diff --git a/doc/ref/language.xml b/doc/ref/language.xml
index 2c25e4420a..5401c190aa 100644
--- a/doc/ref/language.xml
+++ b/doc/ref/language.xml
@@ -1979,6 +1979,17 @@ For examples of <K>return</K> statements, see the functions <C>fib</C> and
 
 </Section>
 
+<Section>
+    <Heading>Syntax Trees</Heading>
+
+    This section describes the tools available to manipulate &GAP; syntax
+    programmatically.
+
+    <#Include Label="SyntaxTree">
+    <#Include Label="CleanupCompiler">
+    <#Include Label="PrintCompiler">
+</Section>
+
 
 <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
 <!--
diff --git a/doc/ref/makedocreldata.g b/doc/ref/makedocreldata.g
index a9389ac945..5e376f3fd6 100644
--- a/doc/ref/makedocreldata.g
+++ b/doc/ref/makedocreldata.g
@@ -184,6 +184,7 @@ GAPInfo.ManualDataRef:= rec(
     "../../lib/string.g",
     "../../lib/string.gd",
     "../../lib/system.g",
+    "../../lib/syntaxtree.gd",
     "../../lib/teaching.g",
     "../../lib/tcsemi.gd",
     "../../lib/test.gi",
diff --git a/lib/read8.g b/lib/read8.g
index 5011452884..b036a845aa 100644
--- a/lib/read8.g
+++ b/lib/read8.g
@@ -10,6 +10,9 @@ ReadLib( "overload.g"  );
 ##
 ReadLib( "compiler.g"  );
 
+ReadLib( "syntaxtree.gd" );
+ReadLib( "syntaxtree.gi" );
+
 #############################################################################
 ##
 #X  Teaching functionality
diff --git a/lib/syntaxtree.gd b/lib/syntaxtree.gd
new file mode 100644
index 0000000000..9206103b3d
--- /dev/null
+++ b/lib/syntaxtree.gd
@@ -0,0 +1,17 @@
+## syntaxtree.gd
+
+DeclareCategory("IsSyntaxTree", IsObject);
+BindGlobal("SyntaxTreeType", NewType( NewFamily( "SyntaxTreeFamily" )
+                                    , IsSyntaxTree and IsComponentObjectRep ) );
+
+##  <#GAPDoc Label="SyntaxTree">
+##  <ManSection>
+##  <Func Name="SyntaxTree" Arg='f'/>
+##
+##  <Description>
+##  Takes a GAP function <A>f</A> and returns its syntax tree.
+##
+##  </Description>
+##  </ManSection>
+##  <#/GAPDoc>
+DeclareGlobalFunction("SyntaxTree");
diff --git a/lib/syntaxtree.gi b/lib/syntaxtree.gi
new file mode 100644
index 0000000000..8bffcd16c0
--- /dev/null
+++ b/lib/syntaxtree.gi
@@ -0,0 +1,15 @@
+# syntaxtree.gi
+
+InstallGlobalFunction( SyntaxTree,
+function(f)
+    if (not IsFunction(f)) or IsOperation(f) or IsKernelFunction(f) then
+        Error("SyntaxTree: <f> must be a plain GAP function, not a ", TNAM_OBJ(f));
+    fi;
+    return Objectify( SyntaxTreeType, rec( file := FilenameFunc(f)
+                                         , line := StartlineFunc(f)
+                                         , tree := SYNTAX_TREE(f) ) );
+end);
+
+InstallMethod( ViewString, "for a syntax tree"
+               , [ IsSyntaxTree ]
+               , t -> "<syntax tree>" );
diff --git a/src/modules-builtin.c b/src/modules-builtin.c
index ab5b446a8a..c3d1b2d2ed 100644
--- a/src/modules-builtin.c
+++ b/src/modules-builtin.c
@@ -6,6 +6,7 @@
 #include "objccoll.h"
 #include "objset.h"
 #include "profile.h"
+#include "syntaxtree.h"
 #include "vec8bit.h"
 #include "vecffe.h"
 #include "vecgf2.h"
@@ -103,6 +104,9 @@ const InitInfoFunc InitFuncsBuiltinModules[] = {
     InitInfoWeakPtr,
     InitInfoSaveLoad,
 
+    /* syntax and parser tools */
+    InitInfoSyntaxTree,
+
     /* input and output                                                    */
     InitInfoStreams,
     InitInfoSysFiles,
diff --git a/src/syntaxtree.c b/src/syntaxtree.c
new file mode 100644
index 0000000000..eb475cea8d
--- /dev/null
+++ b/src/syntaxtree.c
@@ -0,0 +1,894 @@
+//
+//  syntaxtree.c
+//
+//
+// TODO:
+//  - Floats
+//  - Should we be hooking into the parser/interpreter/coder instead of compiling
+//    bytecode?
+
+#include "syntaxtree.h"
+
+#include "bool.h"
+#include "calls.h"
+#include "code.h"
+#include "compiled.h" // C_MAKE_INTEGER_BAG
+#include "exprs.h"
+#include "gvars.h"
+#include "error.h"
+#include "lists.h"
+#include "modules.h"
+#include "plist.h"
+#include "records.h"
+#include "stats.h"
+#include "stringobj.h"
+#include "precord.h"
+#include "system.h"
+#include "vars.h"
+
+#include <stdarg.h>
+#include <ctype.h>
+
+typedef UInt4 LVar;
+typedef UInt4 HVar;
+typedef UInt  GVar;
+
+typedef Obj (*CompileFuncT)(Obj node, Expr expr);
+typedef Obj (*CompileArgT)(Expr expr);
+
+typedef struct {
+    const Char * argname;
+    CompileArgT  argcomp;
+} ArgT;
+
+typedef struct {
+    UInt         tnum;
+    CompileFuncT compile;
+    const Char * name;
+    UInt         arity;
+    ArgT         args[6]; /* This is not really a restriction */
+} CompilerT;
+
+// We put compilers for statements and expressions into the same
+// static array, assuming that TNUM ranges are disjoint. This
+// is true in GAP 4.9
+static const CompilerT Compilers[];
+#define COMPILER_ARITY(...) (sizeof((ArgT[]){ __VA_ARGS__ }) / sizeof(ArgT))
+#define COMPILER(tnum, compiler, ...)                                        \
+    [tnum] = {                                                               \
+        tnum, compiler, #tnum, COMPILER_ARITY(__VA_ARGS__), { __VA_ARGS__ }  \
+    }
+
+#define COMPILER_(tnum, ...)                                                 \
+    COMPILER(tnum, SyntaxTreeDefaultCompiler, __VA_ARGS__)
+
+#define ARG(name, func) \
+    { name, func }
+#define ARG_(name) ARG(name, SyntaxTreeCompiler)
+
+static Obj SyntaxTreeFunc(Obj result, Obj func);
+
+static inline Obj NewSyntaxTreeNode(const char * type)
+{
+    Obj result;
+    Obj typestr;
+
+    C_NEW_STRING_DYN(typestr, type);
+    result = NEW_PREC(1);
+    AssPRec(result, RNamName("type"), typestr);
+
+    return result;
+}
+
+static Obj SyntaxTreeCompiler(Expr expr)
+{
+    Obj       result;
+    UInt      tnum;
+    CompilerT comp;
+
+    // TODO: GAP_ASSERT
+    tnum = TNUM_EXPR(expr);
+    comp = Compilers[tnum];
+
+    // TODO: clean
+    result = NewSyntaxTreeNode(comp.name);
+    // AssPRec(result, RNamName("line"), INTOBJ_INT(STAT_HEADER(expr)->line));
+
+    comp.compile(result, expr);
+
+    return result;
+}
+
+static Obj SyntaxTreeIntObjInt(UInt i)
+{
+    return INTOBJ_INT(i);
+}
+
+static Obj SyntaxTreeDefaultCompiler(Obj result, Expr expr)
+{
+    int       i;
+    UInt      tnum;
+    CompilerT comp;
+
+    // TODO: GAP_ASSERT tnum range
+    tnum = TNUM_EXPR(expr);
+    comp = Compilers[tnum];
+
+    for (i = 0; i < comp.arity; i++) {
+        AssPRec(result, RNamName(comp.args[i].argname),
+                comp.args[i].argcomp(ADDR_EXPR(expr)[i]));
+    }
+    return result;
+}
+
+Obj SyntaxTreeFunccall(Obj result, Expr expr)
+{
+    Obj  func;
+    Obj  args, argi;
+    UInt narg, i;
+
+    func = SyntaxTreeCompiler(FUNC_CALL(expr));
+    AssPRec(result, RNamName("funcref"), func);
+
+    /* compile the argument expressions */
+    narg = NARG_SIZE_CALL(SIZE_EXPR(expr));
+    args = NEW_PLIST(T_PLIST, narg);
+    SET_LEN_PLIST(args, narg);
+
+    for (i = 1; i <= narg; i++) {
+        argi = SyntaxTreeCompiler(ARGI_CALL(expr, i));
+        SET_ELM_PLIST(args, i, argi);
+        CHANGED_BAG(args);
+    }
+    AssPRec(result, RNamName("args"), args);
+    return result;
+}
+
+Obj SyntaxTreeFuncExpr(Obj result, Expr expr)
+{
+    Obj fexs;
+    Obj fexp;
+
+    fexs = FEXS_FUNC(CURR_FUNC());
+    fexp = ELM_PLIST(fexs, ((Int *)ADDR_EXPR(expr))[0]);
+
+    SyntaxTreeFunc(result, fexp);
+
+    return result;
+}
+
+Obj SyntaxTreeIntExpr(Obj result, Expr expr)
+{
+    Obj  value;
+    UInt size;
+    UInt typ;
+
+    if (IS_INTEXPR(expr))
+        value = OBJ_INTEXPR(expr);
+    else {
+        size = SIZE_EXPR(expr) - sizeof(UInt);
+        typ = *(UInt *)ADDR_EXPR(expr);
+        value = C_MAKE_INTEGER_BAG(size, typ);
+        memcpy(ADDR_OBJ(value), (void *)(&ADDR_EXPR(expr)[1]), size);
+    }
+
+    AssPRec(result, RNamName("value"), value);
+
+    return result;
+}
+
+Obj SyntaxTreeCharExpr(Obj result, Expr expr)
+{
+    Obj value;
+
+    value = NewBag(T_CHAR, 1);
+    *(UChar*)ADDR_OBJ(value) = (UChar)ADDR_EXPR(expr)[0];
+
+    AssPRec(result, RNamName("result"), value);
+
+    return result;
+}
+
+Obj SyntaxTreePermExpr(Obj result, Expr expr)
+{
+    Obj  cycles;
+    Obj  cycle;
+    Obj  val;
+    Expr cycleexpr;
+    Int  csize, n;
+    Int  i, j;
+
+    /* determine number of cycles */
+    n = SIZE_EXPR(expr) / sizeof(Expr);
+    cycles = NEW_PLIST(T_PLIST, n);
+    AssPRec(result, RNamName("cycles"), cycles);
+    SET_LEN_PLIST(cycles, n);
+
+    /* enter cycles */
+    for (i = 1; i <= n; i++) {
+        cycleexpr = ADDR_EXPR(expr)[i - 1];
+        csize = SIZE_EXPR(cycleexpr) / sizeof(Expr);
+        cycle = NEW_PLIST(T_PLIST, csize);
+        SET_LEN_PLIST(cycle, csize);
+        SET_ELM_PLIST(cycles, i, cycle);
+        CHANGED_BAG(cycles);
+
+        /* entries of the cycle */
+        for (j = 1; j <= csize; j++) {
+            val = SyntaxTreeCompiler(ADDR_EXPR(cycleexpr)[j - 1]);
+            SET_ELM_PLIST(cycle, j, val);
+            CHANGED_BAG(cycle);
+        }
+    }
+    return result;
+}
+
+Obj SyntaxTreeListExpr(Obj result, Expr expr)
+{
+    Obj list;
+    Int len;
+    Int i;
+
+    len = SIZE_EXPR(expr) / sizeof(Expr);
+
+    list = NEW_PLIST(T_PLIST, len);
+    SET_LEN_PLIST(list, len);
+
+    for (i = 1; i <= len; i++) {
+        if (ADDR_EXPR(expr)[i - 1] == 0) {
+            continue;
+        }
+        else {
+            SET_ELM_PLIST(list, i,
+                          SyntaxTreeCompiler(ADDR_EXPR(expr)[i - 1]));
+            CHANGED_BAG(list);
+        }
+    }
+
+    AssPRec(result, RNamName("list"), list);
+
+    return result;
+}
+
+Obj SyntaxTreeRangeExpr(Obj result, Expr expr)
+{
+    Obj first;
+    Obj second;
+    Obj last;
+
+    if (SIZE_EXPR(expr) == 2 * sizeof(Expr)) {
+        first = SyntaxTreeCompiler(ADDR_EXPR(expr)[0]);
+        last = SyntaxTreeCompiler(ADDR_EXPR(expr)[1]);
+
+        AssPRec(result, RNamName("first"), first);
+        AssPRec(result, RNamName("last"), last);
+    }
+    else {
+        first = SyntaxTreeCompiler(ADDR_EXPR(expr)[0]);
+        second = SyntaxTreeCompiler(ADDR_EXPR(expr)[1]);
+        last = SyntaxTreeCompiler(ADDR_EXPR(expr)[2]);
+
+        AssPRec(result, RNamName("first"), first);
+        AssPRec(result, RNamName("second"), second);
+        AssPRec(result, RNamName("last"), last);
+    }
+
+    return result;
+}
+
+Obj SyntaxTreeStringExpr(Obj result, Expr expr)
+{
+    Obj string;
+
+    C_NEW_STRING(string, SIZE_EXPR(expr) - 1 - sizeof(UInt),
+                 sizeof(UInt) + (Char *)ADDR_EXPR(expr));
+
+    AssPRec(result, RNamName("string"), string);
+
+    return result;
+}
+
+/* TODO: Maybe return a record or a list with key/value pairs? */
+Obj SyntaxTreeRecExpr(Obj result, Expr expr)
+{
+    Obj  key;
+    Obj  val;
+    Obj  list;
+    Obj  subrec;
+    Expr tmp;
+    Int  i, len;
+
+    len = SIZE_EXPR(expr) / (2 * sizeof(Expr));
+    list = NEW_PLIST(T_PLIST, len);
+    SET_LEN_PLIST(list, len);
+
+    for (i = 1; i <= len; i++) {
+        // Check whether this can happen and *why*
+        tmp = ADDR_EXPR(expr)[2 * i - 2];
+        if (tmp == 0) {
+            continue;
+        }
+        else {
+            subrec = NEW_PREC(2);
+            SET_ELM_PLIST(list, i, subrec);
+            CHANGED_BAG(list);
+
+            if (IS_INTEXPR(tmp)) {
+                key = NAME_RNAM((UInt)INT_INTEXPR(tmp));
+            }
+            else {
+                key = SyntaxTreeCompiler(tmp);
+            }
+            AssPRec(subrec, RNamName("key"), key);
+
+            tmp = ADDR_EXPR(expr)[2 * i - 1];
+            val = SyntaxTreeCompiler(tmp);
+            AssPRec(subrec, RNamName("value"), val);
+        }
+    }
+    AssPRec(result, RNamName("keyvalue"), list);
+
+    return result;
+}
+
+/* TODO: Make this work */
+Obj SyntaxTreeFloatEager(Obj result, Expr expr)
+{
+    return result;
+}
+
+/* TODO: Make this work */
+Obj SyntaxTreeFloatLazy(Obj result, Expr expr)
+{
+    return result;
+}
+
+Obj SyntaxTreeLVar(Expr expr)
+{
+    LVar lvar;
+
+    if (IS_REFLVAR(expr)) {
+        lvar = LVAR_REFLVAR(expr);
+    } else {
+        lvar = (LVar)(ADDR_EXPR(expr)[0]);
+    }
+
+    return INTOBJ_INT(lvar);
+}
+
+Obj SyntaxTreeHVar(Expr expr)
+{
+    HVar hvar;
+
+    hvar = (HVar)(expr);
+    return INTOBJ_INT(hvar);
+}
+
+Obj SyntaxTreeGVar(Expr expr)
+{
+  return NameGVar((GVar)(expr));
+}
+
+Obj SyntaxTreeRefLVar(Obj result, Expr expr)
+{
+    AssPRec(result, RNamName("lvar"), SyntaxTreeLVar(expr));
+    return result;
+}
+/*
+
+Obj SyntaxTreeRefHVar(Obj result, Expr expr)
+{
+    AssPRec(result, RNamName("hvar"), SyntaxTreeHVar(expr));
+    return result;
+}
+*/
+
+Obj SyntaxTreeRefGVar(Obj result, Expr expr)
+{
+    AssPRec(result, RNamName("gvar"), SyntaxTreeGVar(expr));
+    return result;
+}
+
+Obj SyntaxTreeRNam(Expr expr)
+{
+    Obj rnam;
+
+    rnam = NAME_RNAM(expr);
+    return rnam;
+}
+
+Obj SyntaxTreeSeqStat(Obj result, Stat stat)
+{
+    Obj  list;
+    UInt nr;
+    UInt i;
+
+    /* get the number of statements */
+    nr = SIZE_STAT(stat) / sizeof(Stat);
+    list = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(list, nr);
+
+    /* compile the statements */
+    for (i = 1; i <= nr; i++) {
+        SET_ELM_PLIST(list, i, SyntaxTreeCompiler(ADDR_STAT(stat)[i - 1]));
+        CHANGED_BAG(list);
+    }
+    AssPRec(result, RNamName("statements"), list);
+
+    return result;
+}
+
+Obj SyntaxTreeIf(Obj result, Stat stat)
+{
+    Obj cond;
+    Obj then;
+    Obj pair;
+    Obj branches;
+
+    Int i, nr;
+
+    nr = SIZE_STAT(stat) / (2 * sizeof(Stat));
+    branches = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(branches, nr);
+
+    AssPRec(result, RNamName("branches"), branches);
+
+    cond = SyntaxTreeCompiler(ADDR_STAT(stat)[0]);
+    then = SyntaxTreeCompiler(ADDR_STAT(stat)[1]);
+
+    for (i = 0; i < nr; i++) {
+        cond = SyntaxTreeCompiler(ADDR_STAT(stat)[2 * i]);
+        then = SyntaxTreeCompiler(ADDR_STAT(stat)[2 * i + 1]);
+
+        pair = NEW_PREC(2);
+        AssPRec(pair, RNamName("condition"), cond);
+        AssPRec(pair, RNamName("body"), then);
+
+        SET_ELM_PLIST(branches, i + 1, pair);
+        CHANGED_BAG(branches);
+    }
+    return result;
+}
+
+Obj SyntaxTreeFor(Obj result, Stat stat)
+{
+    Obj  body;
+    UInt i, nr;
+
+    AssPRec(result, RNamName("variable"),
+            SyntaxTreeCompiler(ADDR_STAT(stat)[0]));
+    AssPRec(result, RNamName("collection"),
+            SyntaxTreeCompiler(ADDR_STAT(stat)[1]));
+
+    nr = SIZE_STAT(stat) / sizeof(Stat) - 2;
+    body = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(body, nr);
+    AssPRec(result, RNamName("body"), body);
+
+    for (i = 2; i < 2 + nr; i++) {
+        SET_ELM_PLIST(body, i - 1, SyntaxTreeCompiler(ADDR_STAT(stat)[i]));
+        CHANGED_BAG(body);
+    }
+
+    return result;
+}
+
+Obj SyntaxTreeWhile(Obj result, Stat stat)
+{
+    Obj  condition;
+    Obj  body;
+    UInt nr, i;
+
+    condition = SyntaxTreeCompiler(ADDR_STAT(stat)[0]);
+    AssPRec(result, RNamName("condition"), condition);
+
+    nr = SIZE_STAT(stat) / sizeof(Stat) - 1;
+    body = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(body, nr);
+    AssPRec(result, RNamName("body"), body);
+
+    for (i = 1; i < 1 + nr; i++) {
+        SET_ELM_PLIST(body, i, SyntaxTreeCompiler(ADDR_STAT(stat)[i]));
+        CHANGED_BAG(body);
+    }
+
+    return result;
+}
+
+Obj SyntaxTreeRepeat(Obj result, Stat stat)
+{
+    Obj  cond;
+    Obj  body;
+    UInt i, nr;
+
+    cond = SyntaxTreeCompiler(ADDR_STAT(stat)[0]);
+    AssPRec(result, RNamName("condition"), cond);
+
+    nr = SIZE_STAT(stat) / sizeof(Stat) - 1;
+    body = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(body, nr);
+    AssPRec(result, RNamName("body"), body);
+
+    for (i = 1; i < 1 + nr; i++) {
+        SET_ELM_PLIST(body, i, SyntaxTreeCompiler(ADDR_STAT(stat)[i]));
+        CHANGED_BAG(body);
+    }
+
+    return result;
+}
+
+Obj SyntaxTreeInfo(Obj result, Stat stat)
+{
+    Obj  sel;
+    Obj  lev;
+    Obj  lst;
+    Obj  tmp;
+    UInt narg, i;
+
+    sel = SyntaxTreeCompiler(ARGI_INFO(stat, 1));
+    lev = SyntaxTreeCompiler(ARGI_INFO(stat, 2));
+
+    AssPRec(result, RNamName("sel"), sel);
+    AssPRec(result, RNamName("lev"), lev);
+
+    narg = NARG_SIZE_INFO(SIZE_STAT(stat)) - 2;
+    lst = NEW_PLIST(T_PLIST, narg);
+    SET_LEN_PLIST(lst, narg);
+
+    for (i = 1; i <= narg; i++) {
+        tmp = SyntaxTreeCompiler(ARGI_INFO(stat, i + 2));
+        SET_ELM_PLIST(lst, i, tmp);
+        CHANGED_BAG(lst);
+    }
+    AssPRec(result, RNamName("args"), lst);
+
+    return result;
+}
+
+static Obj SyntaxTreeElmList(Obj result, Stat stat)
+{
+    Obj list, refs;
+    Int nr;
+    Int i;
+
+    list = SyntaxTreeCompiler(ADDR_STAT(stat)[0]);
+    AssPRec(result, RNamName("list"), list);
+
+    nr = SIZE_STAT(stat) / sizeof(Stat) - 1;
+
+    refs = NEW_PLIST(T_PLIST, nr);
+    SET_LEN_PLIST(refs, nr);
+    AssPRec(result, RNamName("refs"), refs);
+
+    for(i = 1; i < 1 + nr; i++) {
+        SET_ELM_PLIST(refs, i, SyntaxTreeCompiler(ADDR_STAT(stat)[i]));
+        CHANGED_BAG(refs);
+    }
+    return result;
+}
+
+static Obj SyntaxTreeFunc(Obj result, Obj func)
+{
+    Obj str;
+    Obj stats;
+    Obj argnams;
+    Obj locnams;
+
+    Bag oldFrame;
+    Int narg;
+    Int nloc;
+    Int i;
+
+    if (NAME_FUNC(func)) {
+        AssPRec(result, RNamName("name"), NAME_FUNC(func));
+    }
+
+    narg = NARG_FUNC(func);
+    if (narg < 0) {
+        AssPRec(result, RNamName("variadic"), True);
+        narg = -narg;
+    }
+    else {
+        AssPRec(result, RNamName("variadic"), False);
+    }
+    AssPRec(result, RNamName("narg"), INTOBJ_INT(narg));
+
+    /* names of arguments */
+    argnams = NEW_PLIST(T_PLIST, narg);
+    SET_LEN_PLIST(argnams, narg);
+    AssPRec(result, RNamName("argnams"), argnams);
+    for (i = 1; i <= narg; i++) {
+        if (NAMI_FUNC(func, i) != 0) {
+            str = CopyToStringRep(NAMI_FUNC(func, i));
+        }
+        else {
+            /* TODO: Probably put the number in */
+            C_NEW_STRING_DYN(str, "localvar");
+        }
+        SET_ELM_PLIST(argnams, i, str);
+        CHANGED_BAG(argnams);
+    }
+
+    /* names of local variables */
+    nloc = NLOC_FUNC(func);
+    AssPRec(result, RNamName("nloc"), INTOBJ_INT(nloc));
+    locnams = NEW_PLIST(T_PLIST, nloc);
+    SET_LEN_PLIST(locnams, nloc);
+    AssPRec(result, RNamName("locnams"), locnams);
+    for (i = 1; i <= nloc; i++) {
+        if (NAMI_FUNC(func, narg + i) != 0) {
+            str = CopyToStringRep(NAMI_FUNC(func, narg + i));
+        }
+        else {
+            /* TODO: Probably put the number in */
+            C_NEW_STRING_DYN(str, "localvar");
+        }
+        SET_ELM_PLIST(locnams, i, str);
+        CHANGED_BAG(locnams);
+    }
+
+    /* switch to this function (so that 'ADDR_STAT' and 'ADDR_EXPR' work) */
+    SWITCH_TO_NEW_LVARS(func, narg, nloc, oldFrame);
+    stats = SyntaxTreeCompiler(OFFSET_FIRST_STAT);
+    SWITCH_TO_OLD_LVARS(oldFrame);
+
+    AssPRec(result, RNamName("stats"), stats);
+
+    return result;
+}
+
+static const CompilerT Compilers[] = {
+    COMPILER(T_PROCCALL_0ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_1ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_2ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_3ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_4ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_5ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_6ARGS, SyntaxTreeFunccall),
+    COMPILER(T_PROCCALL_XARGS, SyntaxTreeFunccall),
+
+    COMPILER(T_PROCCALL_OPTS, SyntaxTreeDefaultCompiler,
+             ARG_("opts"), ARG_("call")),
+
+    COMPILER(T_EMPTY, SyntaxTreeDefaultCompiler),
+
+    COMPILER(T_SEQ_STAT, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT2, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT3, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT4, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT5, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT6, SyntaxTreeSeqStat),
+    COMPILER(T_SEQ_STAT7, SyntaxTreeSeqStat),
+
+    COMPILER(T_IF, SyntaxTreeIf),
+    COMPILER(T_IF_ELSE, SyntaxTreeIf),
+    COMPILER(T_IF_ELIF, SyntaxTreeIf),
+    COMPILER(T_IF_ELIF_ELSE, SyntaxTreeIf),
+
+    COMPILER(T_FOR, SyntaxTreeFor),
+    COMPILER(T_FOR2, SyntaxTreeFor),
+    COMPILER(T_FOR3, SyntaxTreeFor),
+
+    COMPILER(T_FOR_RANGE, SyntaxTreeFor),
+    COMPILER(T_FOR_RANGE2, SyntaxTreeFor),
+    COMPILER(T_FOR_RANGE3, SyntaxTreeFor),
+
+    COMPILER(T_WHILE, SyntaxTreeWhile),
+    COMPILER(T_WHILE2, SyntaxTreeWhile),
+    COMPILER(T_WHILE3, SyntaxTreeWhile),
+
+    COMPILER(T_REPEAT, SyntaxTreeRepeat),
+    COMPILER(T_REPEAT2, SyntaxTreeRepeat),
+    COMPILER(T_REPEAT3, SyntaxTreeRepeat),
+
+#ifdef HPCGAP
+    COMPILER(T_ATOMIC, SyntaxTreeDefaultCompiler),
+#endif
+
+    COMPILER_(T_BREAK),
+    COMPILER_(T_CONTINUE),
+    COMPILER_(T_RETURN_OBJ,
+             ARG_("obj") ),
+    COMPILER_(T_RETURN_VOID),
+
+    COMPILER_(T_ASS_LVAR,
+              ARG("lvar", SyntaxTreeIntObjInt), ARG_("rhs")),
+    COMPILER_(T_UNB_LVAR, ARG("lvar", SyntaxTreeIntObjInt)),
+
+    COMPILER_(T_ASS_HVAR,
+             ARG("hvar", SyntaxTreeHVar), ARG_("rhs")),
+    COMPILER_(T_UNB_HVAR,
+             ARG("hvar", SyntaxTreeHVar)),
+
+    COMPILER_(T_ASS_GVAR,
+             ARG("gvar", SyntaxTreeGVar), ARG_("rhs")),
+    COMPILER_(T_UNB_GVAR,
+             ARG("gvar", SyntaxTreeGVar)),
+
+    COMPILER_(T_ASS_LIST,
+              ARG_("list"), ARG_("pos"), ARG_("rhs")),
+    COMPILER_(T_ASS2_LIST, ARG_("list"), ARG_("pos"), ARG_("rhs")),
+    COMPILER_(T_ASSS_LIST,
+              ARG_("list"), ARG_("poss"), ARG_("rhss")),
+    COMPILER_(T_ASS_LIST_LEV,
+              ARG_("lists"), ARG_("pos"), ARG_("rhss"), ARG("level", SyntaxTreeIntObjInt)),
+    COMPILER_(T_ASSS_LIST_LEV,
+              ARG_("lists"), ARG_("poss"), ARG_("rhss"), ARG("level", SyntaxTreeIntObjInt)),
+    COMPILER_(T_UNB_LIST,
+             ARG_("list"), ARG_("pos")),
+
+    COMPILER_(T_ASS_REC_NAME,
+              ARG_("record"), ARG("rnam", SyntaxTreeRNam), ARG_("rhs")),
+    COMPILER_(T_ASS_REC_EXPR,
+              ARG_("record"), ARG_("expression"), ARG_("rhs")),
+    COMPILER_(T_UNB_REC_NAME,
+              ARG_("record"), ARG("rnam", SyntaxTreeRNam)),
+    COMPILER_(T_UNB_REC_EXPR,
+              ARG_("record"), ARG_("expression")),
+
+    COMPILER_(T_ASS_POSOBJ,
+              ARG_("posobj"), ARG_("pos"), ARG_("rhs")),
+    COMPILER_(T_UNB_POSOBJ,
+              ARG_("posobj"), ARG_("pos")),
+
+    COMPILER_(T_ASS_COMOBJ_NAME,
+              ARG_("comobj"), ARG("rnam", SyntaxTreeRNam)),
+    COMPILER_(T_ASS_COMOBJ_EXPR,
+              ARG_("comobj"), ARG_("expression"), ARG_("rhs")),
+    COMPILER_(T_UNB_COMOBJ_NAME,
+              ARG_("comobj"), ARG("rnam", SyntaxTreeRNam)),
+    COMPILER_(T_UNB_COMOBJ_EXPR,
+              ARG_("comobj"), ARG_("expression")),
+
+    COMPILER(T_INFO, SyntaxTreeInfo),
+    COMPILER_(T_ASSERT_2ARGS,
+              ARG_("level"), ARG_("condition")),
+    COMPILER_(T_ASSERT_3ARGS,
+              ARG_("level"), ARG_("condition"), ARG_("message")),
+
+    /* Statements */
+    COMPILER(T_FUNCCALL_0ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_1ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_2ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_3ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_4ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_5ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_6ARGS, SyntaxTreeFunccall),
+    COMPILER(T_FUNCCALL_XARGS, SyntaxTreeFunccall),
+
+    COMPILER(T_FUNC_EXPR, SyntaxTreeFuncExpr),
+
+    COMPILER_(T_FUNCCALL_OPTS,
+              ARG_("opts"), ARG_("call")),
+
+
+    COMPILER_(T_OR, ARG_("left"), ARG_("right")),
+    COMPILER_(T_AND, ARG_("left"), ARG_("right")),
+    COMPILER_(T_NOT, ARG_("op")),
+    COMPILER_(T_EQ, ARG_("left"), ARG_("right")),
+    COMPILER_(T_NE, ARG_("left"), ARG_("right")),
+    COMPILER_(T_LT, ARG_("left"), ARG_("right")),
+    COMPILER_(T_GE, ARG_("left"), ARG_("right")),
+    COMPILER_(T_GT, ARG_("left"), ARG_("right")),
+    COMPILER_(T_LE, ARG_("left"), ARG_("right")),
+    COMPILER_(T_IN, ARG_("left"), ARG_("right")),
+    COMPILER_(T_SUM, ARG_("left"), ARG_("right")),
+    COMPILER_(T_AINV, ARG_("op")),
+    COMPILER_(T_DIFF, ARG_("left"), ARG_("right")),
+    COMPILER_(T_PROD, ARG_("left"), ARG_("right")),
+    COMPILER_(T_QUO, ARG_("left"), ARG_("right")),
+    COMPILER_(T_MOD, ARG_("left"), ARG_("right")),
+    COMPILER_(T_POW, ARG_("left"), ARG_("right")),
+
+    COMPILER(T_INTEXPR, SyntaxTreeIntExpr),
+    COMPILER(T_INT_EXPR, SyntaxTreeIntExpr),
+    COMPILER_(T_TRUE_EXPR),
+    COMPILER_(T_FALSE_EXPR),
+    COMPILER_(T_TILDE_EXPR),
+    COMPILER(T_CHAR_EXPR, SyntaxTreeCharExpr),
+    COMPILER(T_PERM_EXPR, SyntaxTreePermExpr),
+    COMPILER_(T_PERM_CYCLE),
+    COMPILER(T_LIST_EXPR, SyntaxTreeListExpr),
+    COMPILER(T_LIST_TILDE_EXPR, SyntaxTreeListExpr),
+    COMPILER(T_RANGE_EXPR, SyntaxTreeRangeExpr),
+    COMPILER(T_STRING_EXPR, SyntaxTreeStringExpr),
+    COMPILER(T_REC_EXPR, SyntaxTreeRecExpr),
+    COMPILER_(T_REC_TILDE_EXPR),
+
+    COMPILER(T_FLOAT_EXPR_EAGER, SyntaxTreeFloatEager),
+    COMPILER(T_FLOAT_EXPR_LAZY, SyntaxTreeFloatLazy),
+
+    COMPILER(T_REFLVAR, SyntaxTreeRefLVar),
+    COMPILER(T_ISB_LVAR, SyntaxTreeRefLVar),
+
+    COMPILER_(T_REF_HVAR, ARG("hvar", SyntaxTreeHVar)),
+    COMPILER_(T_ISB_HVAR, ARG("hvar", SyntaxTreeHVar)),
+    COMPILER_(T_REF_GVAR, ARG("gvar", SyntaxTreeGVar)),
+    COMPILER_(T_ISB_GVAR, ARG("gvar", SyntaxTreeGVar)),
+
+    // TODO: can this be unified?
+    COMPILER_(T_ELM_LIST,
+              ARG_("list"), ARG_("pos")),
+    COMPILER(T_ELM2_LIST, SyntaxTreeElmList),
+    COMPILER_(T_ELMS_LIST,
+              ARG_("list"), ARG_("poss")),
+    COMPILER_(T_ELM_LIST_LEV,
+              ARG_("lists"), ARG_("pos"), ARG_("level")),
+    COMPILER_(T_ELMS_LIST_LEV,
+              ARG_("lists"), ARG_("poss"), ARG_("level")),
+    COMPILER_(T_ISB_LIST,
+              ARG_("list"), ARG_("pos")),
+    COMPILER_(T_ELM_REC_NAME,
+              ARG_("record"), ARG("name", SyntaxTreeRNam)),
+    COMPILER_(T_ELM_REC_EXPR,
+              ARG_("record"), ARG_("expression")),
+    COMPILER_(T_ISB_REC_NAME,
+              ARG_("record"), ARG("name", SyntaxTreeRNam)),
+    COMPILER_(T_ISB_REC_EXPR,
+              ARG_("record"), ARG_("expression")),
+    COMPILER_(T_ELM_POSOBJ,
+              ARG_("posobj"), ARG_("pos")),
+    COMPILER_(T_ISB_POSOBJ,
+              ARG_("posobj"), ARG_("pos")),
+    COMPILER_(T_ELM_COMOBJ_NAME,
+              ARG_("comobj"), ARG("name", SyntaxTreeRNam)),
+    COMPILER_(T_ELM_COMOBJ_EXPR,
+              ARG_("comobj"), ARG_("expression")),
+    COMPILER_(T_ISB_COMOBJ_NAME,
+              ARG_("comobj"), ARG("name", SyntaxTreeRNam)),
+    COMPILER_(T_ISB_COMOBJ_EXPR,
+              ARG_("comobj"), ARG_("expression")),
+};
+
+Obj FuncSYNTAX_TREE(Obj self, Obj func)
+{
+    Obj result;
+
+    if (!IS_FUNC(func) || IsKernelFunction(func) || IS_OPERATION(func)) {
+        ErrorQuit("SYNTAX_TREE: <func> must be a plain GAP function",
+                  (Int)TNAM_OBJ(func), 0L);
+    }
+
+    result = NewSyntaxTreeNode("T_FUNC_EXPR");
+    return SyntaxTreeFunc(result, func);
+}
+
+static StructGVarFunc GVarFuncs[] = {
+    GVAR_FUNC(SYNTAX_TREE, 1, "function"),
+    { 0 } };
+
+static Int InitKernel(StructInitInfo * module)
+{
+    /* init filters and functions */
+    InitHdlrFuncsFromTable(GVarFuncs);
+
+    return 0;
+}
+
+static Int PostRestore(StructInitInfo * module)
+{
+    return 0;
+}
+
+static Int InitLibrary(StructInitInfo * module)
+{
+    /* init filters and functions */
+    InitGVarFuncsFromTable(GVarFuncs);
+
+    /* return success */
+    return PostRestore(module);
+}
+
+static StructInitInfo module = {
+    // init struct using C99 designated initializers; for a full list of
+    // fields, please refer to the definition of StructInitInfo
+    .type = MODULE_BUILTIN,
+    .name = "syntaxtree",
+    .initKernel = InitKernel,
+    .initLibrary = InitLibrary,
+};
+
+StructInitInfo * InitInfoSyntaxTree(void)
+{
+    return &module;
+}
diff --git a/src/syntaxtree.h b/src/syntaxtree.h
new file mode 100644
index 0000000000..bce2efa483
--- /dev/null
+++ b/src/syntaxtree.h
@@ -0,0 +1,13 @@
+//
+//  syntaxtree.h
+//
+
+
+#ifndef GAP_SYNTAXTREE_H
+#define GAP_SYNTAXTREE_H
+
+#include "objects.h"
+
+StructInitInfo * InitInfoSyntaxTree(void);
+
+#endif    // GAP_SYNTAXTREE_H
diff --git a/tst/testinstall/syntaxtree.tst b/tst/testinstall/syntaxtree.tst
new file mode 100644
index 0000000000..db997941a7
--- /dev/null
+++ b/tst/testinstall/syntaxtree.tst
@@ -0,0 +1,33 @@
+
+#
+gap> SYNTAX_TREE(1);
+Error, SYNTAX_TREE: <func> must be a plain GAP function
+gap> SYNTAX_TREE(\+);
+Error, SYNTAX_TREE: <func> must be a plain GAP function
+gap> SyntaxTree(1);
+Error, SyntaxTree: <f> must be a plain GAP function, not a integer
+gap> SyntaxTree(x -> x);
+<syntax tree>
+gap> SyntaxTree(\+);
+Error, SyntaxTree: <f> must be a plain GAP function, not a function
+
+# Just try compiling all functions we can find in the workspace
+# to see nothing crashes.
+gap> for n in NamesGVars() do
+>        if IsBoundGlobal(n) then
+>            v := ValueGlobal(n);
+>            if IsFunction(v) and not IsKernelFunction(v) then
+>                SYNTAX_TREE(v);
+>            elif IsOperation(v) then
+>                for i in [1..6] do
+>                    for x in METHODS_OPERATION(v, i) do
+>                        if IsFunction(x) and not IsKernelFunction(v) then
+>                        SYNTAX_TREE(x);
+>                        fi;
+>                    od; 
+>                od;
+>            fi;
+>        fi;
+> od;;
+
+#