Changeset 1608

Timestamp:

09/03/08 14:50:52 (4 months ago)

Author:

Chuck.Esterbrook

Message:

Added support for attributes on class/object variables (also know as "fields").

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Boxes.cobra (modified) (1 diff)
• Source/CobraParser.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (2 diffs)
• Tests/320-misc-two/800-attributes/100-attributes.cobra (modified) (3 diffs)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -71 +71 @@
 * Added new Visitor class to the Cobra standard library. Subclasses can easily implement the visitor pattern and the classes being visited require no additional modification. See the doc string of `Visitor` in CobraLang.cobra for details.
 
+* Added support for attributes on class/object variables (also know as "fields").
+
 * Cobra now prints '[1, 2, 3]' for a list of integers rather than 'System.Collections.Generic.List`1[System.Int32]'. It still uses the standard List<of> class.
 

cobra/trunk/Source/Boxes.cobra

@@ -1045 +1045 @@
                                 if fieldInfo.isStatic
                                         isNames.add('shared')
-                                varr = BoxVar(TokenFix.empty, this, Utils.cobraNameForSharpMemberName(fieldInfo.name), _memberTypeResultProxy(fieldInfo, fieldInfo.fieldType), isNames, nil, '')
+                                varr = BoxVar(TokenFix.empty, this, Utils.cobraNameForSharpMemberName(fieldInfo.name), _memberTypeResultProxy(fieldInfo, fieldInfo.fieldType), isNames, nil, nil, '')
                                 varr.binaryName = fieldInfo.name
                                 .addDecl(varr)

cobra/trunk/Source/CobraParser.cobra

@@ -1166 +1166 @@
                         docString = .docString
                         .dedent
-                return BoxVar(tok, .curBox, identifier, type, isNames, initExpr, docString)
+                return BoxVar(tok, .curBox, identifier, type, isNames, initExpr, attribs, docString)
 
         def declareInvariant

cobra/trunk/Source/Members.cobra

@@ -464 +464 @@
         var _isAssignedTo as bool
 
-        def init(token as IToken, box as Box, name as String, typeNode as ITypeProxy?, isNames as List<of String>, initExpr as Expr?, docString as String)
-                base.init(token, box, name, isNames, AttributeList(), docString)
+        def init(token as IToken, box as Box, name as String, typeNode as ITypeProxy?, isNames as List<of String>, initExpr as Expr?, attribs as AttributeList?, docString as String)
+                base.init(token, box, name, isNames, attribs ? AttributeList(), docString)
                 _typeNode = typeNode
                 _initExpr = initExpr
@@ -591 +591 @@
         def writeSharpDef(sw as SharpWriter) is override
                 base.writeSharpDef(sw)
+                .writeSharpAttribs(sw)
                 .writeSharpIsNames(sw)
                 sw.write(_type.sharpRef)

cobra/trunk/Tests/320-misc-two/800-attributes/100-attributes.cobra

@@ -59 +59 @@
 
         def getHashCode as int is override
-                return $sharp('_x << 8 | _y')
+                return _x << 8 | _y
 
 
@@ -90 +90 @@
                 checkCount = 0
                 for member in t.getMembers
-                        if v
-                                print member
+                        if v, print member
                         name = member.name
                         if name.startsWith('Attrib') or name.startsWith('Item')
                                 attribs = List<of FooAttribute>()
                                 for attrib in member.getCustomAttributes(true)
-                                        if v
-                                                print '   ', attrib
+                                        if v, print '   ', attrib
                                         if attrib inherits FooAttribute
                                                 attribs.add(attrib)
@@ -217 +215 @@
 #               has Foo(x=3)
 #               pass
+
+        # var
+        var attribVar2a_0_0_2_3 as int
+                has Foo, Bar(x=2, y=3)