Merge pull request #96 from jcohen28/patch-1

Fix tokenize with number as first char

Author: pombredanne

CHANGELOG.rst

@@ -7,6 +7,16 @@ next
 ----
 
 
+3.8 (2020-06-10)
+----------------
+
+* No API changes
+
+* Bug fixes
+
+ * Fix parsing of tokens that have a number as the first character
+
+
 3.7 (2019-10-04)
 ----------------
 

boolean/boolean.py

@@ -461,7 +461,7 @@ def tokenize(self, expr):
         while position < length:
             tok = expr[position]
 
-            sym = tok.isalpha() or tok == '_'
+            sym = tok.isalnum() or tok == '_'
             if sym:
                 position += 1
                 while position < length:

boolean/test_boolean.py

@@ -1079,6 +1079,8 @@ def test_parse(self):
         self.assertEqual(algebra.parse('a&(a|~b)', simplify=True), (a & (a | ~b)).simplify())
         self.assertEqual(algebra.parse('(a&b)|(b&((c|a)&(b|(c&a))))', simplify=True), ((a & b) | (b & ((c | a) & (b | (c & a))))).simplify())
         self.assertEqual(algebra.parse('(a&b)|(b&((c|a)&(b|(c&a))))', simplify=True), algebra.parse('a&b | b&(c|a)&(b|c&a)', simplify=True))
+        self.assertEqual(algebra.parse('1abc'), algebra.Symbol('1abc'))
+        self.assertEqual(algebra.parse('_abc'), algebra.Symbol('_abc'))
 
     def test_subs(self):
         algebra = BooleanAlgebra()