return NULL;
}
-const char *upkg_export_class(struct upkg *pub, unsigned long idx,
- const char **package)
-{
- struct upkg_priv *pkg = (struct upkg_priv *)pub;
- const struct upkg_import *iclass, *ipackage;
- struct upkg_export_priv *export;
- unsigned long pkg_idx;
-
- if (idx >= pkg->pub.export_count)
- return NULL;
-
- export = &pkg->exports[idx];
-
- /* Assumption: class references are always imports. */
- format_assert(export->pub.class <= 0, return NULL);
-
- /* Get the class. */
- if (export->pub.class == 0) {
- if (package) *package = "Core";
- return "Class";
- }
-
- pkg_idx = -(export->pub.class + 1);
- if (pkg_idx >= pkg->pub.import_count)
- return NULL;
- iclass = &pkg->imports[pkg_idx];
-
- /* Assumption: class references are always Core.Class. */
- format_assert(!strcmp(iclass->class_package, "Core"), return NULL);
- format_assert(!strcmp(iclass->class_name, "Class"), return NULL);
-
- ipackage = iclass->parent;
- if (!ipackage)
- return NULL;
-
- /* Assumption: package references are always Core.Package. */
- format_assert(!strcmp(ipackage->class_package, "Core"), return NULL);
- format_assert(!strcmp(ipackage->class_name, "Package"), return NULL);
-
- if (package) *package = ipackage->name;
- return iclass->name;
-}
-
struct upkg_file *upkg_export_open(struct upkg *pub, unsigned long idx)
{
struct upkg_priv *pkg = (struct upkg_priv *)pub;
}
}
-void print_upkg_exports(struct upkg *pkg)
+static void
+export_print_class(GTypeModule *pkg, const struct upkg_export *export)
{
- for (unsigned i = 0; i < pkg->export_count; i++) {
- const struct upkg_export *export = upkg_get_export(pkg, i);
- const char *package, *class;
+ struct upkg *upkg = U_PKG(pkg)->pkg;
- class = upkg_export_class(pkg, i, &package);
+ if (export->class < 0) {
+ const struct upkg_import *class;
- if (!class)
- continue;
+ class = upkg_get_import(upkg, -(export->class+1));
+ import_print_fullname(class);
+ } else if (export->class > 0) {
+ const struct upkg_export *class;
+
+ class = upkg_get_export(upkg, export->class-1);
+ export_print_fullname(pkg, class);
+ } else {
+ printf("Core.Class");
+ }
+}
+
+void print_upkg_exports(GTypeModule *pkg)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+
+ for (unsigned i = 0; i < upkg->export_count; i++) {
+ const struct upkg_export *export = upkg_get_export(upkg, i);
+
+ printf("%u - ", i+1);
+ export_print_fullname(pkg, export);
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")\n");
- printf("%u - %s (%s.%s)\n", i+1, export->name, package, class);
printf(" Flags: %lx\n", export->flags);
if (verbose >= 2) {
print_upkg_object_flags(" ", export->flags);
}
printf("Exports: %lu\n", upkg->export_count);
- if (verbose >= 1) print_upkg_exports(upkg);
+ if (verbose >= 1) print_upkg_exports(pkg);
printf("Imports: %lu\n", upkg->import_count);
if (verbose >= 1) print_upkg_imports(upkg);
export_print_fullname(pkg, export);
if (verbose >= 1) {
- const char *class, *package;
-
- class = upkg_export_class(upkg, i, &package);
- printf(" (%s.%s)", package, class);
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")");
}
putchar('\n');
{
struct upkg *upkg = U_PKG(pkg)->pkg;
const struct upkg_export *export;
- const char *class, *package;
int ret = 0;
export = upkg_get_export(upkg, idx);
export_print_fullname(pkg, export);
- class = upkg_export_class(upkg, idx, &package);
- if (class)
- printf(" (%s.%s)\n", package, class);
- else
- printf(" (failed to get class)\n");
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")\n");
if (verbose >= 1 && object_dump_properties(pkg, idx) != 0)
ret = -1;