From 71103fc6520e8a955f92cfd11377052371ea8858 Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Thu, 23 Apr 2020 10:40:27 +0200 Subject: [PATCH 1/5] [Swift] Update codegen template Update Swift codegen template to resolve warning: > Variable '_localctx' was never mutated; consider changing to 'let' constant > Variable '_parentState' was never mutated; consider changing to 'let' constant > Variable '_startState' was never mutated; consider changing to 'let' constant Since there is no path where they can be changed I would say its best to just generate without the warnings. --- .../org/antlr/v4/tool/templates/codegen/Swift/Swift.stg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg index a70d6f2d9..a33166f43 100755 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg @@ -395,7 +395,7 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina }; separator="\n"> @discardableResult }> func (_ ) throws -> { - var _localctx: = (_ctx, getState()}>) + let _localctx: = (_ctx, getState()}>) try enterRule(_localctx, , .RULE_) @@ -438,9 +438,9 @@ LeftRecursiveRuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs, @discardableResult private func (_ _p}>: Int) throws -> { let _parentctx: ParserRuleContext? = _ctx - var _parentState: Int = getState() + let _parentState: Int = getState() var _localctx: = (_ctx, _parentState}>) - var _prevctx: = _localctx + let _prevctx: = _localctx var _startState: Int = try enterRecursionRule(_localctx, , .RULE_, _p) From e3ccb3e850ef4f760f6f07f3b28bb7f5e827c3c1 Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Thu, 23 Apr 2020 10:42:08 +0200 Subject: [PATCH 2/5] Update contributors.txt --- contributors.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors.txt b/contributors.txt index 1f6cc0328..57d4a1265 100644 --- a/contributors.txt +++ b/contributors.txt @@ -241,4 +241,5 @@ YYYY/MM/DD, github id, Full name, email 2020/02/10, julibert, Julián Bermúdez Ortega, julibert.dev@gmail.com 2020/02/21, StochasticTinkr, Daniel Pitts, github@coloraura.com 2020/03/17, XsongyangX, Song Yang, songyang1218@gmail.com -2020/04/07, deniskyashif, Denis Kyashif, denis.kyashif@gmail.com \ No newline at end of file +2020/04/07, deniskyashif, Denis Kyashif, denis.kyashif@gmail.com +2020/04/23, martinvw, Martin van Wingerden, martin@martinvw.nl From 35c1f1ca6ff3536162d09e05d2e316842c9446b8 Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Thu, 21 May 2020 16:14:29 +0200 Subject: [PATCH 3/5] Update Swift.stg A recent test/change seems to touch this var, made `_prevctx` a var instead of a let --- .../org/antlr/v4/tool/templates/codegen/Swift/Swift.stg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg index a33166f43..d66db3f5a 100755 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg @@ -440,7 +440,7 @@ private func (_ _p}>: Int) throws -> = (_ctx, _parentState}>) - let _prevctx: = _localctx + var _prevctx: = _localctx var _startState: Int = try enterRecursionRule(_localctx, , .RULE_, _p) From fde1b3a5806da407241dfe8ddcb38d3b499b7114 Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Thu, 21 May 2020 16:20:00 +0200 Subject: [PATCH 4/5] Update Swift.stg Marked `_startState` constant as suggested by validator instead of the incorrect: `_prevctx` --- .../org/antlr/v4/tool/templates/codegen/Swift/Swift.stg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg index d66db3f5a..7ba9acc22 100755 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg @@ -440,8 +440,8 @@ private func (_ _p}>: Int) throws -> = (_ctx, _parentState}>) - var _prevctx: = _localctx - var _startState: Int = + var _prevctx: = _localctx + let _startState: Int = try enterRecursionRule(_localctx, , .RULE_, _p) From 37f3aae7cd8cf5776ea145a87f197c2819475916 Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Thu, 21 May 2020 19:30:15 +0200 Subject: [PATCH 5/5] Update Swift.stg _localctx is needed as var inside a test --- .../org/antlr/v4/tool/templates/codegen/Swift/Swift.stg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg index 7ba9acc22..9889ea629 100755 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg @@ -395,7 +395,7 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina }; separator="\n"> @discardableResult }> func (_ ) throws -> { - let _localctx: = (_ctx, getState()}>) + var _localctx: = (_ctx, getState()}>) try enterRule(_localctx, , .RULE_)