Merge branch 'master' into version

contributors.txt

@@ -280,4 +280,5 @@ YYYY/MM/DD, github id, Full name, email
 2020/10/20, adamwojs, Adam Wójs, adam[at]wojs.pl
 2020/10/24, cliid, Jiwu Jang, jiwujang@naver.com
 2020/11/05, MichelHartmann, Michel Hartmann, MichelHartmann@users.noreply.github.com
+2020/12/01, maxence-lefebvre, Maxence Lefebvre, maxence-lefebvre@users.noreply.github.com
 2020/12/03, electrum, David Phillips, david@acz.org

runtime/JavaScript/src/antlr4/CharStreams.js

@@ -3,7 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-const {InputStream} = require('./InputStream');
+const InputStream = require('./InputStream');
 const fs = require("fs");
 
 /**

runtime/JavaScript/src/antlr4/PredictionContext.js

@@ -562,7 +562,7 @@ function mergeArrays(a, b, rootIsWildcard, mergeCache) {
 	while (i < a.returnStates.length && j < b.returnStates.length) {
 		const a_parent = a.parents[i];
 		const b_parent = b.parents[j];
-		if (equalArrays(a.returnStates[i], b.returnStates[j])) {
+		if (a.returnStates[i] === b.returnStates[j]) {
 			// same payload (stack tops are equal), must yield merged singleton
 			const payload = a.returnStates[i];
 			// $+$ = $

tool/resources/org/antlr/v4/tool/templates/codegen/JavaScript/JavaScript.stg

@@ -251,10 +251,9 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina
         <code>
         <postamble; separator="\n">
         <namedActions.after>
-    <if(exceptions)>
+    }<if(exceptions)>
     <exceptions; separator="\n">
-    <else>
-    } catch (re) {
+    <else> catch (re) {
     	if(re instanceof antlr4.error.RecognitionException) {
 	        localctx.exception = re;
 	        this._errHandler.reportError(this, re);