From f30fd9c47b1ae7a48f4854c86b3ad5e038845aa3 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Sun, 14 Feb 2016 01:50:47 -0600 Subject: [PATCH] Don't consider empty strings or strings beginning with numbers as variable names. --- nix-repl.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix-repl.cc b/nix-repl.cc index 5c319f068..1077f5d8f 100644 --- a/nix-repl.cc +++ b/nix-repl.cc @@ -250,8 +250,9 @@ static int runProgram(const string & program, const Strings & args) bool isVarName(const string & s) { - if (s.size() > 0 && (s[0] == '-' || s[0] == '\'')) - return false; + 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') ||