AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix code generation to work with jmustache 1.4

Browse Source 
In addition to the streamable generation, there were also issues with the receiver stuff, mostly to do with import
ordering. Modernizing that code to use ImportSet and {importGroups} seems to have fixed it.

NOTE: This is also broken in narya 1.9, but it not really worth the effort to fix that. It's easier just to move all
the projects that need it back to trunk. Hurray bleeding edge!

Testing done: gencode in orth and who, checked no diffs were generated.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6727 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Jamie Doornbos
2011-10-10 19:26:43 +00:00
parent b15a2d2471
commit b185502683
9 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/bureau/server/BureauSender.java
+3 -2
View File
@@ -21,11 +21,12 @@
package com.threerings.bureau.server;
import com.threerings.bureau.client.BureauDecoder;
import com.threerings.bureau.client.BureauReceiver;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationSender;
import com.threerings.bureau.client.BureauDecoder;
import com.threerings.bureau.client.BureauReceiver;
/**
* Used to issue notifications to a {@link BureauReceiver} instance on a
* client.
src/main/java/com/threerings/crowd/server/LocationSender.java
+3 -2
View File
@@ -21,11 +21,12 @@
package com.threerings.crowd.server;
import com.threerings.crowd.client.LocationDecoder;
import com.threerings.crowd.client.LocationReceiver;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationSender;
import com.threerings.crowd.client.LocationDecoder;
import com.threerings.crowd.client.LocationReceiver;
/**
* Used to issue notifications to a {@link LocationReceiver} instance on a
* client.
src/main/java/com/threerings/presents/tools/GenReceiverTask.java
+19 -23
View File
@@ -24,13 +24,11 @@ package com.threerings.presents.tools;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Iterator;
import java.util.List;
import java.io.File;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import com.samskivert.util.ComparableArrayList;
import com.samskivert.util.StringUtil;
@@ -95,27 +93,26 @@ public class GenReceiverTask extends InvocationTask
// get rid of primitives and java.lang types
imports.removeGlobals();
generateSender(source, rname, rpackage, methods, imports.toList().iterator());
generateDecoder(receiver, source, rname, rpackage, methods, imports.toList().iterator(),
generateSender(source, rname, rpackage, methods, imports);
generateDecoder(receiver, source, rname, rpackage, methods, imports,
StringUtil.md5hex(rpackage + "." + rname));
}
protected void generateSender (File source, String rname, String rpackage,
List<?> methods, Iterator<String> imports)
List<?> methods, ImportSet imports)
throws Exception
{
String name = rname.replace("Receiver", "");
String spackage = rpackage.replace(".client", ".server");
// construct our imports list
ComparableArrayList<String> implist = new ComparableArrayList<String>();
Iterators.addAll(implist, imports);
checkedAdd(implist, ClientObject.class.getName());
checkedAdd(implist, InvocationSender.class.getName());
ImportSet impset = new ImportSet();
impset.addAll(imports);
impset.add(ClientObject.class);
impset.add(InvocationSender.class);
String dname = rname.replace("Receiver", "Decoder");
checkedAdd(implist, rpackage + "." + dname);
checkedAdd(implist, rpackage + "." + rname);
implist.sort();
impset.add(rpackage + "." + dname);
impset.add(rpackage + "." + rname);
// determine the path to our sender file
String mpath = source.getPath();
@@ -125,20 +122,19 @@ public class GenReceiverTask extends InvocationTask
"name", name,
"package", spackage,
"methods", methods,
"imports", implist);
"importGroups", impset.toGroups());
}
protected void generateDecoder (Class<?> receiver, File source, String rname, String rpackage,
List<ServiceMethod> methods, Iterator<String> imports,
List<ServiceMethod> methods, ImportSet imports,
String rcode) throws Exception
{
String name = rname.replace("Receiver", "");
// construct our imports list
ComparableArrayList<String> implist = new ComparableArrayList<String>();
Iterators.addAll(implist, imports);
checkedAdd(implist, InvocationDecoder.class.getName());
implist.sort();
ImportSet impset = new ImportSet();
impset.addAll(imports);
impset.add(InvocationDecoder.class);
// determine the path to our sender file
String mpath = source.getPath();
@@ -148,7 +144,7 @@ public class GenReceiverTask extends InvocationTask
"receiver_code", rcode,
"package", rpackage,
"methods", methods,
"imports", implist);
"importGroups", impset.toGroups());
if (_asroot == null) {
return;
}
@@ -160,17 +156,17 @@ public class GenReceiverTask extends InvocationTask
"receiver_code", rcode,
"package", rpackage,
"methods", methods,
"imports", implist);
"importGroups", impset.toGroups());
// ... and an ActionScript receiver
aspath = _asroot + File.separator + sppath + File.separator + rname + ".as";
implist.remove(InvocationDecoder.class.getName());
checkedAdd(implist, InvocationReceiver.class.getName());
impset.remove(InvocationDecoder.class);
impset.add(InvocationReceiver.class);
writeTemplate(AS_RECEIVER_TMPL, aspath,
"name", name,
"package", rpackage,
"methods", methods,
"imports", implist);
"importGroups", impset.toGroups());
}
/** The path to our ActionScript source files. */
src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
+2 -2
View File
@@ -25,7 +25,6 @@ import static com.threerings.presents.tools.cpp.CPPUtil.makePath;
import java.lang.reflect.Type;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -36,6 +35,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.threerings.presents.tools.GenReceiverTask;
import com.threerings.presents.tools.ImportSet;
public class GenCPPReceiverTask extends GenReceiverTask
{
@@ -46,7 +46,7 @@ public class GenCPPReceiverTask extends GenReceiverTask
@Override
protected void generateDecoder (Class<?> receiver, File source, String rname, String rpackage,
List<ServiceMethod> methods, Iterator<String> imports, String rcode)
List<ServiceMethod> methods, ImportSet imports, String rcode)
throws Exception
{
String dname = rname.replace("Receiver", "Decoder");
src/main/resources/com/threerings/presents/tools/decoder.tmpl
+4 -2
View File
@@ -1,9 +1,11 @@
package {{package}};
{{#imports}}
{{#importGroups}}
{{#this}}
import {{this}};
{{/imports}}
{{/this}}
{{/importGroups}}
/**
* Dispatches calls to a {@link {{name}}Receiver} instance.
*/
src/main/resources/com/threerings/presents/tools/decoder_as.tmpl
+4 -2
View File
@@ -1,9 +1,11 @@
package {{package}} {
{{#imports}}
{{#importGroups}}
{{#this}}
import {{this}};
{{/imports}}
{{/this}}
{{/importGroups}}
/**
* Dispatches calls to a {@link {{name}}Receiver} instance.
*/
src/main/resources/com/threerings/presents/tools/receiver_as.tmpl
+4 -2
View File
@@ -1,9 +1,11 @@
package {{package}} {
{{#imports}}
{{#importGroups}}
{{#this}}
import {{this}};
{{/imports}}
{{/this}}
{{/importGroups}}
public interface {{name}}Receiver extends InvocationReceiver
{
{{#methods}}
src/main/resources/com/threerings/presents/tools/sender.tmpl
+4 -2
View File
@@ -1,9 +1,11 @@
package {{package}};
{{#imports}}
{{#importGroups}}
{{#this}}
import {{this}};
{{/imports}}
{{/this}}
{{/importGroups}}
/**
* Used to issue notifications to a {@link {{name}}Receiver} instance on a
* client.
src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
+24 -13
View File
@@ -21,7 +21,6 @@ public class {{classname}} {{^extends.isEmpty}}extends {{extends}}
{{#pubFields}}
public var {{name}} :{{simpleType}};{{#hasTypeParameters}} /* of */ {{parameterTypes}};{{/hasTypeParameters}}
{{/pubFields}}
{{#dobject}}
{{#pubFields}}
@@ -139,11 +138,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#dset}}
{{#pubFields}}
{{#dset}}
case "{{name}}":
signal = _obj.{{name}}EntryAdded;
break;
{{/dset}}{{/pubFields}}
{{/dset}}
{{/pubFields}}
default:
return;
}
@@ -154,11 +155,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#dset}}
{{#pubFields}}
{{#dset}}
case "{{name}}":
signal = _obj.{{name}}EntryRemoved;
break;
{{/dset}}{{/pubFields}}
{{/dset}}
{{/pubFields}}
default:
return;
}
@@ -169,11 +172,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#dset}}
{{#pubFields}}
{{#dset}}
case "{{name}}":
signal = _obj.{{name}}EntryUpdated;
break;
{{/dset}}{{/pubFields}}
{{/dset}}
{{/pubFields}}
default:
return;
}
@@ -184,11 +189,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#array}}
{{#pubFields}}
{{#array}}
case "{{name}}":
signal = _obj.{{name}}ElementUpdated;
break;
{{/array}}{{/pubFields}}
{{/array}}
{{/pubFields}}
default:
return;
}
@@ -199,11 +206,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#oidList}}
{{#pubFields}}
{{#oidList}}
case "{{name}}":
signal = _obj.{{name}}ObjectAdded;
break;
{{/oidList}}{{/pubFields}}
{{/oidList}}
{{/pubFields}}
default:
return;
}
@@ -214,11 +223,13 @@ class Signaller
{
var signal :Signal;
switch (event.getName()) {
{{#pubFields}}{{#oidList}}
{{#pubFields}}
{{#oidList}}
case "{{name}}":
signal = _obj.{{name}}ObjectRemoved;
break;
{{/oidList}}{{/pubFields}}
{{/oidList}}
{{/pubFields}}
default:
return;
}