Revert "Updates for issue #312:"

This reverts commit d4ca015.

vsg/tests/line/test_token_method.py

@@ -366,117 +366,3 @@ def test_plus_without_spaces_with_plus_at_beginning_of_line(self):
         lTokens.append('+')
 
         self.assertEqual(lTokens, oLine.tokens)
-
-    def test_colon_equal_without_spaces_with_one_at_beginning_of_line(self):
-        sString = ':=this:=will:=test:=colons:='
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append(':=')
-        lTokens.append('this')
-        lTokens.append(':=')
-        lTokens.append('will')
-        lTokens.append(':=')
-        lTokens.append('test')
-        lTokens.append(':=')
-        lTokens.append('colons')
-        lTokens.append(':=')
-
-        self.assertEqual(lTokens, oLine.tokens)
-
-    def test_star_star_without_spaces_with_one_at_beginning_of_line(self):
-        sString = '**this**will**test**colons**'
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append('**')
-        lTokens.append('this')
-        lTokens.append('**')
-        lTokens.append('will')
-        lTokens.append('**')
-        lTokens.append('test')
-        lTokens.append('**')
-        lTokens.append('colons')
-        lTokens.append('**')
-
-        self.assertEqual(lTokens, oLine.tokens)
-
-    def test_not_equal_without_spaces_with_one_at_beginning_of_line(self):
-        sString = '\=this\=will\=test\=colons\='
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append('\=')
-        lTokens.append('this')
-        lTokens.append('\=')
-        lTokens.append('will')
-        lTokens.append('\=')
-        lTokens.append('test')
-        lTokens.append('\=')
-        lTokens.append('colons')
-        lTokens.append('\=')
-
-        self.assertEqual(lTokens, oLine.tokens)
-
-    def test_lessthan_equal_without_spaces_with_one_at_beginning_of_line(self):
-        sString = '<=this<=will<=test<=colons<='
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append('<=')
-        lTokens.append('this')
-        lTokens.append('<=')
-        lTokens.append('will')
-        lTokens.append('<=')
-        lTokens.append('test')
-        lTokens.append('<=')
-        lTokens.append('colons')
-        lTokens.append('<=')
-
-        self.assertEqual(lTokens, oLine.tokens)
-
-    def test_equal_greaterthan_without_spaces_with_one_at_beginning_of_line(self):
-        sString = '=>this=>will=>test=>colons=>'
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append('=>')
-        lTokens.append('this')
-        lTokens.append('=>')
-        lTokens.append('will')
-        lTokens.append('=>')
-        lTokens.append('test')
-        lTokens.append('=>')
-        lTokens.append('colons')
-        lTokens.append('=>')
-
-        self.assertEqual(lTokens, oLine.tokens)
-
-    def test_greaterthan_equal_without_spaces_with_one_at_beginning_of_line(self):
-        sString = '>=this>=will>=test>=colons>='
-        oLine = line.line(sString)
-        self.assertTrue(oLine)
-        self.assertEqual(sString, oLine.line)
-
-        lTokens = []
-        lTokens.append('>=')
-        lTokens.append('this')
-        lTokens.append('>=')
-        lTokens.append('will')
-        lTokens.append('>=')
-        lTokens.append('test')
-        lTokens.append('>=')
-        lTokens.append('colons')
-        lTokens.append('>=')
-
-        self.assertEqual(lTokens, oLine.tokens)

vsg/tokens.py

@@ -1,6 +1,5 @@
 
-lSingleCharacterSymbols = [',', ':', '(', ')', '\'', '"', '+', '&', '-', '*', '/', '<', '>']
-lMultipleCharacterSymbols = [':=', '\=', '<=', '=>', '>=', '**']
+lSingleCharacterSymbols = [',', ':', '(', ')', '\'', '"', '+']
 
 def create(sString):
     '''
@@ -9,49 +8,24 @@ def create(sString):
     lReturn = []
     sToken = ''
     fCommentFound = False
-    fMultipleCharacterSymbolFound = False
-    fLastChar = False
     for iIndex, sChar in enumerate(sString):
-        if iIndex + 1 == len(sString):
-            fLastChar = True
-            sNextChar = ''
-        else:
-            sNextChar = sString[iIndex + 1]
-
         if len(sToken) == 0:
             sToken = sChar
-            if sChar == '-' and sNextChar == '-':
+            if sChar == '-' and sString[iIndex + 1] == '-':
                 fCommentFound = True
                 continue
-            if sChar + sNextChar in lMultipleCharacterSymbols:
-                fMultipleCharacterSymbolFound = True
-                sToken = sChar
-                continue
             if sChar in lSingleCharacterSymbols:
                 lReturn.append(sToken)
                 sToken = ''
         else:
             # Handle comments
-            if sChar == '-' and sNextChar == '-':
+            if sChar == '-' and sString[iIndex + 1] == '-':
                 fCommentFound = True
                 lReturn.append(sToken)
                 sToken = ''
             if fCommentFound:
                 sToken += sChar
                 continue
-            # Handle multiple character symbols
-            if fMultipleCharacterSymbolFound:
-                fMultipleCharacterSymbolFound = False
-                sToken += sChar
-                lReturn.append(sToken)
-                sToken = ''
-                continue
-            if not fLastChar:
-                if sChar + sNextChar in lMultipleCharacterSymbols:
-                    fMultipleCharacterSymbolFound = True
-                    lReturn.append(sToken)
-                    sToken = sChar
-                    continue
             if sChar in lSingleCharacterSymbols:
                 lReturn.append(sToken)
                 lReturn.append(sChar)