Merge pull request #16 from tsion/dashed-assign

Improve variable name parsing for assignments.
NixOS · Feb 15, 2016 · dc8b517 · dc8b517
2 parents 8a2f5f0 + f30fd9c
commit dc8b517
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/nix-repl.cc b/nix-repl.cc
@@ -250,12 +250,14 @@ static int runProgram(const string & program, const Strings & args)
 
 bool isVarName(const string & s)
 {
-    // FIXME: not quite correct.
+    if (s.size() == 0) return false;
+    char c = s[0];
+    if ((c >= '0' && c <= '9') || c == '-' || c == '\'') return false;
     for (auto & i : s)
         if (!((i >= 'a' && i <= 'z') ||
               (i >= 'A' && i <= 'Z') ||
               (i >= '0' && i <= '9') ||
-              i == '_' || i == '\''))
+              i == '_' || i == '-' || i == '\''))
             return false;
     return true;
 }