1
0
Fork 0

Fix trait __inst

`this.__inst' within trait methods will now correctly resolve to the public
visibility object of the class we're mixed into, rather than
`undefined'.  This behavior is consistent with the rest of the system.

* lib/ClassBuilder.js (initInstance): Add `inst' to private metadata.  This
  is the public visibility object.
* lib/Trait.js (tctor): Initialize concrete trait `__inst' to aforementioned
  `inst' metadata value.
* test/Trait/LinearizationTest.js: Add respective test.
master
Mike Gerwitz 2017-11-02 00:15:31 -04:00
parent 05bb844f12
commit bb3956f1b4
Signed by: mikegerwitz
GPG Key ID: 8C917B7F5DC51BA2
3 changed files with 40 additions and 1 deletions

View File

@ -1451,7 +1451,8 @@ function initInstance( instance )
util.defineSecureProp( instance, _priv, {} );
// add the visibility objects to the data object for this class instance
instance[ _priv ].vis = new prot();
instance[ _priv ].vis = new prot();
instance[ _priv ].inst = instance;
}

View File

@ -949,6 +949,9 @@ function tctor( tc, base, privsym )
// the intimate relationship
this[ f ] = C( base, this[ privsym ].vis )[ privsym ].vis;
// TODO: this should use util.defineSecureProp
this[ f ].__inst = this[ privsym ].inst;
// rebind trait's supertype context (if any) to our own, causing us
// to share state
bindSuperCtx( this[ f ], this, privsym );

View File

@ -199,5 +199,40 @@ require( 'common' ).testCase(
this.assertEqual( called, 3 );
this.assertOk( calledbase );
},
/**
* Once all mixins are applied, a class is generated. This class is
* then instantiated, producing some object O. `this.__inst' in each
* mixin should then be bound to the public visibility object of O.
*/
'__inst refers to mixin class object': function()
{
var _self = this,
scalled = false;
var T = this.Sut(
{
'virtual public foo': function()
{
_self.assertStrictEqual( sut, this.__inst );
scalled = true;
},
} );
var sut = this.Class.use( T ).extend(
{
'override public foo': function()
{
this.__super();
},
} )();
sut.foo();
// sanity check (this is covered by an above test, but we need to be
// sure that it doesn't silently fail beacuse it's never called)
this.assertOk( scalled );
},
} );