ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-21 00:23:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

generate accessors for array fields

Browse Source
This commit is contained in:
Joshua Warner
2014-06-02 10:31:57 -06:00
parent b5699cc9dc
commit 43bd838c86
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/avian/classpath-common.h
View File

@ -282,7 +282,10 @@ makeStackTraceElement(Thread* t, object e)
{ {
PROTECT(t, e); PROTECT(t, e);
object class_name = className(t, methodClass(t, traceElementMethod(t, e))); GcMethod* method = cast<GcMethod>(t, traceElementMethod(t, e));
PROTECT(t, method);
object class_name = className(t, method->class_());
PROTECT(t, class_name); PROTECT(t, class_name);
THREAD_RUNTIME_ARRAY(t, char, s, byteArrayLength(t, class_name)); THREAD_RUNTIME_ARRAY(t, char, s, byteArrayLength(t, class_name));
@ -290,20 +293,20 @@ makeStackTraceElement(Thread* t, object e)
reinterpret_cast<char*>(&byteArrayBody(t, class_name, 0))); reinterpret_cast<char*>(&byteArrayBody(t, class_name, 0)));
class_name = makeString(t, "%s", RUNTIME_ARRAY_BODY(s)); class_name = makeString(t, "%s", RUNTIME_ARRAY_BODY(s));
object method = methodName(t, traceElementMethod(t, e)); object method_name = method->name();
PROTECT(t, method); PROTECT(t, method_name);
method = t->m->classpath->makeString method_name = t->m->classpath->makeString
(t, method, 0, byteArrayLength(t, method) - 1); (t, method_name, 0, byteArrayLength(t, method_name) - 1);
unsigned line = t->m->processor->lineNumber unsigned line = t->m->processor->lineNumber
(t, cast<GcMethod>(t, traceElementMethod(t, e)), traceElementIp(t, e)); (t, method, traceElementIp(t, e));
object file = classSourceFile(t, methodClass(t, traceElementMethod(t, e))); object file = classSourceFile(t, method->class_());
file = file ? t->m->classpath->makeString file = file ? t->m->classpath->makeString
(t, file, 0, byteArrayLength(t, file) - 1) : 0; (t, file, 0, byteArrayLength(t, file) - 1) : 0;
return reinterpret_cast<object>(makeStackTraceElement(t, class_name, method, file, line)); return reinterpret_cast<object>(makeStackTraceElement(t, class_name, method_name, file, line));
} }
object object

1
src/avian/machine.h
View File

@ -16,6 +16,7 @@
#include <avian/system/system.h> #include <avian/system/system.h>
#include <avian/system/signal.h> #include <avian/system/signal.h>
#include <avian/heap/heap.h> #include <avian/heap/heap.h>
#include <avian/util/slice.h>
#include "avian/finder.h" #include "avian/finder.h"
#include "avian/processor.h" #include "avian/processor.h"
#include "avian/constants.h" #include "avian/constants.h"

6
src/builtin.cpp
View File

@ -27,15 +27,15 @@ search(Thread* t, object loader, object name,
PROTECT(t, loader); PROTECT(t, loader);
PROTECT(t, name); PROTECT(t, name);
object n = reinterpret_cast<object>(makeByteArray(t, stringLength(t, name) + 1)); GcByteArray* n = makeByteArray(t, stringLength(t, name) + 1);
char* s = reinterpret_cast<char*>(&byteArrayBody(t, n, 0)); char* s = reinterpret_cast<char*>(n->body().begin());
stringChars(t, name, s); stringChars(t, name, s);
if (replaceDots) { if (replaceDots) {
replace('.', '/', s); replace('.', '/', s);
} }
return reinterpret_cast<int64_t>(op(t, loader, n)); return reinterpret_cast<int64_t>(op(t, loader, reinterpret_cast<object>(n)));
} else { } else {
throwNew(t, GcNullPointerException::Type); throwNew(t, GcNullPointerException::Type);
} }

16
src/tools/type-generator/main.cpp
View File

@ -1493,6 +1493,22 @@ void writeClassAccessors(Output* out, Object* t)
out->write(capitalize(memberName(m))); out->write(capitalize(memberName(m)));
out->write("); }\n"); out->write("); }\n");
} break; } break;
case Object::Array: {
out->write(" avian::util::Slice<");
out->write(memberTypeName(m));
out->write("> ");
out->write(obfuscate(memberName(m)));
out->write("() { return avian::util::Slice<");
out->write(memberTypeName(m));
out->write("> (&field_at<");
out->write(memberTypeName(m));
out->write(">(");
out->write(capitalize(local::typeName(memberOwner(m))));
out->write(capitalize(memberName(m)));
out->write("), field_at<uintptr_t>(");
out->write(capitalize(local::typeName(memberOwner(m))));
out->write("Length)); }\n");
} break;
default: default:
break; break;