Merge branch 'master' of github.com:dwrensha/capnproto-java

Makefile

@@ -1,7 +1,7 @@
 CXX=clang++
 CXX_FLAGS=-std=c++11 -stdlib=libc++ `pkg-config capnp --cflags --libs`
 
-CAPNPC_JAVA_SOURCES=generator/src/main/cpp/compiler/capnpc-java.c++
+CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
 
 .PHONY: all clean addressbook
 
@@ -16,4 +16,4 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES)
 addressbook : capnpc-java
 	PWD=pwd
 	mkdir -p examples/src/main/generated
-	capnp compile -I$(PWD)/generator/src/main/cpp/compiler --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp
+	capnp compile -I$(PWD)/compiler/src/main/cpp --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp

generator/src/main/java/org/capnproto/FromStructBuilder.java

@@ -1,6 +0,0 @@
-package org.capnproto;
-
-public interface FromStructBuilder<T> {
-    public abstract T fromStructBuilder(StructBuilder builder);
-    public abstract StructSize structSize();
-}

project/build.scala

@@ -7,22 +7,27 @@ object Build extends sbt.Build {
     project(
       id = "capnproto-java",
       base = file(".")
-    ).aggregate(generator, examples)
+    ).aggregate(compiler, runtime, examples)
       .settings(cleanFiles <+= baseDirectory { base => base / "capnpc-java"})
 
-  lazy val generator =
+  lazy val compiler =
     project(
-      id = "generator",
+      id = "compiler",
-      base = file("generator")
+      base = file("compiler")
-    ).settings(Defaults.itSettings: _*)
+    ).settings(makeCppTask)
-      .settings(makeCppTask)
       .settings(compile <<= compile in Compile dependsOn makeCpp)
 
+  lazy val runtime =
+    project(
+      id = "runtime",
+      base = file("runtime")
+    )
+
   lazy val examples =
     project(
       id = "examples",
       base = file("examples")
-    ).dependsOn(generator)
+    ).dependsOn(runtime)
       .settings(makeExamplesTask)
       .settings(compile <<= compile in Compile dependsOn makeExamples)
       .settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated")

runtime/src/main/java/org/capnproto/AnyPointer.java

@@ -1,9 +1,9 @@
 package org.capnproto;
 
-public class AnyPointer {
+public final class AnyPointer {
 
-    public static class Reader {
+    public final static class Reader {
-        public PointerReader reader;
+        public final PointerReader reader;
 
         public Reader(PointerReader reader) {
             this.reader = reader;

runtime/src/main/java/org/capnproto/DecodeException.java

@@ -1,6 +1,6 @@
 package org.capnproto;
 
-public class DecodeException extends RuntimeException {
+public final class DecodeException extends RuntimeException {
     public DecodeException(String message) {
         super(message);
     }

runtime/src/main/java/org/capnproto/FieldSize.java

@@ -1,6 +1,6 @@
 package org.capnproto;
 
-public class FieldSize {
+public final class FieldSize {
     public static final byte VOID = 0;
     public static final byte BIT = 1;
     public static final byte BYTE = 2;

runtime/src/main/java/org/capnproto/FromStructBuilder.java

@@ -0,0 +1,6 @@
+package org.capnproto;
+
+public interface FromStructBuilder<T> {
+    T fromStructBuilder(StructBuilder builder);
+    StructSize structSize();
+}

runtime/src/main/java/org/capnproto/FromStructReader.java

@@ -1,5 +1,5 @@
 package org.capnproto;
 
 public interface FromStructReader<T> {
-    public abstract T fromStructReader(StructReader reader);
+    T fromStructReader(StructReader reader);
 }

runtime/src/main/java/org/capnproto/InputStreamMessageReader.java

@@ -1,13 +1,12 @@
 package org.capnproto;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Vector;
 
-
+public final class InputStreamMessageReader {
-public class InputStreamMessageReader {
 
     static byte[] readExact(InputStream is, int length) throws IOException {
         byte[] bytes = new byte[length];

runtime/src/main/java/org/capnproto/ListBuilder.java

@@ -1,12 +1,12 @@
 package org.capnproto;
 
 public final class ListBuilder {
-    SegmentBuilder segment;
+    final SegmentBuilder segment;
-    int ptr; // byte offset to front of list
+    final int ptr; // byte offset to front of list
-    int elementCount;
+    final int elementCount;
-    int step; // in bits
+    final int step; // in bits
-    int structDataSize; // in bits
+    final int structDataSize; // in bits
-    short structPointerCount;
+    final short structPointerCount;
 
     public ListBuilder(SegmentBuilder segment, int ptr,
                        int elementCount, int step,

runtime/src/main/java/org/capnproto/ListReader.java

@@ -1,14 +1,13 @@
 package org.capnproto;
 
-public class ListReader {
+public final class ListReader {
-    SegmentReader segment;
+    final SegmentReader segment;
-    int ptr; // byte offset to front of list
+    final int ptr; // byte offset to front of list
-    int elementCount;
+    final int elementCount;
-    int step; // in bits
+    final int step; // in bits
-    int structDataSize; // in bits
+    final int structDataSize; // in bits
-    short structPointerCount;
+    final short structPointerCount;
-    int nestingLimit;
+    final int nestingLimit;
-
 
     public ListReader() {
         this.segment = null;

runtime/src/main/java/org/capnproto/MessageReader.java

@@ -2,8 +2,8 @@ package org.capnproto;
 
 import java.nio.ByteBuffer;
 
-public class MessageReader {
+public final class MessageReader {
-    ByteBuffer[] segmentSlices;
+    final ByteBuffer[] segmentSlices;
 
     public MessageReader(ByteBuffer[] segmentSlices) {
         this.segmentSlices = segmentSlices;

runtime/src/main/java/org/capnproto/PointerBuilder.java

@@ -1,8 +1,8 @@
 package org.capnproto;
 
 public final class PointerBuilder {
-    public SegmentBuilder segment;
+    public final SegmentBuilder segment;
-    public int pointer; // word offset
+    public final int pointer; // word offset
 
     public PointerBuilder(SegmentBuilder segment, int pointer) {
         this.segment = segment;

runtime/src/main/java/org/capnproto/PointerReader.java

@@ -1,9 +1,9 @@
 package org.capnproto;
 
-public class PointerReader {
+public final class PointerReader {
-    public SegmentReader segment;
+    public final SegmentReader segment;
-    public int pointer; // word offset
+    public final int pointer; // word offset
-    public int nestingLimit;
+    public final int nestingLimit;
 
     public PointerReader() {
         this.segment = null;

runtime/src/main/java/org/capnproto/SegmentBuilder.java

@@ -2,11 +2,11 @@ package org.capnproto;
 
 import java.nio.ByteBuffer;
 
-public class SegmentBuilder extends SegmentReader {
+public final class SegmentBuilder extends SegmentReader {
-    public int pos = 0; // in words
-
     public static final int FAILED_ALLOCATION = -1;
 
+    public int pos = 0; // in words
+
     public SegmentBuilder(ByteBuffer buf) {
         super(buf);
     }

runtime/src/main/java/org/capnproto/SegmentReader.java

@@ -3,7 +3,7 @@ package org.capnproto;
 import java.nio.ByteBuffer;
 
 public class SegmentReader {
-    ByteBuffer buffer;
+    final ByteBuffer buffer;
 
     public SegmentReader(ByteBuffer buffer) {
         this.buffer = buffer;

runtime/src/main/java/org/capnproto/StructBuilder.java

@@ -1,12 +1,12 @@
 package org.capnproto;
 
 public final class StructBuilder {
-    public SegmentBuilder segment;
+    public final SegmentBuilder segment;
-    public int data; //byte offset to data section
+    public final int data; //byte offset to data section
-    public int pointers; // word offset of pointer section
+    public final int pointers; // word offset of pointer section
-    public int dataSize; // in bits
+    public final int dataSize; // in bits
-    public short pointerCount;
+    public final short pointerCount;
-    public byte bit0Offset;
+    public final byte bit0Offset;
 
     public StructBuilder(SegmentBuilder segment, int data,
                          int pointers, int dataSize, short pointerCount,

runtime/src/main/java/org/capnproto/StructList.java

@@ -1,6 +1,5 @@
 package org.capnproto;
 
-
 public final class StructList {
     public static final class Reader<T> {
         public ListReader reader;

runtime/src/main/java/org/capnproto/StructReader.java

@@ -1,14 +1,13 @@
 package org.capnproto;
 
 public final class StructReader {
-    public SegmentReader segment;
+    public final SegmentReader segment;
-    public int data; //byte offset to data section
+    public final int data; //byte offset to data section
-    public int pointers; // word offset of pointer section
+    public final int pointers; // word offset of pointer section
-    public int dataSize; // in bits
+    public final int dataSize; // in bits
-    public short pointerCount;
+    public final short pointerCount;
-    public byte bit0Offset;
+    public final byte bit0Offset;
-    public int nestingLimit;
+    public final int nestingLimit;
-
 
     public StructReader(SegmentReader segment, int data,
                         int pointers, int dataSize, short pointerCount,

runtime/src/main/java/org/capnproto/Text.java

@@ -2,7 +2,7 @@ package org.capnproto;
 
 import java.nio.ByteBuffer;
 
-public class Text {
+public final class Text {
 
     public static final class Reader {
         public final ByteBuffer buffer;