added: package structure output in odoc

diff --git a/compiler/build.sh b/compiler/build.sh
index ed80b613b36b562eb766e247d4f88d5aafb3c007..d308e3ec3273119b51913a994e4d94838c112b5c 100755 (executable)
--- a/compiler/build.sh
+++ b/compiler/build.sh
@@ -30,7 +30,7 @@ FLAGS="$FLAGS -DENABLE_RUN_WITH_WASMER -DUSE_DYNCALL"
 sudo mkdir -p "$BIN_DIR"
 
 echo "Compiling onyx..."
-$CC -o "../bin/onyx" \
+$CC -o "../bin/onyxa" \
     $FLAGS \
     "-DCORE_INSTALLATION=\"$CORE_DIR\"" \
     $INCLUDES \

diff --git a/compiler/src/doc.c b/compiler/src/doc.c
index 8c92a20f01465ffd445f03c4e96d18a7fcfef569..0665846f0e31e89af827f68c56c113a5f3371519 100644 (file)
--- a/compiler/src/doc.c
+++ b/compiler/src/doc.c
@@ -144,120 +144,82 @@ void onyx_docs_emit_symbol_info(const char *dest) {
 
 #define Doc_Magic_Bytes "ODOC"
 
+static void write_cstring(bh_buffer *buffer, const char *data) {
+    i32 len = strlen(data);
+    bh_buffer_write_u32(buffer, len);
+    bh_buffer_append(buffer, data, len);
+}
 
-struct Doc_String {
-    u32 offset;
-    u32 length;
-};
-
-struct Doc_Array {
-    u32 offset;
-    u32 length;
-};
-
-struct Doc_Header {
-    u8  magic_bytes[4];
-    u32 version;
-
-    struct Doc_String program_name;
-    u32 build_time;
-};
-
-struct Doc_File {
-    u32 package_id;
-    struct Doc_String name;
-};
-
-struct Doc_Location {
-    u32 file_id;
-    i32 line;
-    i32 col;
-};
-
-struct Doc_Package {
-    struct Doc_String name;
-    struct Doc_String qualified_name;
-    
-    struct Doc_Array subpackages;
-};
-
-enum Doc_Entity_Kind {
-    Entity_Kind_Procedure = 1,
-};
-
-struct Doc_Entity {
-    enum Doc_Entity_Kind kind;
+static void write_string(bh_buffer *buffer, i32 len, char *data) {
+    bh_buffer_write_u32(buffer, len);
+    bh_buffer_append(buffer, data, len);
+}
 
-    u32 package_id;
-    struct Doc_Location location;
+void onyx_docs_emit_odoc(const char *dest) {
+    bh_file doc_file;
+    if (bh_file_create(&doc_file, dest) != BH_FILE_ERROR_NONE) {
+        bh_printf("Cannot create '%s'.\n", dest);
+        return;
+    }
 
-    struct Doc_String name;
-    struct Doc_String notes;
-};
 
-struct Doc {
-    struct Doc_Header header;
+    bh_buffer doc_buffer;
+    bh_buffer_init(&doc_buffer, global_heap_allocator, 16 * 1024);
 
-    struct Doc_Array packages;
-    struct Doc_Array entities;
-    struct Doc_Array files;
-};
+    bh_buffer_append(&doc_buffer, Doc_Magic_Bytes, 4);
+    bh_buffer_write_u32(&doc_buffer, 1);
 
+    const char *program_name = context.options->target_file;
+    write_cstring(&doc_buffer, program_name);
 
-typedef struct DocGenerator {
-    bh_buffer string_buffer;
-} DocGenerator;
+    bh_buffer_write_u32(&doc_buffer, bh_time_curr() / 1000);
 
-void doc_gen_init(DocGenerator *gen) {
-    bh_buffer_init(&gen->string_buffer, global_heap_allocator, 256);
-}
+    int offset_table_index = doc_buffer.length;
+    bh_buffer_write_u32(&doc_buffer, 0);
+    bh_buffer_write_u32(&doc_buffer, 0);
+    bh_buffer_write_u32(&doc_buffer, 0);
 
-void doc_gen_deinit(DocGenerator *gen) {
-    bh_buffer_free(&gen->string_buffer);
-}
+    //
+    // Package Info
+    // 
+    *((u32 *) bh_pointer_add(doc_buffer.data, offset_table_index + 0)) = doc_buffer.length;
 
-u32 doc_gen_add_string(DocGenerator *gen, char *data, u32 len) {
-    u32 offset = gen->string_buffer.length;
+    Table(Package *) packages = (void *) context.packages;
+    bh_buffer_write_u32(&doc_buffer, shlenu(packages));
+    fori (i, 0, shlen(packages)) {
+        char *package_qualified_name = packages[i].key;
+        Package *p = packages[i].value;
 
-    bh_buffer_append(&gen->string_buffer, data, len);
+        // We want 0-based package id's, because they are going
+        // to serve as indicies into the array.
+        bh_buffer_write_u32(&doc_buffer, p->id - 1);
 
-    return offset;
-}
+        write_cstring(&doc_buffer, p->name);
+        write_cstring(&doc_buffer, package_qualified_name);
 
-void onyx_docs_emit_odoc(const char *dest) {
-    bh_file doc_file;
-    if (bh_file_create(&doc_file, dest) != BH_FILE_ERROR_NONE) {
-        bh_printf("Cannot create '%s'.\n", dest);
-        return;
+        bh_buffer_write_u32(&doc_buffer, bh_arr_length(p->sub_packages));
+        fori (j, 0, bh_arr_length(p->sub_packages)) {
+            bh_buffer_write_u32(&doc_buffer, (u32) p->sub_packages[j]);
+        }
     }
 
-    DocGenerator gen;
-    doc_gen_init(&gen);
-
-    struct Doc final_doc;
-
-    memcpy(final_doc.header.magic_bytes, Doc_Magic_Bytes, 4);
-    final_doc.header.version = 1;
-
-    char *program_name = context.options->target_file;
-    u32 program_name_len = strlen(program_name);
-    final_doc.header.program_name.offset = doc_gen_add_string(&gen, program_name, program_name_len);
-    final_doc.header.program_name.length = program_name_len;
+    //
+    // Entity Info
+    //
+    *((u32 *) bh_pointer_add(doc_buffer.data, offset_table_index + 4)) = doc_buffer.length;
 
-    final_doc.header.build_time = bh_time_curr() / 1000;
+    bh_buffer_write_u32(&doc_buffer, 0);
 
-    final_doc.packages.offset = 0;
-    final_doc.packages.length = 0;
 
-    final_doc.entities.offset = 0;
-    final_doc.entities.length = 0;
+    //
+    // File Info
+    //
+    *((u32 *) bh_pointer_add(doc_buffer.data, offset_table_index + 8)) = doc_buffer.length;
 
-    final_doc.files.offset = 0;
-    final_doc.files.length = 0;
+    bh_buffer_write_u32(&doc_buffer, 0);
 
-    bh_file_write(&doc_file, &final_doc, sizeof(struct Doc));
 
-    doc_gen_deinit(&gen);
+    bh_file_write(&doc_file, doc_buffer.data, doc_buffer.length);
     bh_file_close(&doc_file);
 }
 

diff --git a/core/doc/doc.onyx b/core/doc/doc.onyx
index 9b341e29c0ab21f06401ec98d600c49ba1113e21..b78bfef3d4039631e31f660ec061148ace280ac6 100644 (file)
--- a/core/doc/doc.onyx
+++ b/core/doc/doc.onyx
@@ -17,6 +17,10 @@ Doc_Header :: struct {
     
     program_name: str;
     build_time: u32;
+
+    packages_info_start: u32;
+    entities_info_start: u32;
+    files_info_start: u32;
 }
 
 Doc_File :: struct {
@@ -35,6 +39,7 @@ Doc_Location :: struct {
 Doc_Package :: struct {
     Id :: #distinct i32
 
+    id: Id;
     name: str;             // i.e. 'io'
     qualified_name: str;   // i.e. 'core.io'