The override keyword should not be generated for interface implementations when -separateInterfaceConstants is specified

Antlr4.Runtime/ANTLRInputStream.cs

@@ -282,7 +282,7 @@ namespace Antlr4.Runtime
             }
         }
 
-        public override string GetText(Interval interval)
+        public virtual string GetText(Interval interval)
         {
             int start = interval.a;
             int stop = interval.b;

Antlr4.Runtime/Atn/ATNConfigSet.cs

@@ -672,12 +672,12 @@ namespace Antlr4.Runtime.Atn
 
             internal bool removed = false;
 
-            public override bool HasNext()
+            public bool HasNext()
             {
                 return this.index + 1 < this._enclosing.configs.Count;
             }
 
-            public override ATNConfig Next()
+            public ATNConfig Next()
             {
                 if (!this.HasNext())
                 {
@@ -688,7 +688,7 @@ namespace Antlr4.Runtime.Atn
                 return this._enclosing.configs[this.index];
             }
 
-            public override void Remove()
+            public void Remove()
             {
                 if (this.removed || this.index < 0 || this.index >= this._enclosing.configs.Count)
                 {

Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs

@@ -201,12 +201,12 @@ namespace Antlr4.Runtime.Dfa
 
             private int currentIndex;
 
-            public override bool HasNext()
+            public virtual bool HasNext()
             {
                 return this.current < this._enclosing.Size();
             }
 
-            public override KeyValuePair<int, T> Next()
+            public virtual KeyValuePair<int, T> Next()
             {
                 if (this.current >= this._enclosing.Size())
                 {
@@ -256,7 +256,7 @@ namespace Antlr4.Runtime.Dfa
                 }
             }
 
-            public override void Remove()
+            public virtual void Remove()
             {
                 throw new NotSupportedException("Not supported yet.");
             }

Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs

@@ -173,12 +173,12 @@ namespace Antlr4.Runtime.Dfa
         {
             private int current;
 
-            public override bool HasNext()
+            public virtual bool HasNext()
             {
                 return this.current < this._enclosing.Size();
             }
 
-            public override KeyValuePair<int, T> Next()
+            public virtual KeyValuePair<int, T> Next()
             {
                 if (this.current >= this._enclosing.Size())
                 {
@@ -222,7 +222,7 @@ namespace Antlr4.Runtime.Dfa
                 }
             }
 
-            public override void Remove()
+            public virtual void Remove()
             {
                 throw new NotSupportedException("Not supported yet.");
             }

Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs

@@ -228,12 +228,12 @@ namespace Antlr4.Runtime.Dfa
         {
             private int current;
 
-            public override bool HasNext()
+            public virtual bool HasNext()
             {
                 return this.current < this._enclosing.Size();
             }
 
-            public override KeyValuePair<int, T> Next()
+            public virtual KeyValuePair<int, T> Next()
             {
                 if (this.current >= this._enclosing.Size())
                 {
@@ -277,7 +277,7 @@ namespace Antlr4.Runtime.Dfa
                 }
             }
 
-            public override void Remove()
+            public virtual void Remove()
             {
                 throw new NotSupportedException("Not supported yet.");
             }

Antlr4.Runtime/Misc/Array2DHashSet`1.cs

@@ -661,12 +661,12 @@ namespace Antlr4.Runtime.Misc
                 this.data = data;
             }
 
-            public override bool HasNext()
+            public virtual bool HasNext()
             {
                 return this.nextIndex < this.data.Length;
             }
 
-            public override T Next()
+            public virtual T Next()
             {
                 if (!this.HasNext())
                 {
@@ -676,7 +676,7 @@ namespace Antlr4.Runtime.Misc
                 return this.data[this.nextIndex++];
             }
 
-            public override void Remove()
+            public virtual void Remove()
             {
                 if (this.removed)
                 {

Antlr4.Runtime/UnbufferedCharStream.cs

@@ -415,7 +415,7 @@ namespace Antlr4.Runtime
             }
         }
 
-        public override string GetText(Interval interval)
+        public virtual string GetText(Interval interval)
         {
             if (interval.a < 0 || interval.b < interval.a - 1)
             {

reference/sharpen

@@ -1 +1 @@
-Subproject commit 68be6f96a8f913182e085b25c640aeeb93b9b122
+Subproject commit 512c3252f2f4ddc3ad34862b1f649f337592ff26