Changeset 1560

Timestamp:

07/30/08 02:34:05 (4 months ago)

Author:

Chuck.Esterbrook

Message:

Added support for declaring and raising events.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Boxes.cobra (modified) (1 diff)
• Source/CobraParser.cobra (modified) (4 diffs)
• Source/Members.cobra (modified) (4 diffs)
• Source/Statements.cobra (modified) (2 diffs)
• Tests/220-delegates-etc/120-events/300-raise.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -2 +2 @@
 
 * Added a new built-in doc tool accessible via "cobra -doc ...". The documentation is generated to local HTML files using your declarations, doc strings, contracts, etc.
+
+* Added support for declaring and raising events.
 
 * Add support for specifying unsigned integers as Hex literals

cobra/trunk/Source/Boxes.cobra

@@ -1824 +1824 @@
                 sig ComputeSomething(a is int, b as int) as int
 
-        .NET's calls these delegates and describes them as type-safe method signatures.
+        .NET calls these delegates and describes them as type-safe method signatures.
         The "sig" keyword fits nicely with other declaration keywords like "var" "def" and "get".
         And "sig" is a more platform neutral term should we have other non-CLI backends.

cobra/trunk/Source/CobraParser.cobra

@@ -851 +851 @@
                 return theStruct
 
+        def eventDecl as BoxEvent
+                token = .expect('EVENT')
+                name = .expect('ID').value to String
+                .expect('AS')
+                handlerType = .typeId
+                # ahem, duplicated from .boxVarDecl
+                docString = '' to ?
+                isNames = List<of String>(_isNamesStack)
+                if .peek.which=='IS'
+                        isNames = .isDeclNames
+                        attribs = .hasAttribs
+                        assert .last.which=='EOL'
+                        .undo  # need the EOL
+                        if .optionalIndent
+                                docString = .docString
+                                .dedent
+                else if .optionalIndent
+                        isNames = .isDeclNames
+                        attribs = .hasAttribs
+                        docString = .docString
+                        .dedent
+                else
+                        attribs = AttributeList()
+                return BoxEvent(token, .curBox, name, isNames, attribs, docString, handlerType)
+
         def enumDecl as EnumDecl
                 token = .expect('ENUM')
@@ -1023 +1048 @@
                                         on 'EOL', .endOfLine
                                         on 'ENUM', .addDecl(box, .enumDecl)
+                                        on 'EVENT', .addDecl(box, .eventDecl)
                                         on 'SIG', .addDecl(box, .declareMethodSig)
                                         on 'SHARED', .bodiedBoxMemberDeclsShared(box)
@@ -1094 +1120 @@
                                 docString = .docString
                                 .dedent
-                else
-                        if .optionalIndent
-                                isNames = .isDeclNames
-                                attribs = .hasAttribs
-                                docString = .docString
-                                .dedent
+                else if .optionalIndent
+                        isNames = .isDeclNames
+                        attribs = .hasAttribs
+                        docString = .docString
+                        .dedent
                 return BoxVar(tok, .curBox, identifier, type, isNames, initExpr, docString)
 
@@ -2036 +2061 @@
 
         def raiseStmt as Stmt
-                .expect('RAISE')
-                .throwError('The "raise" keyword may be used in the future to raise events. If you are trying to throw an exception, use the "throw" keyword.')
-                return nil to passthrough # CC: throw FallThroughException()
+                token = .expect('RAISE')
+                exprs = .commaSepExprs('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.')
+                return RaiseStmt(token, exprs)
 
         def returnStmt as Stmt

cobra/trunk/Source/Members.cobra

@@ -119 +119 @@
                 Returns true if the class member has one or more parameters defined.
                 """
-                return false
+                return .params.count > 0
 
         get params as List<of Param>
@@ -391 +391 @@
         get handlerTypeProxy from var
 
+        get isCallable as bool is override
+                return true
+
+        get params as List<of Param> is override
+                assert .didBindInt
+                if _handlerType inherits MethodSig
+                        return _handlerType.params
+                else if _handlerType inherits Class
+                        method = _handlerType.memberForName('invoke')
+                        if method inherits AbstractMethod
+                                return method.params
+                        else
+                                .compiler.warning(this, 'Cannot locate a single invoke method of "[_handlerType.name]".')
+                                return List<of Param>()                 
+                else
+                        if not .hasError
+                                .compiler.warning(this, 'Cannot determine parameters of event "[.name]".')
+                        return List<of Param>()                 
+
         get resultType as IType is override
                 return .handlerType to !
@@ -405 +424 @@
                 # TODO: error check that _handlerType is a delegate
                 # _handlerType.isDescendantOf(.compiler.libraryType('System.Delegate'))
+
+        get sharpName as String is override
+                return Utils.capped(.name)
+
+        def writeSharpDef(sw as SharpWriter) is override
+                base.writeSharpDef(sw)
+                .writeSharpAttribs(sw)
+                .writeSharpIsNames(sw)
+                sw.write(.handlerType.sharpRef)
+                sw.write(' [.sharpName]')
+                sw.write(';\n')
 
 
@@ -599 +629 @@
                 _locals = List<of LocalVar>()
                 _stmts = List<of Stmt>()
-
-        get hasParams as bool is override
-                return _params.count > 0
 
         get params as List<of Param> is override

cobra/trunk/Source/Statements.cobra

@@ -1161 +1161 @@
 
 
+class RaiseStmt
+        inherits Stmt
+        """
+        Raise an event.
+        
+        TODO: give a good error message for the case where the user is trying to raise an exception
+        TODO: test raising an inherited event, either from source or from binary
+        TODO: support missing arguments such as 'this' and 'EventArgs()'
+        """
+
+        var _name = ''
+        var _exprs as List<of Expr>
+        var _definition as BoxEvent?
+
+        def init(token as IToken, exprs as List<of Expr>)
+                require exprs.count > 0
+                base.init(token)
+                _exprs = exprs
+
+        def addSubFields
+                base.addSubFields
+                .addField('exprs', _exprs)
+
+        get name from var
+
+        get exprs from var
+
+        def _bindImp
+                base._bindImp
+                hasError = false
+                for expr in _exprs
+                        try
+                                expr.bindImp
+                        catch ne as NodeException
+                                .compiler.recordError(ne)
+                                hasError = true
+                if not hasError
+                        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.')
+                                else
+                                        assert false # should be impossible to get here since it was a dotexpr
+                        else
+                                .throwError('Invalid expression for raising events. Try "raise .someEvent, args" or "throw SomeException(args)".')
+
+        def writeSharpDef(sw as SharpWriter)
+                base.writeSharpDef(sw)
+                name = Utils.capped(.name)
+                sw.write('if (this.[name]!=null) this.[name](')
+                sep = ''
+                for expr in _exprs[1:]
+                        sw.write(sep)
+                        expr.writeSharpDef(sw, false)
+                        sep = ', '
+                sw.write(');\n')
+
+
 class ReturnStmt
         inherits Stmt
@@ -1174 +1238 @@
                 base.addSubFields
                 .addField('expr', _expr)
+
+        get expr from var
 
         pro sharpResultVarName from var