Updates for issue #219

Changed utilities to utils.
This commit is contained in:
Jeremiah C Leary 2019-03-23 07:43:53 -05:00
parent 74778a393d
commit f42e698c31
32 changed files with 71 additions and 71 deletions

View File

@ -2,7 +2,7 @@
This module contains functions for rules to fix issues.
'''
from vsg import line
from vsg import utilities
from vsg import utils
import re
@ -66,7 +66,7 @@ def lower_case(self, oLine, sKeyword):
sKeyword: (string)
'''
utilities.change_word(oLine, sKeyword, sKeyword.lower())
utils.change_word(oLine, sKeyword, sKeyword.lower())
def upper_case(self, oLine, sKeyword):
@ -82,10 +82,10 @@ def upper_case(self, oLine, sKeyword):
sKeyword: (string)
'''
if '(' in sKeyword:
sWord = utilities.remove_parenthesis_from_word(sKeyword)
utilities.change_word(oLine, sWord, sWord.upper())
sWord = utils.remove_parenthesis_from_word(sKeyword)
utils.change_word(oLine, sWord, sWord.upper())
else:
utilities.change_word(oLine, sKeyword, sKeyword.upper())
utils.change_word(oLine, sKeyword, sKeyword.upper())
def upper_case_with_parenthesis(self, oLine, sKeyword):

View File

@ -1,5 +1,5 @@
from vsg import utilities
from vsg import utils
class line():
@ -25,7 +25,7 @@ class line():
def __init__(self, line):
self.line = line
self.lineLower = line.lower()
self.lineNoComment = utilities.remove_comment(line)
self.lineNoComment = utils.remove_comment(line)
self.indentLevel = None
# Misc attributes
@ -224,7 +224,7 @@ class line():
'''
self.line = sLine
self.lineLower = sLine.lower()
self.lineNoComment = utilities.remove_comment(sLine)
self.lineNoComment = utils.remove_comment(sLine)
class blank_line(line):

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -25,4 +25,4 @@ class rule_006(rule.rule):
for iLineNumber in self.violations:
oLine = oFile.lines[iLineNumber]
oLine.update_line(re.sub(r'^(\s*architecture\s+\w+\s+of\s+\w+)', r'\1 is', oLine.line, re.IGNORECASE))
utilities.search_for_and_remove_keyword(oFile, iLineNumber, 'is')
utils.search_for_and_remove_keyword(oFile, iLineNumber, 'is')

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -20,8 +20,8 @@ class rule_012(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_after_word(oFile, iLineNumber, '=>')
utils.split_line_after_word(oFile, iLineNumber, '=>')
oFile.lines[iLineNumber + 1].isCaseWhenEnd = False
oFile.lines[iLineNumber + 1].insideCaseWhen = False
oFile.lines[iLineNumber + 1].indentLevel += 1
utilities.reclassify_line(oFile, iLineNumber)
utils.reclassify_line(oFile, iLineNumber)

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -26,4 +26,4 @@ class rule_005(rule.rule):
for iLineNumber in self.violations:
oLine = oFile.lines[iLineNumber]
oLine.update_line(re.sub(r'^(\s*entity\s+\w+)', r'\1 is', oLine.line, re.IGNORECASE))
utilities.search_for_and_remove_keyword(oFile, iLineNumber, 'is')
utils.search_for_and_remove_keyword(oFile, iLineNumber, 'is')

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_009(rule.rule):
@ -19,7 +19,7 @@ class rule_009(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.copy_line(oFile, iLineNumber)
utils.copy_line(oFile, iLineNumber)
oLine = oFile.lines[iLineNumber]
oLine.update_line(oLine.line.split('(')[0] + '(')
oLine.isFunctionParameter = False

View File

@ -1,7 +1,7 @@
from vsg import rule
from vsg import line
from vsg import utilities
from vsg import utils
import re
@ -22,7 +22,7 @@ class rule_010(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
oFile.lines[iLineNumber].line = utilities.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].line = utils.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].isEndGenericMap = False
oFile.lines.insert(iLineNumber + 1, line.line(' );'))
oFile.lines[iLineNumber + 1].isEndGenericMap = True

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_013(rule.rule):
@ -19,7 +19,7 @@ class rule_013(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.copy_line(oFile, iLineNumber)
utils.copy_line(oFile, iLineNumber)
oLine = oFile.lines[iLineNumber]
oLine.update_line(oLine.line.split('(')[0] + ' (')
oLine.isGenericDeclaration = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -24,4 +24,4 @@ class rule_016(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
for i in range(0, oFile.lines[iLineNumber].line.count(';')):
utilities.split_line_after_word(oFile, iLineNumber + i, ';')
utils.split_line_after_word(oFile, iLineNumber + i, ';')

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import check
from vsg import fix
from vsg import utilities
from vsg import utils
class rule_017(rule.rule):
@ -22,7 +22,7 @@ class rule_017(rule.rule):
sLine = oLine.line.split(':')[1].lstrip()
if '(' in sLine:
sLine = sLine.split('(')[0].rstrip()
if utilities.is_vhdl_keyword(sLine.split()[0]):
if utils.is_vhdl_keyword(sLine.split()[0]):
check.is_lowercase(self, sLine.split()[0], iLineNumber)
def _fix_violations(self, oFile):

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -21,7 +21,7 @@ class rule_020(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_before_word(oFile, iLineNumber, 'end')
utils.split_line_before_word(oFile, iLineNumber, 'end')
oFile.lines[iLineNumber].isEndIfKeyword = False
oFile.lines[iLineNumber].isLastEndIf = False
oFile.lines[iLineNumber + 1].isIfKeyword = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -23,7 +23,7 @@ class rule_021(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_before_word(oFile, iLineNumber, 'else')
utils.split_line_before_word(oFile, iLineNumber, 'else')
oFile.lines[iLineNumber].isElseKeyword = False
oFile.lines[iLineNumber + 1].isIfKeyword = False
oFile.lines[iLineNumber + 1].isElseIfKeyword = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -21,12 +21,12 @@ class rule_022(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_after_word(oFile, iLineNumber, 'else')
utils.split_line_after_word(oFile, iLineNumber, 'else')
oFile.lines[iLineNumber + 1].isElseKeyword = False
oFile.lines[iLineNumber].isIfKeyword = False
oFile.lines[iLineNumber].isElseIfKeyword = False
oFile.lines[iLineNumber].isThenKeyword = False
oFile.lines[iLineNumber + 1].indentLevel += 1
oFile.lines[iLineNumber].isLastEndIf = False
utilities.reclassify_line(oFile, iLineNumber)
utils.reclassify_line(oFile, iLineNumber)
oFile.lines[iLineNumber + 1].isFirstIf = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -21,7 +21,7 @@ class rule_023(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_before_word(oFile, iLineNumber, 'elsif')
utils.split_line_before_word(oFile, iLineNumber, 'elsif')
oFile.lines[iLineNumber].isLastEndIf = False
oFile.lines[iLineNumber].isElseIfKeyword = False
oFile.lines[iLineNumber + 1].isIfKeyword = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -23,7 +23,7 @@ class rule_024(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_after_word(oFile, iLineNumber, 'then')
utils.split_line_after_word(oFile, iLineNumber, 'then')
oFile.lines[iLineNumber].isEndIfKeyword = False
oFile.lines[iLineNumber].isElseKeyword = False
oFile.lines[iLineNumber + 1].isThenKeyword = False
@ -31,5 +31,5 @@ class rule_024(rule.rule):
oFile.lines[iLineNumber + 1].isElseIfKeyword = False
oFile.lines[iLineNumber + 1].indentLevel += 1
oFile.lines[iLineNumber].isLastEndIf = False
utilities.reclassify_line(oFile, iLineNumber)
utils.reclassify_line(oFile, iLineNumber)
oFile.lines[iLineNumber + 1].isFirstIf = False

View File

@ -1,7 +1,7 @@
from vsg import rule
from vsg import line
from vsg import utilities
from vsg import utils
class rule_007(rule.rule):
@ -22,7 +22,7 @@ class rule_007(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
oFile.lines[iLineNumber].line = utilities.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].line = utils.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].isInstantiationPortEnd = False
oFile.lines.insert(iLineNumber + 1, line.line(' );'))
oFile.lines[iLineNumber + 1].isInstantiationPortAssignement = False

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import fix
from vsg import check
from vsg import utilities
from vsg import utils
class rule_011(rule.rule):
@ -19,7 +19,7 @@ class rule_011(rule.rule):
def _analyze(self, oFile, oLine, iLineNumber):
if oLine.isInstantiationPortAssignment and not oLine.isInstantiationPortKeyword:
sWord = utilities.remove_parenthesis_from_word(oLine.line.split()[0])
sWord = utils.remove_parenthesis_from_word(oLine.line.split()[0])
check.is_uppercase(self, sWord, iLineNumber)
def _fix_violations(self, oFile):

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_017(rule.rule):
@ -21,7 +21,7 @@ class rule_017(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.copy_line(oFile, iLineNumber)
utils.copy_line(oFile, iLineNumber)
oLine = oFile.lines[iLineNumber]
oLine.update_line(oLine.line.split('(')[0] + ' (')
oLine.isInstantiationGenericAssignment = False

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_020(rule.rule):
@ -21,7 +21,7 @@ class rule_020(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_after_word(oFile, iLineNumber, '(')
utils.split_line_after_word(oFile, iLineNumber, '(')
oFile.lines[iLineNumber].isInstantiationPortAssignment = False
oFile.lines[iLineNumber + 1].isInstantiationPortKeyword = False
oFile.lines[iLineNumber + 1].indentLevel += 1

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import fix
from vsg import check
from vsg import utilities
from vsg import utils
class lower_case_rule(rule.rule):
@ -45,7 +45,7 @@ class lower_case_rule(rule.rule):
if oLine.__dict__[self.sTrigger]:
lLine = oLine.lineNoComment.split()
for sCurrentWord in lLine:
if self.sWord == utilities.strip_semicolon_from_word(sCurrentWord.lower()):
if self.sWord == utils.strip_semicolon_from_word(sCurrentWord.lower()):
check.is_lowercase(self, sCurrentWord, iLineNumber)
def _fix_violations(self, oFile):

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import fix
from vsg import check
from vsg import utilities
from vsg import utils
import re
@ -40,7 +40,7 @@ class lowercase_word_after_colon_rule(rule.rule):
if oLine.__dict__[self.sTrigger] and re.match('^.*:\s*\w', oLine.lineLower):
sLine = oLine.line.split(':')[1].lstrip().split()[0].split('(')[0]
if self.bVhdlKeyword:
if utilities.is_vhdl_keyword(sLine):
if utils.is_vhdl_keyword(sLine):
self.dVars[iLineNumber] = sLine
check.is_lowercase(self, sLine, iLineNumber)
else:

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -21,7 +21,7 @@ class rule_016(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.copy_line(oFile, iLineNumber)
utils.copy_line(oFile, iLineNumber)
oLine = oFile.lines[iLineNumber]
oLine.update_line(oLine.line.split('(')[0] + ' (')
oLine = oFile.lines[iLineNumber + 1]

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import check
from vsg import fix
from vsg import utilities
from vsg import utils
class rule_018(rule.rule):
@ -23,9 +23,9 @@ class rule_018(rule.rule):
sLine = oLine.line.split(':')[1]
if '(' in sLine:
sLine = sLine.split('(')[0]
if not utilities.is_port_mode(sLine.split()[0]):
if not utils.is_port_mode(sLine.split()[0]):
continue
if utilities.is_vhdl_keyword(sLine.split()[1]):
if utils.is_vhdl_keyword(sLine.split()[1]):
check.is_lowercase(self, sLine.split()[1], iLineNumber)
def _fix_violations(self, oFile):

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -23,4 +23,4 @@ class rule_021(rule.rule):
for iLineNumber in self.violations[::-1]:
oLine = oFile.lines[iLineNumber]
oLine.update_line(re.sub('port', 'port (', oLine.line, 1, re.IGNORECASE))
utilities.search_for_and_remove_keyword(oFile, iLineNumber, '\(')
utils.search_for_and_remove_keyword(oFile, iLineNumber, '\(')

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_023(rule.rule):
@ -19,5 +19,5 @@ class rule_023(rule.rule):
sLine = oLine.line.split(':')[1]
if '(' in sLine:
sLine = sLine.split('(')[0]
if not utilities.is_port_mode(sLine.split()[0]):
if not utils.is_port_mode(sLine.split()[0]):
self.add_violation(iLineNumber)

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
from vsg import fix
from vsg import check
@ -19,7 +19,7 @@ class rule_004(rule.rule):
def _analyze(self, oFile, oLine, iLineNumber):
if oLine.isProcessBegin:
check.is_lowercase(self, utilities.get_first_word(oLine), iLineNumber)
check.is_lowercase(self, utils.get_first_word(oLine), iLineNumber)
def _fix_violations(self, oFile):
for iLineNumber in self.violations:

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -26,4 +26,4 @@ class search_for_and_replace_keyword_rule(rule.rule):
for iLineNumber in self.violations[::-1]:
oLine = oFile.lines[iLineNumber]
oLine.update_line(re.sub('' + self.sKeyword2, '' + self.sKeyword2 + ' ' + self.sKeyword, oLine.line, 1, re.IGNORECASE))
utilities.search_for_and_remove_keyword(oFile, iLineNumber, '\(')
utils.search_for_and_remove_keyword(oFile, iLineNumber, '\(')

View File

@ -1,7 +1,7 @@
from vsg import rule
from vsg import line
from vsg import utilities
from vsg import utils
import re
@ -23,7 +23,7 @@ class rule_008(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
oFile.lines[iLineNumber].line = utilities.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].line = utils.remove_closing_parenthesis_and_semicolon(oFile.lines[iLineNumber].line)
oFile.lines[iLineNumber].isTypeEnd = False
oFile.lines[iLineNumber].isTypeEnumeratedEnd = False
oFile.lines.insert(iLineNumber + 1, line.line(' );'))

View File

@ -1,6 +1,6 @@
from vsg import rule
from vsg import utilities
from vsg import utils
import re
@ -22,7 +22,7 @@ class rule_009(rule.rule):
def _fix_violations(self, oFile):
for iLineNumber in self.violations[::-1]:
utilities.split_line_after_word(oFile, iLineNumber, '(')
utils.split_line_after_word(oFile, iLineNumber, '(')
oLine = oFile.lines[iLineNumber + 1]
oLine.isTypeKeyword = False
oLine.isTypeEnumeratedKeyword = False

View File

@ -2,7 +2,7 @@
from vsg import rule
from vsg import fix
from vsg import check
from vsg import utilities
from vsg import utils
class uppercase_word_rule(rule.rule):
@ -34,7 +34,7 @@ class uppercase_word_rule(rule.rule):
def _analyze(self, oFile, oLine, iLineNumber):
if oLine.__dict__[self.sTrigger]:
sWord = utilities.remove_parenthesis_from_word(oLine.line.split()[self.iIndex])
sWord = utils.remove_parenthesis_from_word(oLine.line.split()[self.iIndex])
check.is_uppercase(self, sWord, iLineNumber)
def _fix_violations(self, oFile):

View File

@ -2,7 +2,7 @@
import re
from vsg import rule
from vsg import utilities
from vsg import utils
class rule_001(rule.rule):
@ -23,6 +23,6 @@ class rule_001(rule.rule):
for iLineNumber in self.violations:
oPreviousLine = oFile.lines[iLineNumber - 1]
oLine = oFile.lines[iLineNumber]
iIndex = utilities.end_of_line_index(oPreviousLine)
iIndex = utils.end_of_line_index(oPreviousLine)
oPreviousLine.update_line(oPreviousLine.line[:iIndex] + ' else' + oPreviousLine.line[iIndex:])
utilities.clear_keyword_from_line(oLine, 'else')
utils.clear_keyword_from_line(oLine, 'else')