Token: Allow dollar sign in identifiers

danmar · danmar · commit a65ae3ce2e80 · 2016-07-29T13:42:11.000+02:00
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -65,7 +65,7 @@ void Token::update_property_info()
     if (!_str.empty()) {
         if (_str == "true" || _str == "false")
             _tokType = eBoolean;
-        else if (_str[0] == '_' || std::isalpha((unsigned char)_str[0])) { // Name
+        else if (std::isalpha((unsigned char)_str[0]) || _str[0] == '_' || _str[0] == '$') { // Name
             if (_varId)
                 _tokType = eVariable;
             else if (_tokType != eVariable && _tokType != eFunction && _tokType != eType && _tokType != eKeyword)
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
@@ -85,6 +85,7 @@ class TestToken : public TestFixture {
         TEST_CASE(isNameGuarantees3)
         TEST_CASE(isNameGuarantees4)
         TEST_CASE(isNameGuarantees5)
+        TEST_CASE(isNameGuarantees6)
 
         TEST_CASE(canFindMatchingBracketsNeedsOpen);
         TEST_CASE(canFindMatchingBracketsInnerPair);
@@ -888,6 +889,11 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(false, tok.isNumber());
     }
 
+    void isNameGuarantees6() const {
+        Token tok(nullptr);
+        tok.str("$f");
+        ASSERT_EQUALS(true, tok.isName());
+    }
 
     void canFindMatchingBracketsNeedsOpen() const {
         givenACodeSampleToTokenize var("std::deque<std::set<int> > intsets;");
