Changeset 1573

Timestamp:

08/12/08 21:13:54 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Added partial classes.
ticket:10

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Attributes.cobra (modified) (1 diff)
• Source/Boxes.cobra (modified) (2 diffs)
• Source/CobraParser.cobra (modified) (7 diffs)
• Source/Container.cobra (modified) (1 diff)
• Source/Enums.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (3 diffs)
• Source/NameSpace.cobra (modified) (2 diffs)
• Tests/200-misc/820-partial (added)
• Tests/200-misc/820-partial/100-partial-class.cobra (added)
• Tests/200-misc/820-partial/110-partial-multi-file-1.cobra (added)
• Tests/200-misc/820-partial/112-partial-multi-file-2.cobra (added)
• Tests/200-misc/820-partial/120-partial-error-interface.cobra (added)
• Tests/200-misc/820-partial/122-partial-error-type-mismatch.cobra (added)
• Tests/200-misc/820-partial/124-partial-error-other-decl-not-partial.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
+
+* Added partial classes, a la C# and VB. This enables class (and struct) declarations to be split across files. This can be useful for organizing generated code or even manually written code based on purpose. ticket:10
+.code
+        # file Foo.cobra
+        class Foo
+                is partial
+                
+                var _name as String
+                
+                pro name from var
+        
+        # file Foo.gen.cobra
+        class Foo
+                is partial
+                
+                def generatedMethod
+                        pass
+
 
 * Added new comment markers /# ... #/ which can be used for block comments and inline comments. Block comments must start at the beginning of a line and can be used to comment out multiple lines of source. They can be nested. Inline comments also start with /# and end with #/, but within the same line. They can be used to comment out a portion of a line. Regular end of line comments are still available and still the norm.

cobra/trunk/Source/Attributes.cobra

@@ -94 +94 @@
                 return 'assembly'
 
+        get isNames as List<of String>
+                return List<of String>()
+
         get typeForIdentifier as IType? is override
                 assert false

cobra/trunk/Source/Boxes.cobra

@@ -281 +281 @@
                 _nextPrivateSerialNumber += 1
                 return n
+
+        def mergedIntoPartialBox(newBox as Box)
+                require
+                        newBox is not .parentBox
+                        newBox.name == .parentBox.name
+                body
+                        _parentBox = newBox
 
         get canAccessMemberForName as bool is override
@@ -568 +575 @@
                                 try
                                         if decl inherits BoxMember
-                                                if decl.box is not this
+                                                if decl.box is not this  # TODO: when does this happen
                                                         continue
                                         decl.bindInt

cobra/trunk/Source/CobraParser.cobra

@@ -526 +526 @@
                                         .throwError('Expecting use, assembly, namespace, class, interface or enum, but got [tok].[sugg]')
                                 if what
-                                        _nameSpaceAddDecl(_module.topNameSpace, what)
-                                if what inherits Box
-                                        assert what.parentNameSpace
+                                        what = _nameSpaceAddDecl(_module.topNameSpace, what)
+                                        if what inherits Box
+                                                assert what.parentNameSpace
                 finally
                         _nameSpaceStack.pop
@@ -691 +691 @@
                 """
                 if _validIsNames is nil
-                        _validIsNames = ['fake', 'shared', 'virtual', 'nonvirtual', 'override', 'new', 'public', 'protected', 'private', 'internal', 'abstract']
+                        _validIsNames = ['fake', 'shared', 'virtual', 'nonvirtual', 'override', 'new', 'public', 'protected', 'private', 'internal', 'abstract', 'partial']
                 names = List<of String>(_isNamesStack)
                 if .optional('IS') is nil
@@ -1028 +1028 @@
                 return firstNameSpace to !
 
-        def _nameSpaceAddDecl(ns as NameSpace, decl as INameSpaceMember)
-                if ns.declForName(decl.name)
-                        .throwError((decl to dynamic).token to IToken, 'The namespace "[ns.fullName]" already contains a declaration named "[decl.name]".')  # TODO: give an "error" for the location 
-                if ns.unifiedNameSpace.declForName(decl.name)
-                        .throwError((decl to dynamic).token to IToken, 'The namespace "[ns.fullName]" already contains a declaration named "[decl.name]" in another file.')  # TODO: give an "error" for the location 
+        def _nameSpaceAddDecl(ns as NameSpace, decl as INameSpaceMember) as INameSpaceMember
+                """
+                Adds the decl to the given namespace or throws an error for duplicate declarations.
+                Also, handles `partial` classes and structs.
+                Returns the same declaration, or in the case of `partial`, the original declaration.
+                """
+                # TODO: complain if inheritance or is-names are different. at least for inheritance, that needs to be done post-parsing
+                checkForDups = true
+                if 'partial' in decl.isNames
+                        if decl inherits Box
+                                if not (decl inherits Class or decl inherits Struct)
+                                        .throwError(decl.token, '[Utils.capped(decl.englishName)] cannot be "partial".')
+                                checkForDups = false
+                                otherDecl = ns.unifiedNameSpace.declForName(decl.name)
+                                if otherDecl
+                                        if otherDecl.getType is not decl.getType
+                                                .throwError(decl.token, 'The other partial declaration is a "[otherDecl.englishName]", not a "[decl.englishName]".')
+                                        if 'partial' not in otherDecl.isNames
+                                                .throwError(decl.token, 'The other declaration is not marked "partial".')
+                                        otherBox = otherDecl to Box  # will always work because of above checks
+                                        for memberDecl in decl.declsInOrder
+                                                overload = _overloadIfNeeded(otherBox, memberDecl.name)
+                                                if overload
+                                                        overload.addMember(memberDecl to BoxMember)
+                                                else
+                                                        otherBox.addDecl(memberDecl)
+                                                memberDecl.mergedIntoPartialBox(otherBox)
+                                        return otherDecl
+                        else
+                                .throwError(decl.token, '[Utils.capped(decl.englishName)] cannot be "partial".')
+                if checkForDups
+                        if ns.declForName(decl.name)
+                                .throwError((decl to dynamic).token to IToken, 'The namespace "[ns.fullName]" already contains a declaration named "[decl.name]".')  # TODO: give an "error" for the location 
+                        if ns.unifiedNameSpace.declForName(decl.name)
+                                .throwError((decl to dynamic).token to IToken, 'The namespace "[ns.fullName]" already contains a declaration named "[decl.name]" in another file.')  # TODO: give an "error" for the location 
                 ns.addDecl(decl)
+                return decl
 
         def bodiedBoxMemberDecls(box as Box)
@@ -1175 +1206 @@
                 if name == curBox.name or Utils.capped(name) == curBox.name
                         .throwError('Method names cannot be the same as their enclosing [curBox.englishName]. Use `def init` for creating an initializer/constructor or choose another name.')  # TODO list the enclosing types location
-                overload as MemberOverload?
-                other = curBox.declForName(name)
-                if other
-                        if other inherits MemberOverload
-                                overload = other
-                        else if other inherits AbstractMethod
-                                overload = MemberOverload(other)
-                                curBox.registerOverload(overload to !)
-                        else
-                                .throwError('There is already another class member with the name "[name]".')  # TODO list its location and possibly what it is
-                else
-                        other = curBox.declForName(name)  # TODO: should be a CI there for case-insensitive
-                        if other
-                                .throwError('There is already another class member with the name "[other.name]". You must differentiate member names by more than just case.')
-                        if name[0] in _uppercaseLetters
-                                .recordError('Method names must start with lowercase letters. ([name])')
+                overload = _overloadIfNeeded(curBox, name)  # also checks for various errors
 
                 if opener.which in ['OPEN_CALL', 'OPEN_GENERIC']
@@ -1351 +1367 @@
                         params = .paramDecls(true, 'RBRACKET')
                         name = r'[]'
-                        other = curBox.declForName(name)
-                        if other
-                                if other inherits MemberOverload
-                                        overload = other
-                                else if other inherits ProperDexer
-                                        overload = MemberOverload(other)
-                                        curBox.registerOverload(overload to !)
+                        overload = _overloadIfNeeded(curBox, name)
                 else
                         name = .idOrKeyword.text
@@ -1483 +1493 @@
                 prop as ProperDexer?
                 token = .expect(if(getOrSet, 'SET', 'GET'))
-                overload as MemberOverload? = nil
+                overload as MemberOverload?
                 if .optional('LBRACKET')
                         params = .paramDecls(true, 'RBRACKET')
                         name = r'[]'
-                        other = curBox.declForName(name)
-                        if other
-                                if other inherits MemberOverload
-                                        overload = other
-                                else if other inherits ProperDexer
-                                        overload = MemberOverload(other)
-                                        curBox.registerOverload(overload to !)
+                        overload = _overloadIfNeeded(curBox, name)
                 else
                         name = .idOrKeyword.text
@@ -3188 +3192 @@
                 throw _makeError(token, msg)  # will get recorded in .parseSource if the exception actually "makes it out" (some parser logic catches errors)
 
+        def _overloadIfNeeded(box as Box, name as String) as MemberOverload?
+                """
+                Creates an overload for a new member going into box--if needed.
+                May throw various appropriate errors.
+                """
+                overload as MemberOverload?
+                other = box.declForName(name)
+                if other
+                        if other inherits MemberOverload
+                                overload = other
+                        else if other inherits AbstractMethod or other inherits ProperDexer # CC: make this method generic on this type
+                                overload = MemberOverload(other to BoxMember)
+                                box.registerOverload(overload to !)
+                        else
+                                .throwError('There is already another class member with the name "[name]".')  # TODO list its location and possibly what it is
+                else
+                        other = box.declForName(name)  # TODO: should be a CI there for case-insensitive
+                        if other
+                                .throwError('There is already another class member with the name "[other.name]". You must differentiate member names by more than just case.')
+                        if name[0] in _uppercaseLetters
+                                .recordError('Method names must start with lowercase letters. ([name])')
+                return overload
+
         def _makeError(token as IToken?, msg as String) as ParserException
                 if token

cobra/trunk/Source/Container.cobra

@@ -137 +137 @@
 
         get parent as IParentSpace?
-                if .parentBox
-                        return .parentBox
-                if .parentNameSpace
-                        return .parentNameSpace
+                if .parentBox, return .parentBox
+                if .parentNameSpace, return .parentNameSpace
                 return nil
 

cobra/trunk/Source/Enums.cobra

@@ -101 +101 @@
                 return m
 
+        def mergedIntoPartialBox(newBox as Box)
+                require
+                        newBox is not .parentBox
+                        newBox.name == .parentBox.name
+                body
+                        _parentBox = newBox
+
         get sharpInit as String is override
                 return .sharpRef + '.' + Utils.capped(_declsInOrder[0].name)

cobra/trunk/Source/Members.cobra

@@ -11 +11 @@
         """
         get docString as String?
+        get parentBox as Box
+        def mergedIntoPartialBox(newBox as Box)
+                require
+                        newBox is not .parentBox
+                        newBox.name == .parentBox.name
 
 
@@ -49 +54 @@
         get attributes from _attribs
 
-        get box from var
+        get box from var  # CC: axe in favor of using .parentBox
+
+        get parentBox from _box
 
         get canHaveMatchingBaseMember as bool
@@ -174 +181 @@
                 """
                 pass
+
+        def mergedIntoPartialBox(newBox as Box)
+                require
+                        newBox is not .box
+                        newBox.name == .box.name
+                body
+                        _box = newBox
 
 

cobra/trunk/Source/NameSpace.cobra

@@ -1 +1 @@
 interface INameSpaceMember
-        inherits IMember
+        inherits IMember, ISyntaxNode
         """
         Anything that can be a member of a namespace should implement INameSpaceMember.
@@ -7 +7 @@
 
         def extensionMemberFor(box as Box, name as String) as IMember?
+        get isNames as List<of String>