From ac68840e79ce74f05ee8b31bb1d528c98b9c7f76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 19 Nov 2003 11:35:41 +0000
Subject: [PATCH] * Refactoring: put the Nix expression evaluator in its own
 library so   that it can be used by multiple programs.

---
 configure.ac                                 | 2 +-
 src/Makefile.am                              | 3 ++-
 src/{nix-instantiate => libexpr}/Makefile.am | 0
 src/{nix-instantiate => libexpr}/eval.cc     | 0
 src/{nix-instantiate => libexpr}/eval.hh     | 0
 src/{nix-instantiate => libexpr}/fix-expr.cc | 0
 src/{nix-instantiate => libexpr}/fix-expr.hh | 0
 src/{nix-instantiate => libexpr}/main.cc     | 0
 src/{nix-instantiate => libexpr}/nix.sdf     | 0
 src/{nix-instantiate => libexpr}/nixexpr.cc  | 0
 src/{nix-instantiate => libexpr}/nixexpr.hh  | 0
 src/{nix-instantiate => libexpr}/parser.cc   | 0
 src/{nix-instantiate => libexpr}/parser.hh   | 0
 src/{nix-instantiate => libexpr}/primops.cc  | 0
 src/{nix-instantiate => libexpr}/primops.hh  | 0
 15 files changed, 3 insertions(+), 2 deletions(-)
 rename src/{nix-instantiate => libexpr}/Makefile.am (100%)
 rename src/{nix-instantiate => libexpr}/eval.cc (100%)
 rename src/{nix-instantiate => libexpr}/eval.hh (100%)
 rename src/{nix-instantiate => libexpr}/fix-expr.cc (100%)
 rename src/{nix-instantiate => libexpr}/fix-expr.hh (100%)
 rename src/{nix-instantiate => libexpr}/main.cc (100%)
 rename src/{nix-instantiate => libexpr}/nix.sdf (100%)
 rename src/{nix-instantiate => libexpr}/nixexpr.cc (100%)
 rename src/{nix-instantiate => libexpr}/nixexpr.hh (100%)
 rename src/{nix-instantiate => libexpr}/parser.cc (100%)
 rename src/{nix-instantiate => libexpr}/parser.hh (100%)
 rename src/{nix-instantiate => libexpr}/primops.cc (100%)
 rename src/{nix-instantiate => libexpr}/primops.hh (100%)

diff --git a/configure.ac b/configure.ac
index 1fa6e1d33f..09e292e1b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_FILES([Makefile
    src/libmain/Makefile
    src/nix-store/Makefile
    src/nix-hash/Makefile
-   src/nix-instantiate/Makefile
+   src/libexpr/Makefile
    scripts/Makefile
    corepkgs/Makefile
    corepkgs/fetchurl/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f2aafcdba..f06bb1f1d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash nix-instantiate
+SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \
+ libexpr #nix-instantiate
diff --git a/src/nix-instantiate/Makefile.am b/src/libexpr/Makefile.am
similarity index 100%
rename from src/nix-instantiate/Makefile.am
rename to src/libexpr/Makefile.am
diff --git a/src/nix-instantiate/eval.cc b/src/libexpr/eval.cc
similarity index 100%
rename from src/nix-instantiate/eval.cc
rename to src/libexpr/eval.cc
diff --git a/src/nix-instantiate/eval.hh b/src/libexpr/eval.hh
similarity index 100%
rename from src/nix-instantiate/eval.hh
rename to src/libexpr/eval.hh
diff --git a/src/nix-instantiate/fix-expr.cc b/src/libexpr/fix-expr.cc
similarity index 100%
rename from src/nix-instantiate/fix-expr.cc
rename to src/libexpr/fix-expr.cc
diff --git a/src/nix-instantiate/fix-expr.hh b/src/libexpr/fix-expr.hh
similarity index 100%
rename from src/nix-instantiate/fix-expr.hh
rename to src/libexpr/fix-expr.hh
diff --git a/src/nix-instantiate/main.cc b/src/libexpr/main.cc
similarity index 100%
rename from src/nix-instantiate/main.cc
rename to src/libexpr/main.cc
diff --git a/src/nix-instantiate/nix.sdf b/src/libexpr/nix.sdf
similarity index 100%
rename from src/nix-instantiate/nix.sdf
rename to src/libexpr/nix.sdf
diff --git a/src/nix-instantiate/nixexpr.cc b/src/libexpr/nixexpr.cc
similarity index 100%
rename from src/nix-instantiate/nixexpr.cc
rename to src/libexpr/nixexpr.cc
diff --git a/src/nix-instantiate/nixexpr.hh b/src/libexpr/nixexpr.hh
similarity index 100%
rename from src/nix-instantiate/nixexpr.hh
rename to src/libexpr/nixexpr.hh
diff --git a/src/nix-instantiate/parser.cc b/src/libexpr/parser.cc
similarity index 100%
rename from src/nix-instantiate/parser.cc
rename to src/libexpr/parser.cc
diff --git a/src/nix-instantiate/parser.hh b/src/libexpr/parser.hh
similarity index 100%
rename from src/nix-instantiate/parser.hh
rename to src/libexpr/parser.hh
diff --git a/src/nix-instantiate/primops.cc b/src/libexpr/primops.cc
similarity index 100%
rename from src/nix-instantiate/primops.cc
rename to src/libexpr/primops.cc
diff --git a/src/nix-instantiate/primops.hh b/src/libexpr/primops.hh
similarity index 100%
rename from src/nix-instantiate/primops.hh
rename to src/libexpr/primops.hh