Changeset 2123

Timestamp:

06/24/09 08:41:56 (15 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: A duplicate enum error produces an internal error/exception rather than a useful error message.
reported-by:webnov8

Location:

cobra/trunk

Files:

• Source/CobraParser.cobra (modified) (2 diffs)
• Tests/100-basics/320-enums-errors.cobra (added)

cobra/trunk/Source/CobraParser.cobra

@@ -977 +977 @@
                 docString = .docString
                 enumMembers = List<of EnumMember>()
+                nameSet = Set<of String>()
                 while .peek.which <> 'DEDENT'
                         .zeroOrMore('EOL')
@@ -986 +987 @@
                                 enumValue = nil
                         .endOfLine
-                        enumMembers.add(EnumMember(enumNameToken, enumValue))
-                        # TODO: check for repeated names
+                        if enumNameToken.text in nameSet
+                                .recordError(enumNameToken, 'Already defined "[enumNameToken.text]" earlier.')
+                        else
+                                enumMembers.add(EnumMember(enumNameToken, enumValue))
+                                nameSet.add(enumNameToken.text)
                         # TODO: check for values that repeat or go backwards
                 .dedent