Switched sequence and choice in JNI to varargs

This commit is contained in:
aegis 2013-05-16 11:32:37 +02:00
parent 62501e5447
commit 8976238bcc
2 changed files with 4 additions and 4 deletions

View file

@ -77,12 +77,12 @@ public static void main(String args[])
out("choice");
Parser two32s[] = {Hammer.intRange(Hammer.uInt32(), 0x00, 0x01), Hammer.int32()};
handle(Hammer.parse(Hammer.choice(two32s), ints, ints.length));
handle(Hammer.parse(Hammer.choice(Hammer.intRange(Hammer.uInt32(), 0x00, 0x01), Hammer.int32()), ints, ints.length));
out("sequence");
byte i3[] = {(byte)'i', (byte)3, (byte)0xFF};
Parser i3parsers[] = {Hammer.ch((byte)'i'), Hammer.uInt8(), Hammer.int8()};
handle(Hammer.parse(Hammer.sequence(i3parsers), i3, i3.length));
handle(Hammer.parse(Hammer.sequence(Hammer.ch((byte)'i'), Hammer.uInt8(), Hammer.int8()), i3, i3.length));
}

View file

@ -55,8 +55,8 @@ public class Hammer
public static native Parser in(byte[] charset, int length);
public static native Parser endP();
public static native Parser nothingP();
public static native Parser sequence(Parser[] parsers);
public static native Parser choice(Parser[] parsers);
public static native Parser sequence(Parser... parsers);
public static native Parser choice(Parser... parsers);
public static native Parser butNot(Parser p1, Parser p2);
public static native Parser difference(Parser p1, Parser p2);
public static native Parser xor(Parser p1, Parser p2);