Changeset 1582 for cobra/trunk/Source/Expr.cobra

Timestamp:

08/18/08 11:40:51 (5 months ago)

Author:

Chuck.Esterbrook

Message:

Fix a bug in partial class support.

Files:

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

cobra/trunk/Source/Expr.cobra

@@ -1748 +1748 @@
                                 # _foo(x) --> ._foo(x)
                                 newCall = CallExpr(.token, .name, .args)
-                                dotted = DotExpr(.token, 'DOT', ThisLit(.token, .curCodeMember.box), newCall, true).bindImp
+                                dotted = DotExpr(.token, 'DOT', ThisLit(.token), newCall, true).bindImp
                                 _type = dotted.type to IType
                                 _transformTo(dotted)
@@ -2942 +2942 @@
 
 class ThisOrBaseLit
+        is abstract
         inherits AtomicLiteral
-
-        def init(token as IToken, box as Box)
-                base.init(token)
-                _type = box
+        """
+        The "current box" used to be passed to .init rather than referenced in _bindImp, but that
+        didn't work well with partial classes. Also, it's not necessary to creating a ThisOrBaseLit.
+        """
+
+        def init(token as IToken)
+                base.init(token)
 
         def _bindImp
                 base._bindImp
+                _type = .compiler.curBox
                 if _type inherits Extension
                         _type = _type.extendedBox
@@ -2957 +2962 @@
         inherits ThisOrBaseLit
 
-        def init(token as IToken, box as Box)
-                base.init(token, box)
+        def init(token as IToken)
+                base.init(token)
 
         def checkType is override
@@ -2984 +2989 @@
         # "this" (unless C# allows that which I doubt)
 
-        def init(token as IToken, box as Box)
-                base.init(token, box)
+        def init(token as IToken)
+                base.init(token)
 
         get isExplicit as bool