GNU
/
easejs
1
0
Fork 0
Code Releases Activity

[#25] Now using keywords to compare visibility levels in validations to eliminiate fallback inconsistencies 

Ironic, considering the current refactoring (not yet committed) of MemberBuilder to split validation logic into MemberBuilderValidator was partially to be able to easily override the fallback logic. It's a useful refactoring nonetheless, but it could have waited.
closure/master
Mike Gerwitz 2011-10-22 00:32:59 -04:00
parent f6369ba2c4
commit e6830b741f
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/MemberBuilder.js
View File

@ -28,11 +28,8 @@
* @package core * @package core
*/ */
var util = require( __dirname + '/util' ), var util = require( __dirname + '/util' ),
Warning = require( __dirname + '/warn' ).Warning,
Warning = require( __dirname + '/warn' ).Warning,
fallback = util.definePropertyFallback(),
visibility = [ 'public', 'protected', 'private' ] visibility = [ 'public', 'protected', 'private' ]
; ;
@ -244,7 +241,9 @@ exports._validateMethod = function(
} }
// do not permit visibility deescalation // do not permit visibility deescalation
if ( prev_data.visibility < this._getVisibilityValue( keywords ) ) if ( this._getVisibilityValue( prev_keywords ) <
this._getVisibilityValue( keywords )
)
{ {
throw TypeError( throw TypeError(
"Cannot de-escalate visibility of method '" + name + "'" "Cannot de-escalate visibility of method '" + name + "'"
@ -311,7 +310,9 @@ exports.buildProp = function( members, meta, name, value, keywords, base )
// do not permit visibility de-escalation // do not permit visibility de-escalation
if ( prev && if ( prev &&
( prev_data.visibility < this._getVisibilityValue( keywords ) ) ( this._getVisibilityValue( prev[ 1 ] )
< this._getVisibilityValue( keywords )
)
) )
{ {
throw TypeError( throw TypeError(
@ -521,7 +522,6 @@ function scanMembers( members, name, base )
get: member.get, get: member.get,
set: member.set, set: member.set,
member: member.value, member: member.value,
visibility: ( ( fallback ) ? 0 : i ),
}; };
} }
} }
@ -613,12 +613,7 @@ exports._overrideMethod = function(
*/ */
exports._getVisibilityValue = function( keywords ) exports._getVisibilityValue = function( keywords )
{ {
if ( fallback ) if ( keywords[ 'protected' ] )
{
// if we have to fall back, we don't support levels of visibility
return 0;
}
else if ( keywords[ 'protected' ] )
{ {
return 1; return 1;
} }

3
test/test-class-visibility.js
View File

@ -524,8 +524,6 @@ var common = require( './common' ),
}, Error, "Can escalate visibility of subtype members" ); }, Error, "Can escalate visibility of subtype members" );
// same level of visibility // same level of visibility
assert.doesNotThrow( function()
{
Class( Class(
{ {
'protected foo': 'bar', 'protected foo': 'bar',
@ -534,7 +532,6 @@ var common = require( './common' ),
'protected foo': 'bar', 'protected foo': 'bar',
'override protected baz': function() {}, 'override protected baz': function() {},
} ); } );
}, Error, "Can retain level of visibility for subtype members" );
} )(); } )();