From b60112ae937534e3c8779c0cec9fdb2d8e9279d3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 31 Dec 2010 22:27:51 +0000
Subject: [PATCH] Some fiddling to keep the CPP bits in sync as well.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6397 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/tools/cpp/CPPArgBuilder.java     | 23 +++++++------------
 .../presents/tools/cpp/GenCPPServiceTask.java |  2 +-
 .../presents/tools/cpp/MethodDescriptor.java  | 11 +++++----
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java b/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
index 62f2ebaf9..14daa39eb 100644
--- a/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
+++ b/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
@@ -10,11 +10,6 @@ import com.threerings.presents.tools.InvocationTask.ServiceMethod;
 
 public class CPPArgBuilder
 {
-    public CPPArgBuilder(boolean ignoreFirst)
-    {
-        _ignoreFirst = ignoreFirst;
-    }
-
     public String getArguments (ServiceMethod meth)
     {
         return getArguments(meth, "");
@@ -24,11 +19,11 @@ public class CPPArgBuilder
     {
         StringBuilder buf = new StringBuilder(prefix);
         Type[] ptypes = meth.method.getGenericParameterTypes();
-        for (int ii = _ignoreFirst ? 1 : 0; ii < ptypes.length; ii++) {
+        for (int ii = 0; ii < ptypes.length; ii++) {
             if (buf.length() > 0) {
                 buf.append(", ");
             }
-            buf.append(CPPUtil.getCPPType(ptypes[ii])).append(" arg").append(ii);
+            buf.append(CPPUtil.getCPPType(ptypes[ii])).append(" arg").append(ii+1);
         }
         return buf.toString();
     }
@@ -36,9 +31,9 @@ public class CPPArgBuilder
     public List<String> getArgumentNames (ServiceMethod meth)
     {
         Type[] ptypes = meth.method.getGenericParameterTypes();
-        List<String> args = Lists.newArrayListWithCapacity(ptypes.length - 1);
-        for (int ii = 1; ii < ptypes.length; ii++) {
-            args.add("arg" + ii);
+        List<String> args = Lists.newArrayListWithCapacity(ptypes.length);
+        for (int ii = 0; ii < ptypes.length; ii++) {
+            args.add("arg" + (ii+1));
         }
         return args;
     }
@@ -47,7 +42,7 @@ public class CPPArgBuilder
     {
         StringBuilder buf = new StringBuilder();
         Type[] ptypes = meth.method.getGenericParameterTypes();
-        for (int ii = _ignoreFirst ? 1 : 0; ii < ptypes.length; ii++) {
+        for (int ii = 0; ii < ptypes.length; ii++) {
             if (buf.length() > 0) {
                 buf.append(", ");
             }
@@ -61,11 +56,9 @@ public class CPPArgBuilder
     {
         Type[] ptypes = meth.method.getGenericParameterTypes();
         List<String> args = Lists.newArrayListWithCapacity(ptypes.length);
-        for (int ii = _ignoreFirst ? 1 : 0; ii < ptypes.length; ii++) {
-            args.add(new CPPType(ptypes[ii]).getAsStreamable("arg" + ii));
+        for (int ii = 0; ii < ptypes.length; ii++) {
+            args.add(new CPPType(ptypes[ii]).getAsStreamable("arg" + (ii+1)));
         }
         return args;
     }
-
-    protected final boolean _ignoreFirst;
 }
diff --git a/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java b/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
index 8580375ec..46c3bf537 100644
--- a/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
+++ b/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
@@ -38,7 +38,7 @@ public class GenCPPServiceTask extends GenServiceTask
         ctx.put("namespace", Joiner.on("::").join(namespaces));
         ctx.put("methods",  MethodDescriptor.from(sdesc.methods));
         ctx.put("listeners", sdesc.listeners);
-        ctx.put("argbuilder", new CPPArgBuilder(true));
+        ctx.put("argbuilder", new CPPArgBuilder());
 
         Set<String> includes = Sets.newTreeSet();
         Set<String> implIncludes = Sets.newTreeSet();
diff --git a/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java b/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
index 0d37b4cfa..f07b4514a 100644
--- a/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
+++ b/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
@@ -24,9 +24,10 @@ public class MethodDescriptor
 
     public MethodDescriptor(ServiceMethod methodSource) {
         methodName = methodSource.method.getName();
-        vectorArguments = new CPPArgBuilder(false).getArgumentsFromVector(methodSource);
-        arguments = new CPPArgBuilder(false).getArguments(methodSource);
-        clientArguments = new CPPArgBuilder(true).getArguments(methodSource, "Shared<presents::PresentsClient> client");
-        serviceArguments = new CPPArgBuilder(true).getServiceArguments(methodSource);
+        vectorArguments = new CPPArgBuilder().getArgumentsFromVector(methodSource);
+        arguments = new CPPArgBuilder().getArguments(methodSource);
+        clientArguments = new CPPArgBuilder().getArguments(
+            methodSource, "Shared<presents::PresentsClient> client");
+        serviceArguments = new CPPArgBuilder().getServiceArguments(methodSource);
     }
-}
\ No newline at end of file
+}