From 41fc880100df2c6bc52fffc8dbc823a494741f6b Mon Sep 17 00:00:00 2001 From: Jeremiah C Leary Date: Tue, 5 Feb 2019 17:29:21 -0600 Subject: [PATCH] Updates for issue #199 Adding generate_012 rule: 1) Added test 2) Added rule --- vsg/rules/generate/__init__.py | 1 + vsg/rules/generate/rule_012.py | 27 ++++++++++++++++++++ vsg/tests/generate/generate_test_input.vhd | 2 +- vsg/tests/generate/test_fix_rule_generate.py | 8 ++++++ vsg/tests/generate/test_rule_generate.py | 10 ++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 vsg/rules/generate/rule_012.py diff --git a/vsg/rules/generate/__init__.py b/vsg/rules/generate/__init__.py index 395595ca..72f26790 100644 --- a/vsg/rules/generate/__init__.py +++ b/vsg/rules/generate/__init__.py @@ -10,3 +10,4 @@ from .rule_008 import rule_008 from .rule_009 import rule_009 from .rule_010 import rule_010 from .rule_011 import rule_011 +from .rule_012 import rule_012 diff --git a/vsg/rules/generate/rule_012.py b/vsg/rules/generate/rule_012.py new file mode 100644 index 00000000..bb4adddd --- /dev/null +++ b/vsg/rules/generate/rule_012.py @@ -0,0 +1,27 @@ + +from vsg import rule +from vsg import fix +from vsg import check + +import re + + +class rule_012(rule.rule): + ''' + Generate rule 012 checks the "end generate" label is uppercase. + ''' + + def __init__(self): + rule.rule.__init__(self, 'generate', '012') + self.solution = 'Uppercase the label.' + self.phase = 6 + + def analyze(self, oFile): + for iLineNumber, oLine in enumerate(oFile.lines): + if oLine.isGenerateEnd and re.match('^\s*\w+\s+\w+\s+\w+', oLine.line): + check.is_uppercase(self, oLine.line.split()[2], iLineNumber) + + def _fix_violations(self, oFile): + for iLineNumber in self.violations: + lLine = oFile.lines[iLineNumber].line.split() + fix.upper_case(self, oFile.lines[iLineNumber], lLine[2]) diff --git a/vsg/tests/generate/generate_test_input.vhd b/vsg/tests/generate/generate_test_input.vhd index 5da3593e..21d5a802 100644 --- a/vsg/tests/generate/generate_test_input.vhd +++ b/vsg/tests/generate/generate_test_input.vhd @@ -70,7 +70,7 @@ END GENERATE generate_1; GENERATE_3 : for i in 0 to 7 generate a <= b; - end generate GENERATE_3; + end generate generate_3; end generate GENERATE_2; diff --git a/vsg/tests/generate/test_fix_rule_generate.py b/vsg/tests/generate/test_fix_rule_generate.py index 8877b6fb..c2f85b09 100644 --- a/vsg/tests/generate/test_fix_rule_generate.py +++ b/vsg/tests/generate/test_fix_rule_generate.py @@ -62,3 +62,11 @@ class testFixRuleGenerateMethods(unittest.TestCase): self.assertEqual(self.oFile.lines[19].line, 'END generate generate_1;') self.assertEqual(self.oFile.lines[62].line, ' end generate GENERATE_1;') + def test_fix_rule_012(self): + oRule = generate.rule_012() + oRule.fix(self.oFile) + oRule.analyze(self.oFile) + self.assertEqual(oRule.violations, []) + self.assertEqual(self.oFile.lines[14].line, ' end generate GENERATE_1;') + self.assertEqual(self.oFile.lines[19].line, 'END GENERATE GENERATE_1;') + self.assertEqual(self.oFile.lines[73].line, ' end generate GENERATE_3;') diff --git a/vsg/tests/generate/test_rule_generate.py b/vsg/tests/generate/test_rule_generate.py index 7b99cd51..329e51a2 100644 --- a/vsg/tests/generate/test_rule_generate.py +++ b/vsg/tests/generate/test_rule_generate.py @@ -118,3 +118,13 @@ class testRuleGenerateMethods(unittest.TestCase): dExpected = [24] oRule.analyze(oFile) self.assertEqual(oRule.violations, dExpected) + + def test_rule_012(self): + oRule = generate.rule_012() + self.assertTrue(oRule) + self.assertEqual(oRule.name, 'generate') + self.assertEqual(oRule.identifier, '012') + + dExpected = [14,19,73] + oRule.analyze(oFile) + self.assertEqual(oRule.violations, dExpected)