Changeset 1560 for cobra/trunk/Source/CobraParser.cobra

Timestamp:

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

Author:

Chuck.Esterbrook

Message:

Added support for declaring and raising events.

Files:

• cobra/trunk/Source/CobraParser.cobra (modified) (4 diffs)

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