Port bibtex_main - just cleanup of engine to go

Author: CraftSpider

crates/engine_bibtex/bibtex/bibtex.c

@@ -9,159 +9,6 @@
 
 /* duplicated from xetexd.h: */
 
-#include <setjmp.h>
-
-static jmp_buf error_jmpbuf, recover_jmpbuf;
-
-static void unwrap(CResult res) {
-    switch (res) {
-    case CResult_Error:
-        longjmp(error_jmpbuf, 1);
-        break;
-    case CResult_Recover:
-        longjmp(recover_jmpbuf, 1);
-        break;
-    case CResult_Ok:
-        break;
-    }
-}
-
-static int32_t unwrap_int(CResultInt res) {
-    switch (res.tag) {
-    case CResultInt_Error:
-        longjmp(error_jmpbuf, 1);
-        break;
-    case CResultInt_Recover:
-        longjmp(recover_jmpbuf, 1);
-        break;
-    case CResultInt_Ok:
-        break;
-    }
-    return res.ok;
-}
-
-#define FMT_BUF_SIZE 1024
-static char fmt_buf[FMT_BUF_SIZE] = "";
-
-PRINTF_FUNC(1,2) static void
-printf_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start (ap, fmt);
-    vsnprintf (fmt_buf, FMT_BUF_SIZE, fmt, ap);
-    va_end (ap);
-
-    puts_log(fmt_buf);
-}
-
-History
-bibtex_main(Bibtex* glbl_ctx, const char *aux_file_name)
-{
-    reset_all();
-
-    if (!init_standard_output())
-        return HISTORY_FATAL_ERROR;
-
-    if (unwrap_int(initialize(glbl_ctx, aux_file_name))) {
-        /* TODO: log initialization or get_the_..() error */
-        return HISTORY_FATAL_ERROR;
-    }
-
-    if (setjmp(error_jmpbuf) == 1)
-        goto close_up_shop;
-
-    if (glbl_ctx->config.verbose)
-        puts_log("This is BibTeX, Version 0.99d\n");
-    else
-        bib_log_prints("This is BibTeX, Version 0.99d\n");
-
-    {
-        char buf[512];
-        snprintf (buf, sizeof(buf) - 1, "Capacity: max_strings=%ld, hash_size=%ld, hash_prime=%ld\n",
-                  (long) bib_max_strings(), (long) hash_size(), (long) hash_prime());
-        bib_log_prints(buf);
-    }
-
-    if (glbl_ctx->config.verbose) {
-        puts_log("The top-level auxiliary file: ");
-        unwrap(print_aux_name());
-    } else {
-        bib_log_prints("The top-level auxiliary file: ");
-        unwrap(log_pr_aux_name());
-    }
-
-    while (true) {
-        set_cur_aux_ln(cur_aux_ln() + 1);
-
-        if (!input_ln(cur_aux_file())) {
-            if (pop_the_aux_stack())
-                break;
-        } else {
-            unwrap(get_aux_command_and_process(glbl_ctx));
-        }
-    }
-
-    unwrap(last_check_for_aux_errors(glbl_ctx));
-
-    if (glbl_ctx->bst_str == 0)
-        goto no_bst_file;
-
-    glbl_ctx->bst_line_num = 0;
-    glbl_ctx->bbl_line_num = 1;
-    bib_set_buf_offset(BUF_TY_BASE, 2, bib_buf_len(BUF_TY_BASE));
-
-    if (setjmp(recover_jmpbuf) == 0) {
-        ExecCtx ctx = init_exec_ctx(glbl_ctx);
-        while(true) {
-            if (!eat_bst_white_space(ctx.glbl_ctx))
-                break;
-            unwrap(get_bst_command_and_process(&ctx));
-        }
-    }
-
-    peekable_close(glbl_ctx->bst_file);
-    glbl_ctx->bst_file = NULL;
-
- no_bst_file:
-    ttstub_output_close (glbl_ctx->bbl_file);
-
-close_up_shop:
-
-    if (glbl_ctx->read_performed && !glbl_ctx->reading_completed) {
-        printf_log("Aborted at line %ld of file ", (long) bib_line_num());
-        unwrap(print_bib_name());
-    }
-
-    switch (get_history()) {
-    case HISTORY_SPOTLESS:
-        break;
-    case HISTORY_WARNING_ISSUED:
-        if (err_count() == 1)
-            puts_log("(There was 1 warning)\n");
-        else
-            printf_log("(There were %ld warnings)\n", (long) err_count());
-        break;
-    case HISTORY_ERROR_ISSUED:
-        if (err_count() == 1)
-            puts_log("(There was 1 error message)\n");
-        else
-            printf_log("(There were %ld error messages)\n", (long) err_count());
-        break;
-    case HISTORY_FATAL_ERROR:
-        puts_log("(That was a fatal error)\n");
-        break;
-    default:
-        puts_log("History is bunk");
-        print_confusion();
-        break;
-    }
-
-    bib_close_log();
-    return get_history();
-}
-
-
 History
 tt_engine_bibtex_main(ttbc_state_t *api, Bibtex* ctx, const char *aux_file_name)
 {

crates/engine_bibtex/bibtex/bibtex_bindings.h

@@ -7,20 +7,6 @@
 #include <stdlib.h>
 #include "tectonic_bridge_core.h"
 
-typedef enum {
-  BUF_TY_BASE,
-  BUF_TY_SV,
-  BUF_TY_EX,
-  BUF_TY_OUT,
-  BUF_TY_NAME_SEP,
-} BufTy;
-
-typedef enum {
-  CResult_Error,
-  CResult_Recover,
-  CResult_Ok,
-} CResult;
-
 typedef enum {
   HISTORY_SPOTLESS = 0,
   HISTORY_WARNING_ISSUED = 1,
@@ -31,23 +17,6 @@ typedef enum {
 
 typedef struct PeekableInput PeekableInput;
 
-typedef struct XBuf_ExecVal XBuf_ExecVal;
-
-typedef enum {
-  CResultInt_Error,
-  CResultInt_Recover,
-  CResultInt_Ok,
-} CResultInt_Tag;
-
-typedef struct {
-  CResultInt_Tag tag;
-  union {
-    struct {
-      int32_t ok;
-    };
-  };
-} CResultInt;
-
 typedef struct {
   uint32_t min_crossrefs;
   bool verbose;
@@ -82,84 +51,18 @@ typedef struct {
   HashPointer s_aux_extension;
 } Bibtex;
 
-typedef struct {
-  Bibtex *glbl_ctx;
-  HashPointer _default;
-  XBuf_ExecVal *lit_stack;
-  uintptr_t lit_stk_ptr;
-  bool mess_with_entries;
-  /**
-   * Pointer to the current top of the string pool, used to optimize certain string operations
-   */
-  StrNumber bib_str_ptr;
-} ExecCtx;
-
-typedef uintptr_t BufPointer;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void reset_all(void);
-
-CResultInt initialize(Bibtex *ctx, const char *aux_file_name);
+History bibtex_main(Bibtex *ctx, const char *aux_file_name);
 
 extern History tt_engine_bibtex_main(ttbc_state_t *api, Bibtex *ctx, const char *aux_name);
 
-PeekableInput *cur_aux_file(void);
-
-int32_t cur_aux_ln(void);
-
-void set_cur_aux_ln(int32_t ln);
-
-CResult get_aux_command_and_process(Bibtex *ctx);
-
-bool pop_the_aux_stack(void);
-
-CResult last_check_for_aux_errors(Bibtex *ctx);
-
-int32_t bib_line_num(void);
-
-CResult get_bst_command_and_process(ExecCtx *ctx);
-
-void bib_set_buf_offset(BufTy ty, uintptr_t num, BufPointer offset);
-
-BufPointer bib_buf_len(BufTy ty);
-
-ExecCtx init_exec_ctx(Bibtex *glbl_ctx);
-
-int32_t hash_size(void);
-
-uintptr_t hash_prime(void);
-
 History get_history(void);
 
 uint32_t err_count(void);
 
-bool init_standard_output(void);
-
-void bib_close_log(void);
-
-void bib_log_prints(const char *str);
-
-void puts_log(const char *str);
-
-void print_confusion(void);
-
-CResult print_aux_name(void);
-
-CResult log_pr_aux_name(void);
-
-CResult print_bib_name(void);
-
-int peekable_close(PeekableInput *peekable);
-
-bool input_ln(PeekableInput *peekable);
-
-uintptr_t bib_max_strings(void);
-
-bool eat_bst_white_space(Bibtex *ctx);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus