Commit Graph

103 Commits

Author SHA1 Message Date
Michael Bayne c743432676 More style changes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5248 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-22 13:02:13 +00:00
Michael Bayne 0aa0e48c28 The provider needs to import the service for all of our javadoc to work. If
Eclipse doesn't know about javadoc, we should file a bug.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5246 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-22 12:50:15 +00:00
Michael Bayne 85b26867e3 Put this all on one line to avoid weird whitespace.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5245 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-22 12:48:57 +00:00
Michael Bayne 219ab38b77 Widening; nixed import of receiver as it's not needed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5244 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-22 12:33:37 +00:00
Dave Hoover bd285bafc7 Teach that switch statement about all values for that enum.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5243 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-21 18:24:04 +00:00
Dave Hoover 6b1d65553f And finally, narya gets the imports/overrides/regen love.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5241 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-18 23:20:17 +00:00
Michael Bayne e41dda3018 Style fixes and import pruning. Beware, CheckStyle is (finally) coming to town.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5240 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-18 18:32:59 +00:00
Dave Hoover 1578adceb1 Unless I'm missing something, those bits of generated code don't need those extra imports.
I've rerun the code generators without those in vilya & yohoho and everything seems happy,
so let's give it a whirl.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5225 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-10 18:39:29 +00:00
Michael Bayne 8d6635e8e0 Type the marshaller and associated registry methods so that we don't have to
downcast every time we register an invocation service provider.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5201 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-29 12:36:21 +00:00
Jamie Doornbos 39f408e2a8 weirdly, we have exactly one service that uses Integer instead of int for some reason
TODO: provide a convertAllLangTypes method instead of adding new types as they crop up

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5189 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-23 18:44:09 +00:00
Jamie Doornbos 35955cc701 Fixed another couple of bugs in service generation discovered when generating services for vilya
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5122 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-23 00:40:56 +00:00
Andrzej Kapolka efb1a7c89a Use the overloaded default methods for default transport.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5115 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-22 00:36:20 +00:00
Andrzej Kapolka 117fb1a67b The problem was elsewhere, so revert the last couple of changes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5106 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-18 06:59:16 +00:00
Andrzej Kapolka 7a1ec4a3a1 Let's see if it helps to have the enum outside the class.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5105 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-17 01:52:32 +00:00
Mike Thomas 943e18ac4a genreceiver also needs to deal with arrays as parameters for import purposes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5101 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-16 17:05:02 +00:00
Andrzej Kapolka db874782f9 Allow inheriting the transport hint from the containing class.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5100 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-16 02:41:40 +00:00
Andrzej Kapolka ee74481cad Much work on generalizing the notion of message "transport" and
allowing the use of annotations to customize transport for 
DObject fields and service/receiver methods.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5099 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-16 01:47:33 +00:00
Mike Thomas c42281ce7a Patch from Jamie to ensure GenService still finds all the array parameters for importing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5069 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 23:06:43 +00:00
Jamie Doornbos 8eef2df364 Fixed same package removal to not also wipe out subpackages
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5052 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-08 19:30:55 +00:00
Jamie Doornbos 6ee4f8115f When generating service-related code, remove imports of classes in the same package
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5050 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-08 19:16:06 +00:00
Jamie Doornbos 147e849cbb adding missing license header
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5049 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-08 19:07:30 +00:00
Jamie Doornbos 98bb871e6d Fixed code generation for existing msoy services
* Created concept of a pattern for transforming imports rather than have some
  methods assume a suffix is provided and others assume a prefix
* Leave full array types in import set initially so that they can be dealt with 
  differently by different code exporters
* Added more primitive types and array types for action script marshallers, 
  including conversion to TypedArray
* Add listener marshaller mungings for action script marshallers' imports
* Added handling for array imports for action script services


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5048 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-08 19:06:32 +00:00
Jamie Doornbos 2ecda5b89a Forgot to check the receivers, needed to do the standard removeGlobals call
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5042 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-06 22:48:36 +00:00
Jamie Doornbos 61b1f23303 Narya.abc work - refactored GenServiceTask import mechanism in order to generate
clean action script files with no unnecessary imports
* New class ImportSet to facilitate the operations being performed manually
  throughout the code. Also removes the need for rawimports
* Threaded ImportSet through all places where imports and rawimports were used
  and removed magic parameters to control import generation
* Added an ImportSet instance to ServiceListener, this was key to the action 
  script fixes
* Moved all the import tweaking and munging logic into the generate* methods
  and made specific to code being generated (removed overreaching stuff
  from ServiceMethod, this was part of the problem)
* Removed blanket imports from tmpl files
* Removed unused methods
* Fixed tabs from last commit
* Quick and dirty script to check for unused imports


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5041 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-06 22:44:36 +00:00
Jamie Doornbos bf501313f1 Narya.abc work - get rid of unused imports in generated service targets:
* ServiceMethod import options:
  - Made argument type imports ignore first N args (0 for old behavior)
  - Made marshaller listener imports optional
* Added InvocationTask._verbose and several dumps of current imports to help 
  track down future superfluous imports
* Made the import of ServiceListener method arguments' types optional
* Wrapped up most of processService code into protected inner class 
  ServiceDescription and made configurable:
  - Optional import of the types of the first arguments of the service methods
  - Optinoal import of the types of listener method arguments
* Changed generate methods to take the service class and construct their own
  local ServiceDescription configured for their target
* Removed global import of service class and do it explicitly where required
  (via method addServiceImport)
* Made some imports conditional
  - InvocationResponseEvent for mashallers only if service has some listeners
  - InvocationException for providers only if service has some methods with 
    listener arguments
* Removed unused variables and imports


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5036 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-05 22:53:31 +00:00
Dave Hoover 6eb2c79b19 Flag overrides in this template.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4878 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-11-21 19:16:05 +00:00
Michael Bayne ae6e8f1bdb We need to scan up the hierarchy so that if we're overriding a renamed method
(e.g toString(StringBuffer)) we use the properly renamed version
(e.g. toStringBuffer(StringBuffer)) when generating our ActionScript.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4870 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-11-12 19:37:08 +00:00
Michael Bayne 27b95dd19a Nix another redundant cast.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4850 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-10-19 18:28:56 +00:00
Michael Bayne 66660bc490 Don't need to cast the result of an array clone.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4849 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-10-19 18:22:37 +00:00
Michael Bayne 466ae35688 Proper Long handling and checking for @ActionScript(omit=true) up the
superclass chain. Other such annotation "inheritance" is needed for methods,
but that I'll do later.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4840 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-10-09 01:52:22 +00:00
Michael Bayne 5a490043c4 Added support for switching Java fields to a different type in their
ActionScript counterparts.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4801 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-08-01 17:40:35 +00:00
Michael Bayne 871cc64819 Do instanceof Streamable sensibly instead of via the cracksmoking way I was
doing it. Don't generate ActionScript methods for the instrumented field reader
and writer methods.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4798 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-08-01 17:23:13 +00:00
Ray Greenwell 4a34d6d2fd Have the actionscript-generating stuff understand TypedArray.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4751 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-11 01:20:36 +00:00
Dave Hoover 1bfa35515d Actually do keyword substitution on those freshly headered files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4736 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-06-14 18:19:38 +00:00
Charlie Groves d9eaa65c23 add @Override to getReceiverCode and dispatchNotification so running genreceiver doesn't step all over Dave's auto @Override adder
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4708 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-11 18:54:25 +00:00
Michael Bayne cf949410ce We don't need to read and write wrap straight up calls to readObject() and
writeObject() as that handles nulls for us (and of course because that's how
it's done when streaming using reflection).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4704 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-09 01:15:28 +00:00
Michael Bayne ef43b9d41a Re-revamp. I may re-re-revamp later to eliminate the reflection based streaming
altogether as that also solves the "Class.getDeclaredFields() is not required
to return fields in declaration order" problem which has been looming. However,
this should work for now.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4701 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-09 00:20:35 +00:00
Michael Bayne 9e0babe2e1 We need the fully qualified class name.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4697 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 19:50:05 +00:00
Michael Bayne 2afd7b2e29 Let's actually use them fancy little methods.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4695 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 19:19:33 +00:00
Michael Bayne 47273749c8 New plan! We now post-process our class files and add individual public reader
and writer methods for private and protected fields. This will allow us to
preserve the current read and write ordering and in the future when we "fix"
read and write ordering, we won't be fucked by a bunch of generated methods
that force the ordering. (Someone is using Presents on the CLR which turns out
to take advantage of the loose specification of Class.getDeclaredFields() and
not return them in declaration order, yay!).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4692 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 18:59:42 +00:00
Michael Bayne ea8bf25c0a Some fiddling to handle classes that extend SimpleStreamableObject.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4688 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-04 22:17:24 +00:00
Michael Bayne 1ec22804da Oops, we need to do things a little differently.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4687 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-04 22:08:04 +00:00
Michael Bayne 410d85d49d A task to generate readObject() and writeObject() for Streamable classes (for
use in non-sandboxed environments). Unfortunately we have to do this for all
Streamable classes, not just the ones that have protected/private members
because we need to be able to call super.readObject() and have that exist even
if our superclass contains only public members.

Doing magic streaming with combinations of classes that do and don't have
readObject() would start to get extremely complicated, particularly if the base
class had readObject() an intermediate class had none, then a later class had
one again. Madness. Doing things with compiled methods will be faster anyway...


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4686 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-04 22:04:50 +00:00
Michael Bayne 77fef0c22e Factored management of "generated fields" and "generated methods" blocks into a
utility class.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4685 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-04 22:02:31 +00:00
Michael Bayne beace3839b Nth time's the charm.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4672 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 16:40:57 +00:00
Michael Bayne 184b621ee9 Let's fix toWriteObject() as well since we are aiming for correctness.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4671 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 16:39:19 +00:00
Michael Bayne 86aae8809a ByteArray must be read with readField().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4670 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 16:35:28 +00:00
Michael Bayne 8f59462972 Handle // @Override // blah comments more robustly.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4669 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 16:35:05 +00:00
Michael Bayne ad8acdbd1d Comment fiddling.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4668 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 02:47:16 +00:00
Michael Bayne 1060f0d160 More jockeying:
- handle // @Override // blah style comments
- deal with fields that are assigned to anonymous inner classes (actually
anything with braces, which would also include array literals).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4667 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-04-18 02:38:16 +00:00