From d5d4dcd4c988363beb2bb408ac31750e4c027176 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 13 Jul 2011 15:53:24 +0000
Subject: [PATCH] * Allow attribute names to be strings.  Based on the  
 allow-arbitrary-strinsg-in-names patch by Marc Weber.

---
 src/libexpr/parser.y                          |  2 ++
 .../lang/eval-okay-strings-as-attrs-names.exp |  1 +
 .../lang/eval-okay-strings-as-attrs-names.nix | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/lang/eval-okay-strings-as-attrs-names.exp
 create mode 100644 tests/lang/eval-okay-strings-as-attrs-names.nix

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index ec194a516a..e5c586266f 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -411,6 +411,8 @@ attrpath
 attr
   : ID { $$ = $1; }
   | OR_KW { $$ = "or"; }
+  | '"' STR '"'
+    { $$ = strdup(((string) ((ExprString *) $2)->s).c_str()); delete $2; }
   ;
 
 expr_list
diff --git a/tests/lang/eval-okay-strings-as-attrs-names.exp b/tests/lang/eval-okay-strings-as-attrs-names.exp
new file mode 100644
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/tests/lang/eval-okay-strings-as-attrs-names.exp
@@ -0,0 +1 @@
+true
diff --git a/tests/lang/eval-okay-strings-as-attrs-names.nix b/tests/lang/eval-okay-strings-as-attrs-names.nix
new file mode 100644
index 0000000000..5e40928dbe
--- /dev/null
+++ b/tests/lang/eval-okay-strings-as-attrs-names.nix
@@ -0,0 +1,20 @@
+let
+
+  attr = {
+    "key 1" = "test";
+    "key 2" = "caseok";
+  };
+
+  t1 = builtins.getAttr "key 1" attr;
+  t2 = attr."key 2";
+  t3 = attr ? "key 1";
+  t4 = builtins.attrNames { inherit (attr) "key 1"; };
+
+  # This is permitted, but there is currently no way to reference this
+  # variable.
+  "foo bar" = 1;
+
+in t1 == "test"
+   && t2 == "caseok"
+   && t3 == true
+   && t4 == ["key 1"]