From 8976238bcc2f6952af6b5f93e6ee1a7eba4d0e27 Mon Sep 17 00:00:00 2001
From: aegis <github@xn--g-3fa.is>
Date: Thu, 16 May 2013 11:32:37 +0200
Subject: [PATCH] Switched sequence and choice in JNI to varargs
---
jni/Example.java | 4 ++--
jni/com/upstandinghackers/hammer/Hammer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jni/Example.java b/jni/Example.java
index 8cfa7242..4e6d7682 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 cd252d9d..3e06a91e 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);
--
GitLab