Changeset 1764

Timestamp:

11/14/08 05:51:49 (8 weeks ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup.

Location:

cobra/trunk/Source

Files:

• BackEndClr/SharpGenerator.cobra (modified) (1 diff)
• Expr.cobra (modified) (6 diffs)

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -4327 +4327 @@
                         if _left inherits ThisLit
                                 if _right inherits CallExpr
-                                        defi = _right.memberDefinition
-                                        if defi inherits IMember
-                                                writeThis = not defi.isShared
-                                        else
-                                                # TODO: compiler bug stimulated by following line:
-                                                # throw FallThroughException({'right': _right, 'defi': defi})
-                                                throw FallThroughException(defi)
+                                        writeThis = not _right.memberDefinition.isShared
                                 else if _right inherits MemberExpr
                                         writeThis = not _right.memberDefinition.isShared

cobra/trunk/Source/Expr.cobra

@@ -370 +370 @@
                 DotExpr -- for _foo(args) --> ._foo(args)
                 PostCallExpr
+
+        A valid call expr may have a nil .definition because the receiver is dynamic.
         """
 
@@ -377 +379 @@
         var _args as List<of Expr>
         var _hasParens as bool
-        var _definition as INamedNode?  # TODO: could tighten this down to IMember right?s
+        var _definition as IMember?
 
         def init(token as IToken, name as String, args as List<of Expr>, hasParens as bool)
@@ -445 +447 @@
 
                 _bindImpArgs
-                definition as INamedNode?
+                definition as IMember?
                 type as IType?
 
@@ -456 +458 @@
                                 return  # TODO: I don't think I want a return here
 
-                        definition = _inferDefinitionAndType(dotNode, definition, out type)
+                        definition = _inferDefinitionAndType(dotNode, out type)
                         assert type
                         if definition inherits IType    # Box, IVar or GenericParam
@@ -529 +531 @@
                 transformTarget._transformTo(enumCall)
 
-        def _inferDefinitionAndType(dotNode as DotExpr, definition as INamedNode?, type as out IType?) as INamedNode?
+        def _inferDefinitionAndType(dotNode as DotExpr, type as out IType?) as IMember?
                 type = nil
                 possibleDefinition = dotNode.left.memberForName(_name)
@@ -546 +548 @@
                         if not possibleDefinition.isCallable
                                 .throwError('Cannot call "[_name]" because it is a "[possibleDefinition.englishName]".')
-                        definition = possibleDefinition
+                                
                         type = possibleDefinition.resultType
-                return definition               
+                return possibleDefinition
 
         def _transformToPostCallExprOnType(dotNode, definition as IType?)