From f0ef1f4433c0a0a74c309687bb3cfcc7da7db440 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sun, 1 Sep 2019 17:18:53 -0700 Subject: [PATCH] Remove unused macros from test templates. Remove unused DeclareLocal and PlusMember macros from *.test.stg. DeclareLocal was last used in 5c5228 (June 2015) and PlusMember was last used in 7f16fe6 (Nov 2016). --- .../org/antlr/v4/test/runtime/templates/CSharp.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Chrome.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Cpp.test.stg | 3 --- .../org/antlr/v4/test/runtime/templates/Explorer.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Firefox.test.stg | 4 ---- .../resources/org/antlr/v4/test/runtime/templates/Go.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Java.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Node.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Python2.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Python3.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Safari.test.stg | 4 ---- .../org/antlr/v4/test/runtime/templates/Swift.test.stg | 4 ---- 12 files changed, 47 deletions(-) diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/CSharp.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/CSharp.test.stg index 597248f2b..6a4d71a73 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/CSharp.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/CSharp.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "Object = ;" - AssertIsList(v) ::= "System.Collections.IList __ttt__ = ;" // just use static type system AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. == %> ModMemberEquals(n,m,v) ::= <%this. % == %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Chrome.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Chrome.test.stg index e02457a90..3d8db53f2 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Chrome.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Chrome.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = ;" - AssertIsList(v) ::= <> AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. === %> ModMemberEquals(n,m,v) ::= <%this. % === %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Cpp.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Cpp.test.stg index c2b1a7f84..3f2c5f10e 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Cpp.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Cpp.test.stg @@ -10,8 +10,6 @@ Cast(t,v) ::= "dynamic_cast\< *>()" // Should actually use a more specific Append(a,b) ::= " + ->toString()" Concat(a,b) ::= "" -DeclareLocal(s,v) ::= " = " - AssertIsList(v) ::= "assert(.size() >= 0);" // Use a method that exists only on a list (vector actually). AssignLocal(s,v) ::= " = ;" @@ -21,7 +19,6 @@ InitBooleanMember(n,v) ::= "bool = ;" GetMember(n) ::= "" SetMember(n,v) ::= " = ;" AddMember(n,v) ::= " += ;" -PlusMember(v,n) ::= " + " MemberEquals(n,v) ::= " == " ModMemberEquals(n,m,v) ::= " % == " ModMemberNotEquals(n,m,v) ::= " % != " diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Explorer.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Explorer.test.stg index 6cfe9ba27..14852c370 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Explorer.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Explorer.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = ;" - AssertIsList(v) ::= <> AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. === %> ModMemberEquals(n,m,v) ::= <%this. % === %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Firefox.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Firefox.test.stg index c94be90e8..34d34a6f8 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Firefox.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Firefox.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = ;" - AssertIsList(v) ::= <> AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. === %> ModMemberEquals(n,m,v) ::= <%this. % === %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Go.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Go.test.stg index 37fe63441..17061b71d 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Go.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Go.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + fmt.Sprint()" Concat(a,b) ::= "" -DeclareLocal(s, v) ::= "var = " - AssertIsList(v) ::= "" AssignLocal(s, v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n, v) ::= <% = ;%> AddMember(n, v) ::= <% += ;%> -PlusMember(v, n) ::= <% + fmt.Sprint()%> - MemberEquals(n, v) ::= <% == %> ModMemberEquals(n, m, v) ::= <% % == %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Java.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Java.test.stg index 5012aa213..5b64c2936 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Java.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Java.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "Object = ;" - AssertIsList(v) ::= "List\ __ttt__ = ;" // just use static type system AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. == %> ModMemberEquals(n,m,v) ::= <%this. % == %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Node.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Node.test.stg index 92cb1dbbb..0b844b3fb 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Node.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Node.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = ;" - AssertIsList(v) ::= <> AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. === %> ModMemberEquals(n,m,v) ::= <%this. % === %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python2.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python2.test.stg index cc0d9d9c2..8ef732937 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python2.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python2.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + str()" Concat(a,b) ::= "" -DeclareLocal(s,v) ::= " = " - AssertIsList(v) ::= "assert isinstance(v, (list, tuple))" AssignLocal(s,v) ::= " = " @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%self. = %> AddMember(n,v) ::= <%self. += %> -PlusMember(v,n) ::= <% + str(self.)%> - MemberEquals(n,v) ::= <%self. == %> ModMemberEquals(n,m,v) ::= <%self. % == %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python3.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python3.test.stg index c91563017..3876834db 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python3.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Python3.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + str()" Concat(a,b) ::= "" -DeclareLocal(s,v) ::= " = " - AssertIsList(v) ::= "assert isinstance(v, (list, tuple))" AssignLocal(s,v) ::= " = " @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%self. = %> AddMember(n,v) ::= <%self. += %> -PlusMember(v,n) ::= <% + str(self.)%> - MemberEquals(n,v) ::= <%self. == %> ModMemberEquals(n,m,v) ::= <%self. % == %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Safari.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Safari.test.stg index 71254e0f2..112161500 100644 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Safari.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Safari.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = ;" - AssertIsList(v) ::= <> AssignLocal(s,v) ::= " = ;" @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%this. = ;%> AddMember(n,v) ::= <%this. += ;%> -PlusMember(v,n) ::= <% + this.%> - MemberEquals(n,v) ::= <%this. === %> ModMemberEquals(n,m,v) ::= <%this. % === %> diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Swift.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Swift.test.stg index 100d6f3e7..077968ef4 100755 --- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Swift.test.stg +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Swift.test.stg @@ -16,8 +16,6 @@ Append(a,b) ::= " + " Concat(a,b) ::= "" -DeclareLocal(s,v) ::= "var = " - AssertIsList(v) ::= "var __ttt__ = ;" // just use static type system AssignLocal(s,v) ::= " = " @@ -32,8 +30,6 @@ SetMember(n,v) ::= <%self. = %> AddMember(n,v) ::= <%self. += %> -PlusMember(v,n) ::= <% + self.%> - MemberEquals(n,v) ::= <%self. == %> ModMemberEquals(n,m,v) ::= <%self. % == %>