Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[NTI] Refactor CodingConvention.addSingletonGetter to share the same …
…implementation for both OTI and NTI. The main change is to introduce an ObjectTypeI.PropertyDeclarer interface that exposes a declareProperty method to add a property to a not-yet-frozen type. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168755535
- Loading branch information
1 parent
e788b7f
commit 1a8bb56
Showing
10 changed files
with
168 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
src/com/google/javascript/jscomp/newtypes/PropertyDeclarer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright 2017 The Closure Compiler Authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.google.javascript.jscomp.newtypes; | ||
|
||
import static com.google.common.base.Preconditions.checkArgument; | ||
|
||
import com.google.javascript.rhino.FunctionTypeI; | ||
import com.google.javascript.rhino.Node; | ||
import com.google.javascript.rhino.ObjectTypeI; | ||
import com.google.javascript.rhino.TypeI; | ||
|
||
/** | ||
* NTI implementation of ObjectTypeI.PropertyDeclarer. | ||
*/ | ||
public final class PropertyDeclarer implements ObjectTypeI.PropertyDeclarer { | ||
@Override | ||
public void declareProperty(ObjectTypeI object, String property, TypeI type, Node defSite) { | ||
checkArgument(object instanceof JSType); | ||
checkArgument(type instanceof JSType); | ||
FunctionTypeI owner = object.getOwnerFunction(); | ||
if (owner != null) { | ||
object = owner; | ||
} | ||
boolean ctor = object.isConstructor(); | ||
if (ctor) { | ||
object = ((FunctionTypeI) object).getInstanceType(); | ||
} | ||
NominalType nt = ((JSType) object).getNominalTypeIfSingletonObj(); | ||
checkArgument(nt != null); | ||
RawNominalType rt = nt.getRawNominalType(); | ||
if (owner != null) { | ||
rt.addProtoProperty(property, defSite, (JSType) type, true); | ||
} else if (ctor) { | ||
rt.addCtorProperty(property, defSite, (JSType) type, true); | ||
} else { | ||
rt.addInstanceProperty(property, defSite, (JSType) type, true); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
src/com/google/javascript/rhino/jstype/PropertyDeclarer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* | ||
* ***** BEGIN LICENSE BLOCK ***** | ||
* Version: MPL 1.1/GPL 2.0 | ||
* | ||
* The contents of this file are subject to the Mozilla Public License Version | ||
* 1.1 (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* http://www.mozilla.org/MPL/ | ||
* | ||
* Software distributed under the License is distributed on an "AS IS" basis, | ||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
* for the specific language governing rights and limitations under the | ||
* License. | ||
* | ||
* The Original Code is Rhino code, released | ||
* May 6, 1999. | ||
* | ||
* The Initial Developer of the Original Code is | ||
* Netscape Communications Corporation. | ||
* Portions created by the Initial Developer are Copyright (C) 1997-1999 | ||
* the Initial Developer. All Rights Reserved. | ||
* | ||
* Contributor(s): | ||
* Bob Jervis | ||
* Google Inc. | ||
* | ||
* Alternatively, the contents of this file may be used under the terms of | ||
* the GNU General Public License Version 2 or later (the "GPL"), in which | ||
* case the provisions of the GPL are applicable instead of those above. If | ||
* you wish to allow use of your version of this file only under the terms of | ||
* the GPL and not to allow others to use your version of this file under the | ||
* MPL, indicate your decision by deleting the provisions above and replacing | ||
* them with the notice and other provisions required by the GPL. If you do | ||
* not delete the provisions above, a recipient may use your version of this | ||
* file under either the MPL or the GPL. | ||
* | ||
* ***** END LICENSE BLOCK ***** */ | ||
|
||
package com.google.javascript.rhino.jstype; | ||
|
||
import static com.google.common.base.Preconditions.checkArgument; | ||
|
||
import com.google.javascript.rhino.Node; | ||
import com.google.javascript.rhino.ObjectTypeI; | ||
import com.google.javascript.rhino.TypeI; | ||
|
||
/** | ||
* OTI implementation of ObjectTypeI.PropertyDeclarer. | ||
*/ | ||
public final class PropertyDeclarer implements ObjectTypeI.PropertyDeclarer { | ||
@Override | ||
public void declareProperty(ObjectTypeI object, String property, TypeI type, Node defSite) { | ||
checkArgument(object instanceof ObjectType); | ||
checkArgument(type instanceof JSType); | ||
((ObjectType) object).defineDeclaredProperty(property, (JSType) type, defSite); | ||
} | ||
} |