From 215ec2ddc6088be2291722a544c6ab5a1b00a5a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Aug 2006 14:34:29 +0000 Subject: [PATCH] * New primop __toXML (or builtins.toXML) to convert an expression to an XML representation stored in a string. This should be useful to pass structured information to builders. --- src/libexpr/primops.cc | 10 ++++++++++ tests/lang/eval-okay-to-xml.exp | 1 + tests/lang/eval-okay-to-xml.nix | 1 + 3 files changed, 12 insertions(+) create mode 100644 tests/lang/eval-okay-to-xml.exp create mode 100644 tests/lang/eval-okay-to-xml.nix diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 3d8d9b8ad..d82cc5870 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -5,6 +5,7 @@ #include "eval.hh" #include "globals.hh" #include "nixexpr-ast.hh" +#include "expr-to-xml.hh" static Expr primBuiltins(EvalState & state, const ATermVector & args) @@ -457,6 +458,14 @@ static Expr primToString(EvalState & state, const ATermVector & args) } +static Expr primToXML(EvalState & state, const ATermVector & args) +{ + ostringstream out; + printTermAsXML(strictEvalExpr(state, args[0]), out); + return makeStr(toATerm(out.str())); +} + + /* Boolean constructors. */ static Expr primTrue(EvalState & state, const ATermVector & args) { @@ -705,6 +714,7 @@ void EvalState::addPrimOps() addPrimOp("baseNameOf", 1, primBaseNameOf); addPrimOp("dirOf", 1, primDirOf); addPrimOp("toString", 1, primToString); + addPrimOp("__toXML", 1, primToXML); addPrimOp("isNull", 1, primIsNull); addPrimOp("dependencyClosure", 1, primDependencyClosure); addPrimOp("abort", 1, primAbort); diff --git a/tests/lang/eval-okay-to-xml.exp b/tests/lang/eval-okay-to-xml.exp new file mode 100644 index 000000000..ee7d4c7d3 --- /dev/null +++ b/tests/lang/eval-okay-to-xml.exp @@ -0,0 +1 @@ +Str("\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n") diff --git a/tests/lang/eval-okay-to-xml.nix b/tests/lang/eval-okay-to-xml.nix new file mode 100644 index 000000000..ff1791b30 --- /dev/null +++ b/tests/lang/eval-okay-to-xml.nix @@ -0,0 +1 @@ +builtins.toXML [("a" + "b") 10 (rec {x = "x"; y = x;})]