Changeset 1729

Timestamp:

11/04/08 20:00:30 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Invoking _someMethod without parens in an if statement or other expression causes a false compilation error.
reported-by: hopscc

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/BinaryOpExpr.cobra (modified) (1 diff)
• Source/CobraParser.cobra (modified) (1 diff)
• Source/Expr.cobra (modified) (4 diffs)
• Source/Members.cobra (modified) (1 diff)
• Tests/120-classes/400-methods.cobra (modified) (2 diffs)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -199 +199 @@
 
 * Fixed: Assigning values less than zero to variables of type int8 and int16 gives a false compilation error. ticket:45
+
+* Fixed: Invoking _someMethod without parens in an `if` statement or other expression causes a false compilation error.

cobra/trunk/Source/BinaryOpExpr.cobra

@@ -601 +601 @@
                         .compiler.curCodeMember.usesBase  # use of base implies override if the containing member is not already marked new
                 else if _left inherits ThisLit
-                        if _left.isExplicit  # CC: combine above
+                        if _left.isVisible
                                 .compiler.warning(this, 'An explicit "this" literal is unnecessary for accessing members of the current object. You can remove "this".')
-                        else if _right inherits MemberExpr
-                                if _right.name.startsWith('_')
-                                        .compiler.warning(this, 'An explicit dot (".") is unnecessary for accessing underscored members of the current object. You can remove ".".')
+                        else if .isVisible and .dotRight.name.startsWith('_')
+                                .compiler.warning(this, 'An explicit dot (".") is unnecessary for accessing underscored members of the current object. You can remove ".".')
                 if not _type
                         assert _right.type

cobra/trunk/Source/CobraParser.cobra

@@ -2671 +2671 @@
                         finally
                                 .opStack.pop
-                        return BinaryOpExpr.make(token to !, 'DOT', ThisLit(token), expr)
+                        return BinaryOpExpr.make(token to !, 'DOT', ThisLit(token, isVisible=false), expr)
                 else if peek=='NIL'
                         return NilLiteral(.grab)

cobra/trunk/Source/Expr.cobra

@@ -48 +48 @@
         var _contextType as IType?
         var _isParened as bool
+        var _isVisible as bool
         var _argumentLabel = ArgumentLabel.None
 
         def init(token as IToken)
                 base.init(token)
+                _isVisible = true
 
         def addRefFields is override
@@ -60 +62 @@
                 """
                 Indicates the label for an argument such as 'out' or 'inout'.
+                """
+
+        pro isVisible from var
+                """
+                Indicates if the expression is visible in the source code.
+                Defaults to true.
+                
+                An expression may not be if it was generated by means other than parsing,
+                usually during _bindImp for the purpose of a _transformTo call.
+                It's not always imperative to set this to false--only in cases where it's needed.
+                Those cases are typically warnings centered around coding style ("favor succinct forms").
                 """
 
@@ -871 +884 @@
                 if _type is nil
                         if _definition
-                                _type = _definition.typeForIdentifier
-                                _receiverType = _definition.typeForReceiver
+                                if _definition inherits AbstractMethod or _definition inherits MemberOverload
+                                        _transformTo(DotExpr(.token, 'DOT', ThisLit(.token, isVisible=false), MemberExpr(.token), isVisible=false).bindAll)
+                                else
+                                        _type = _definition.typeForIdentifier
+                                        _receiverType = _definition.typeForReceiver
                         else
                                 if .binarySuperNode inherits AssignExpr and this is .binarySuperNode.left
@@ -1449 +1465 @@
                                 # _foo(x) --> ._foo(x)
                                 newCall = CallExpr(.token, .name, .args, true)
-                                dotted = DotExpr(.token, 'DOT', ThisLit(.token), newCall, true).bindImp
+                                dotted = DotExpr(.token, 'DOT', ThisLit(.token, isVisible=false), newCall, true, isVisible=false).bindImp
                                 _type = dotted.type to IType
                                 _transformTo(dotted)

cobra/trunk/Source/Members.cobra

@@ -828 +828 @@
                                                                 expr = IdentifierExpr(token, decl) to Expr
                                                         else
-                                                                expr = BinaryOpExpr.make(token, 'DOT', ThisLit(token), MemberExpr(token, decl.name)) to Expr
+                                                                expr = DotExpr(token, 'DOT', ThisLit(token, isVisible=false), MemberExpr(token, decl.name), isVisible=false) to Expr
                                                         stmts.add(AssertStmt(token, IsNotNilExpr(token, expr), nil))
                                 if stmts.count

cobra/trunk/Tests/120-classes/400-methods.cobra

@@ -17 +17 @@
                 p1.setXY(1, 2)
                 p2.setXY(1, 2)
+                p1.moreTests
+
+        def moreTests
+                .testInvocations
+                .testUnderInvocations
 
         def setXY(x as int, y as int)
                 _x = x
                 _y = y
+
+        def x as int
+                # poor example as this would normally be a property
+                # but we're testing methods in this file, not properties
+                return _x
+
+        def y as int
+                return _y
 
         def someInt as int
@@ -42 +55 @@
         def someObject3 as Point
                 return Point()
+
+        def testInvocations
+                assert .someInt == 5
+                assert .someBool
+                assert .someString1 == 'aoeu'
+                assert .someString2 == ''
+                assert .someObject1 == 'aoeu'
+                assert .someObject2 == 5
+                assert .someObject3.x == 0 and .someObject3.y == 0
+
+        def _someInt as int
+                return 5
+                
+        def _someBool as bool
+                return true
+                
+        def _someString1 as String
+                return 'aoeu'
+        
+        def _someString2 as String
+                return ''
+
+        def _someObject1 as Object
+                return 'aoeu'
+        
+        def _someObject2 as Object
+                return 5
+                
+        def _someObject3 as Point
+                return Point()
+
+        def testUnderInvocations
+                assert _someInt == 5
+                assert _someBool
+                assert _someString1 == 'aoeu'
+                assert _someString2 == ''
+                assert _someObject1 == 'aoeu'
+                assert _someObject2 == 5
+                assert _someObject3.x == 0 and .someObject3.y == 0