Changeset 1562

Timestamp:

07/30/08 21:42:37 (4 months ago)

Author:

Chuck.Esterbrook

Message:

Improvements to event declarations and raise statement per hopscc.
Add missing 'event' keyword. doh!
Assign event to local var to avoid race conditions.
Other refinements.

Location:

cobra/trunk

Files:

• Source/BinaryOpExpr.cobra (modified) (1 diff)
• Source/CobraParser.cobra (modified) (1 diff)
• Source/Expr.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (2 diffs)
• Source/Statements.cobra (modified) (3 diffs)
• Tests/220-delegates-etc/120-events/304-raise-protected.cobra (added)

cobra/trunk/Source/BinaryOpExpr.cobra

@@ -917 +917 @@
                         _dotRightExpr = right to IDotRightExpr
                         _isImplicit = isImplicit
+
+        get dotRight as IDotRightExpr
+                """
+                Returns .right but with the more narrow type of IDotRightExpr.
+                """
+                return _dotRightExpr
 
         pro isImplicit from var

cobra/trunk/Source/CobraParser.cobra

@@ -2063 +2063 @@
                 token = .expect('RAISE')
                 exprs = .commaSepExprs('EOL')
+                assert .last.which=='EOL'
+                .undo  # need EOL
                 if exprs.count == 0
                         .throwError('Expecting one or more expressions after "raise", starting with the event. If you meant to throw the currently caught exception, use "throw" instead.')

cobra/trunk/Source/Expr.cobra

@@ -989 +989 @@
                         if defi inherits IType
                                 return defi
-                        else
+                        else if defi inherits BoxEvent
+                                return defi.handlerType
+                        else    
                                 throw FallThroughException(defi)
                 else

cobra/trunk/Source/Members.cobra

@@ -379 +379 @@
 
         get defaultAccessLevel as String is override
-                return 'public'
+                return if(.name.startsWith('_'), 'protected', 'public')
 
         get englishName as String is override
@@ -432 +432 @@
                 .writeSharpAttribs(sw)
                 .writeSharpIsNames(sw)
+                sw.write('event ')
                 sw.write(.handlerType.sharpRef)
                 sw.write(' [.sharpName]')

cobra/trunk/Source/Statements.cobra

@@ -1172 +1172 @@
 
         var _name = ''
+        var _eventType as IType?
         var _exprs as List<of Expr>
         var _definition as BoxEvent?
@@ -1200 +1201 @@
                         expr = _exprs[0]
                         if expr inherits DotExpr
-                                right = expr.right
-                                if right inherits IDotRightExpr
-                                        defi = (right to dynamic).definition
-                                        if defi inherits BoxEvent
-                                                _definition = defi
-                                                _name = defi.name
-                                        else
-                                                .throwError('Expecting an event to raise.')
+                                right = expr.dotRight
+                                defi = (right to dynamic).definition
+                                if defi inherits BoxEvent
+                                        _definition = defi
+                                        _name = defi.name
+                                        _eventType = defi.handlerType           
                                 else
-                                        assert false # should be impossible to get here since it was a dotexpr
+                                        .throwError('Expecting an event to raise.')
+                        else if expr inherits IdentifierExpr  # ex: raise _eventName
+                                _name = expr.name
+                                assert expr.potentialType
+                                _eventType = expr.potentialType
                         else
                                 .throwError('Invalid expression for raising events. Try "raise .someEvent, args" or "throw SomeException(args)".')
@@ -1216 +1219 @@
                 base.writeSharpDef(sw)
                 name = Utils.capped(.name)
-                sw.write('if (this.[name]!=null) this.[name](')
+                localName = '_lh_event_[.serialNum]'
+                sw.write('{ [_eventType.sharpRef] [localName] = this.[name]; if ([localName]!=null) [localName](')
                 sep = ''
+                # Assuming usual argsList case is 2 args (sender, eventArgs). If have fewer than this
+                # presume the first arg - sender ('this') -  is elided
+                # TODO: need to compare to the actual count of the parameter list instead of assuming this
+                if _exprs.count == 2 
+                        sep = 'this, '
                 for expr in _exprs[1:]
                         sw.write(sep)
                         expr.writeSharpDef(sw, false)
                         sep = ', '
-                sw.write(');\n')
-
+                sw.write('); }\n')
+                
 
 class ReturnStmt