diff --git a/jni/Example.java b/jni/Example.java index 8cfa72428f2c3d7ae4f92d8625b467aebeaacc33..4e6d76825aa64ddeb9e916ea0596e457ff2751f0 100644 --- a/jni/Example.java +++ b/jni/Example.java @@ -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)); } diff --git a/jni/com/upstandinghackers/hammer/Hammer.java b/jni/com/upstandinghackers/hammer/Hammer.java index cd252d9dbdcfb361aab5ffbdbcb9b21c61a04e26..3e06a91eca4b15eebbfe28c99547829a3c2d6068 100644 --- a/jni/com/upstandinghackers/hammer/Hammer.java +++ b/jni/com/upstandinghackers/hammer/Hammer.java @@ -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);