/*
 * Copyright (C) 2009-2011 Mathias Doenitz
 *
 * 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.matchers;

import com.google.common.base.Preconditions;
import org.parboiled.MatcherContext;
import org.parboiled.Rule;
import org.parboiled.matchervisitors.MatcherVisitor;

/**
 * A {@link Matcher} that repeatedly tries its submatcher against the input.
 * Succeeds if its submatcher succeeds at least once.
 */
public class OneOrMoreMatcher extends CustomDefaultLabelMatcher<OneOrMoreMatcher> {
    public final Matcher subMatcher;

    public OneOrMoreMatcher(final Rule subRule) {
        super(Preconditions.checkNotNull(subRule, "subRule"), "OneOrMore");
        this.subMatcher = getChildren().get(0);
    }

    @Override
    public <V> boolean match(final MatcherContext<V> context) {
        final boolean matched = subMatcher.getSubContext(context).runMatcher();
        if (!matched) return false;

        // collect all further matches as well
        while (subMatcher.getSubContext(context).runMatcher())
            ; // nothing

        context.createNode();
        return true;
    }

    @Override
    public <R> R accept(final MatcherVisitor<R> visitor) {
        Preconditions.checkNotNull(visitor, "visitor");
        return visitor.visit(this);
    }
}

@@ -740,16 +740,62 @@
 d.Rule;%0A
+import org.parboiled.errors.GrammarException;%0A
 import o
@@ -1524,16 +1524,67 @@
 as well%0A
+        int lastIndex = context.getCurrentIndex();%0A
         
@@ -1637,16 +1637,18 @@
 tcher())
+ %7B
 %0A       
@@ -1656,20 +1656,317 @@
     
-; // nothing
+int currentIndex = context.getCurrentIndex();%0A            if (currentIndex == lastIndex) %7B%0A                throw new GrammarException(%22The inner rule of OneOrMore rule '%25s' must not allow empty matches%22,%0A                        context.getPath());%0A            %7D%0A            lastIndex = currentIndex;%0A        %7D
 %0A%0A  

Revert "OneOrMoreMatcher: skip test for empty match"