js: updated patch for externs included with Google Closure compiler v20161201
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/7785bb4d Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/7785bb4d Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/7785bb4d Branch: refs/heads/master Commit: 7785bb4d27279f0add1500d4bf34d62793eef284 Parents: d990e99 Author: Josh Tynjala <[email protected]> Authored: Thu Dec 15 17:05:23 2016 -0800 Committer: Josh Tynjala <[email protected]> Committed: Thu Dec 15 17:05:23 2016 -0800 ---------------------------------------------------------------------- js/build.xml | 3 ++- js/src/main/patch/js.patch | 32 +++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/7785bb4d/js/build.xml ---------------------------------------------------------------------- diff --git a/js/build.xml b/js/build.xml index fa6bbb0..283f17f 100644 --- a/js/build.xml +++ b/js/build.xml @@ -120,6 +120,7 @@ <replace file="${basedir}/target/downloads/es3.js" > <replacefilter token="param {number|undefined} base" value="param {number=} base" /> </replace> + <replaceregexp file="${basedir}/target/downloads/es6.js" match="@constructor(. \* @extends \{Array<string>\})" replace="@interface" flags="s" /> <antcall target="diff" /> </target> @@ -145,7 +146,7 @@ </target> <target name="preprocess" depends="download"> - <exec executable="git" dir="${basedir}/.."> + <exec executable="git" dir="${basedir}/.." failonerror="true"> <arg value="apply"/> <arg value="--ignore-whitespace"/> <arg value="--whitespace=nowarn"/> http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/7785bb4d/js/src/main/patch/js.patch ---------------------------------------------------------------------- diff --git a/js/src/main/patch/js.patch b/js/src/main/patch/js.patch index f54f48f..2f9b124 100644 --- a/js/src/main/patch/js.patch +++ b/js/src/main/patch/js.patch @@ -16,10 +16,10 @@ Generated from Ant script diff --git a/js/target/downloads/es3.js b/js/target/downloads/es3.js -index fa5e5a6..a6e4fa0 100644 +index 4396804..82032c8 100644 --- a/js/target/downloads/es3.js +++ b/js/target/downloads/es3.js -@@ -174,12 +174,12 @@ function parseFloat(num) {} +@@ -283,12 +283,12 @@ function parseFloat(num) {} * leader, then pass {@code undefined} as the base. * * @param {*} num @@ -34,7 +34,7 @@ index fa5e5a6..a6e4fa0 100644 /** * @param {string} code -@@ -201,10 +201,10 @@ function Object(opt_value) {} +@@ -310,10 +310,10 @@ function Object(opt_value) {} /** * The constructor of the current object. @@ -47,22 +47,28 @@ index fa5e5a6..a6e4fa0 100644 /** * Binds an object's property to a function to be called when that property is -@@ -502,6 +502,7 @@ Array.prototype.push = function(var_args) {}; - * Transposes the elements of an array in place: the first array element becomes the - * last and the last becomes the first. - * -+ * @return {!Array<?>} - * @this {{length: number}} - * @modifies {this} - * @see http://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse -@@ -538,6 +539,7 @@ Array.prototype.slice = function(opt_begin, opt_end) {}; +@@ -660,6 +660,7 @@ Array.prototype.slice = function(opt_begin, opt_end) {}; /** * Sorts the elements of an array in place. * + * @return {!Array<?>} * @param {function(T,T):number=} opt_compareFunction Specifies a function that * defines the sort order. - * @this {{length: number}|Array<T>} + * @this {IArrayLike<T>} +diff --git a/js/target/downloads/es6.js b/js/target/downloads/es6.js +index 1b8a25a..0d92668 100644 +--- a/js/target/downloads/es6.js ++++ b/js/target/downloads/es6.js +@@ -208,8 +208,7 @@ Number.prototype.toLocaleString = function(opt_locales, opt_options) {}; + String.prototype.repeat = function(count) {}; + + /** +- * @constructor +- * @extends {Array<string>} ++ * @interface + * @see http://www.ecma-international.org/ecma-262/6.0/#sec-gettemplateobject + */ + var ITemplateArray = function() {}; diff --git a/js/target/downloads/svg.js b/js/target/downloads/svg.js index a13180c..48115b3 100644 --- a/js/target/downloads/svg.js
