Changeset 1741

Timestamp:

11/07/08 19:55:56 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Fix bug from previous checkin.
Code cleanup.

Files:

• cobra/trunk/Source/Expr.cobra (modified) (8 diffs)

cobra/trunk/Source/Expr.cobra

@@ -199 +199 @@
                         sugg = ''
                 return sugg
+
+        def whoseTypeIsMessage as String
+                """
+                Returns a suffix for member-not-found error messages.
+                Returns ' whose type is "[.receiverType.name]"'
+                Overridden by IdentifierExpr to return '' when accessing types.
+                """
+                return ' whose type is "[.receiverType.name]"'
+        
+        def throwCannotFindMemberError(receiverExpr as Expr, memberName as String)
+                __throwOrRecordCannotFindMemberError(receiverExpr, memberName, 1)
+
+        def recordCannotFindMemberError(receiverExpr as Expr, memberName as String)
+                __throwOrRecordCannotFindMemberError(receiverExpr, memberName, 2)
+
+        def __throwOrRecordCannotFindMemberError(receiverExpr as Expr, memberName as String, throwOrRecord as int) is nonvirtual
+                require throwOrRecord in [1, 2]
+                suggs = _suggestionsMessage(receiverExpr.suggestionsForBadMemberName(memberName))
+                errorMsg = 'Cannot find a definition for "[memberName]" in "[receiverExpr.toCobraSource]"[receiverExpr.whoseTypeIsMessage].[suggs]'
+                branch throwOrRecord
+                        on 1, .throwError(errorMsg)
+                        on 2, .recordError(errorMsg)
+                        else, throw FallThroughException(throwOrRecord)
 
 
@@ -506 +529 @@
                                         type = .compiler.passThroughType
                         else
-                                left = dotNode.left
-                                suggs = left.suggestionsForBadMemberName(_name)
-                                isBoxAccess = left inherits IdentifierExpr and (left to IdentifierExpr).definition inherits Box  # like "Console.writeLine" where the receiver is a literal class or struct reference
-                                whoseTypeIs = if(isBoxAccess, '', ' whose type is "[left.receiverType.name]"')
-                                .throwError('Cannot find a definition for "[_name]" in "[left.toCobraSource]"[whoseTypeIs].[_suggestionsMessage(suggs)]')
+                                .throwCannotFindMemberError(dotNode.left, _name)
                 else
                         if not possibleDefinition.isCallable
@@ -956 +975 @@
         def toCobraSource as String is override
                 return _name
+
+        def whoseTypeIsMessage as String
+                """
+                Customized to return '' for boxes.
+                """
+                # TODO: should cover other types like `int`. maybe that's a TypeExpr?
+                return if(.definition inherits Box, '', base.whoseTypeIsMessage)
 
 
@@ -1282 +1308 @@
                                         _type = .compiler.nilableDynamicType
                                         return
-                                suggs = .binarySuperNode.left.suggestionsForBadMemberName(_name)
-                                isBoxAccess = left inherits IdentifierExpr and (left to IdentifierExpr).definition inherits Box  # like "Console.writeLine" where the receiver is a literal class or struct reference
-                                whoseTypeIs = if(isBoxAccess, '', ' whose type is "[left.receiverType.name]"')
-                                .throwError('Cannot find a definition for "[_name]" in "[left.toCobraSource]"[whoseTypeIs].[_suggestionsMessage(suggs)]')
+                                .throwCannotFindMemberError(left, _name)
                         assert _definition
                         if _definition inherits IType
@@ -1311 +1334 @@
                         
                         if _definition inherits BoxMember
-                                _bindImpBoxMember(_definition, isBoxAccess, left)                       # resolve overloads
+                                _bindImpBoxMember(_definition, left)  # resolve overloads
                         else
                                 # TODO: type access like enum, class, delegate
@@ -1317 +1340 @@
                 assert _type
 
-        def _bindImpBoxMember(defn as BoxMember, isBoxAccess as bool, left as Expr)
+        def _bindImpBoxMember(defn as BoxMember, left as Expr)
                 # resolve overloads
                 if defn inherits MemberOverload
@@ -1340 +1363 @@
                 else if defn.isProtected
                         if not .compiler.curBox.isDescendantOf(defn.parentBox)
-                                whoseTypeIs = if(isBoxAccess, '', ' whose type is "[left.receiverType.name]"')
-                                .throwError('Cannot access protected "[_name]" in "[left.toCobraSource]"[whoseTypeIs].')
+                                .throwError('Cannot access protected "[_name]" in "[left.toCobraSource]"[left.whoseTypeIsMessage].')
                 else if defn.isPrivate
                         if not .compiler.curBox is defn.parentBox
-                                whoseTypeIs = if(isBoxAccess, '', ' whose type is "[left.receiverType.name]"')
-                                .throwError('Cannot access private "[_name]" in "[left.toCobraSource]"[whoseTypeIs].')
+                                .throwError('Cannot access private "[_name]" in "[left.toCobraSource]"[left.whoseTypeIsMessage].')
                 else if defn.isInternal
                         # TODO
@@ -1509 +1530 @@
                                         if not arg.left inherits IdentifierExpr
                                                 .recordError('General purpose assignments are not allowed as arguments. Assignment syntax can only be used for keyword arguments.')
-                                        if not expr.receiverType.isDynamicOrPassThrough
+                                        else if not expr.receiverType.isDynamicOrPassThrough
                                                 propertyName = (arg.left to IdentifierExpr).name
                                                 if expr.memberForName(propertyName) is nil
-                                                        suggs = .expr.suggestionsForBadMemberName(propertyName)
-                                                        isBoxAccess = expr inherits IdentifierExpr and (expr to IdentifierExpr).definition inherits Box  # like "Console.writeLine" where the receiver is a literal class or struct reference
-                                                        whoseTypeIs = if(isBoxAccess, '', ' whose type is "[expr.receiverType.name]"')
-                                                        .recordError('Cannot find a definition for "[propertyName]" in "[expr.toCobraSource]"[whoseTypeIs].[_suggestionsMessage(suggs)]')
+                                                        .recordCannotFindMemberError(expr, propertyName)
                                         arg.right.bindImp  # 'x=y' has special treatment in arguments
                                 else