/*
 * Copyright (C) 2013 Chris Leishman
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.parboiled.support;

import com.github.parboiled1.grappa.cleanup.WillBeFinal;
import org.parboiled.matchers.Matcher;

@WillBeFinal(version = "1.1")
public class MatcherPosition
{
    private final Matcher matcher;
    // TODO: replace with int
    private final Integer index;

    protected MatcherPosition(final Matcher matcher, final Integer index)
    {
        this.matcher = matcher;
        this.index = index;
    }

    public static MatcherPosition at(final Matcher matcher, final Integer index)
    {
        return new MatcherPosition(matcher, index);
    }

    @Override
    public int hashCode()
    {
        return 31 * matcher.hashCode() + index;
    }

    @Override
    public boolean equals(final Object obj)
    {
        if (!(obj instanceof MatcherPosition))
            return false;
        if (this == obj)
            return true;
        final MatcherPosition other = (MatcherPosition) obj;
        return matcher == other.matcher && index == other.index;
    }
}

@@ -680,16 +680,75 @@
 eFinal;%0A
+import com.github.parboiled1.grappa.cleanup.WillBePrivate;%0A
 import o
@@ -879,38 +879,8 @@
 er;%0A
-    // TODO: replace with int%0A
     
@@ -889,31 +889,27 @@
 ivate final 
-I
+i
 nt
-eger
  index;%0A%0A   
@@ -905,16 +905,52 @@
 index;%0A%0A
+    @WillBePrivate(version = %221.1%22)%0A
     prot
@@ -992,39 +992,35 @@
  matcher, final 
-I
+i
 nt
-eger
  index)%0A    %7B%0A  
@@ -1154,15 +1154,11 @@
 nal 
-I
+i
 nt
-eger
  ind

replace Integer with int in the index