Port get_bst_command_and_process

Author: CraftSpider

crates/bridge_harfbuzz/harfbuzz

@@ -7,19 +7,12 @@
 
 #include <stdio.h> /* EOF, snprintf */
 
-/* hack: the name eof conflicts with other function declarations under mingw. */
-#define eof tectonic_eof
-
 /* duplicated from xetexd.h: */
 
 #include <setjmp.h>
 
 static jmp_buf error_jmpbuf, recover_jmpbuf;
 
-typedef size_t hash_loc;
-typedef size_t cite_number;
-typedef size_t field_loc;
-
 static void unwrap(CResult res) {
     switch (res) {
     case CResult_Error:
@@ -47,17 +40,6 @@ static int32_t unwrap_int(CResultInt res) {
     return res.ok;
 }
 
-static LookupRes unwrap_lookup(CResultLookup res) {
-    switch (res.tag) {
-    case CResultLookup_Error:
-        longjmp(error_jmpbuf, 1);
-        break;
-    case CResultLookup_Ok:
-        break;
-    }
-    return res.ok;
-}
-
 #define FMT_BUF_SIZE 1024
 static char fmt_buf[FMT_BUF_SIZE] = "";
 
@@ -73,129 +55,6 @@ printf_log(const char *fmt, ...)
     puts_log(fmt_buf);
 }
 
-//static void
-//bst_strings_command(Bibtex* ctx)
-//{
-//    if (!eat_bst_white_space(ctx)) {
-//        eat_bst_print();
-//        puts_log("strings");
-//        unwrap(bst_err_print_and_look_for_blank_line(ctx));
-//        return;
-//    }
-//
-//    if (bib_buf_at_offset(BUF_TY_BASE, 2) != 123 /*left_brace */ ) {
-//        bst_left_brace_print();
-//        puts_log("strings");
-//        unwrap(bst_err_print_and_look_for_blank_line(ctx));
-//        return;
-//    }
-//
-//    bib_set_buf_offset(BUF_TY_BASE, 2, bib_buf_offset(BUF_TY_BASE, 2) + 1);
-//
-//    if (!eat_bst_white_space(ctx)) {
-//        eat_bst_print();
-//        puts_log("strings");
-//        unwrap(bst_err_print_and_look_for_blank_line(ctx));
-//        return;
-//    }
-//
-//    while (bib_buf_at_offset(BUF_TY_BASE, 2) != 125 /*right_brace */ ) {
-//        ScanRes scan_result = scan_identifier(125 /*right_brace */ , 37 /*comment */ , 37 /*comment */);
-//        if (scan_result != SCAN_RES_WHITESPACE_ADJACENT && scan_result != SCAN_RES_SPECIFIED_CHAR_ADJACENT) {
-//            unwrap(bst_id_print(scan_result));
-//            puts_log("strings");
-//            unwrap(bst_err_print_and_look_for_blank_line(ctx));
-//            return;
-//        }
-//
-//        lower_case(BUF_TY_BASE, bib_buf_offset(BUF_TY_BASE, 1), bib_buf_offset(BUF_TY_BASE, 2) - bib_buf_offset(BUF_TY_BASE, 1));
-//        LookupRes hash = unwrap_lookup(str_lookup(BUF_TY_BASE, bib_buf_offset(BUF_TY_BASE, 1),
-//                                                  bib_buf_offset(BUF_TY_BASE, 2) - bib_buf_offset(BUF_TY_BASE, 1),
-//                                                  STR_ILK_BST_FN, true));
-//        hash_loc fn_loc = hash.loc;
-//        if (hash.exists) {
-//            unwrap(already_seen_function_print(ctx, fn_loc));
-//            return;
-//        }
-//
-//        set_fn_type(fn_loc, FN_CLASS_STR_GLBL_VAR);
-//        set_ilk_info(fn_loc, num_glb_strs());
-//
-//        check_grow_global_strs();
-//
-//        set_num_glb_strs(num_glb_strs() + 1);
-//
-//        if (!eat_bst_white_space(ctx)) {
-//            eat_bst_print();
-//            puts_log("strings");
-//            unwrap(bst_err_print_and_look_for_blank_line(ctx));
-//            return;
-//        }
-//    }
-//
-//    bib_set_buf_offset(BUF_TY_BASE, 2, bib_buf_offset(BUF_TY_BASE, 2) + 1);
-//}
-
-static void
-get_bst_command_and_process(ExecCtx* ctx)
-{
-    if (!scan_alpha()) {
-        printf_log("\"%c\" can't start a style-file command", bib_buf_at_offset(BUF_TY_BASE, 2));
-        bst_err_print_and_look_for_blank_line(ctx->glbl_ctx);
-        return;
-    }
-
-    lower_case(BUF_TY_BASE, bib_buf_offset(BUF_TY_BASE, 1), (bib_buf_offset(BUF_TY_BASE, 2) - bib_buf_offset(BUF_TY_BASE, 1)));
-    LookupRes hash = unwrap_lookup(str_lookup(BUF_TY_BASE, bib_buf_offset(BUF_TY_BASE, 1),
-                                              (bib_buf_offset(BUF_TY_BASE, 2) - bib_buf_offset(BUF_TY_BASE, 1)),
-                                              STR_ILK_BST_COMMAND, false));
-    int32_t command_num = ilk_info(hash.loc);
-    if (!hash.exists) {
-        print_a_token();
-        puts_log(" is an illegal style-file command");
-        bst_err_print_and_look_for_blank_line(ctx->glbl_ctx);
-        return;
-    }
-
-    switch (command_num) {
-    case 0:
-        unwrap(bst_entry_command(ctx));
-        break;
-    case 1:
-        unwrap(bst_execute_command(ctx));
-        break;
-    case 2:
-        unwrap(bst_function_command(ctx));
-        break;
-    case 3:
-        unwrap(bst_integers_command(ctx));
-        break;
-    case 4:
-        unwrap(bst_iterate_command(ctx));
-        break;
-    case 5:
-        unwrap(bst_macro_command(ctx));
-        break;
-    case 6:
-        unwrap(bst_read_command(ctx));
-        break;
-    case 7:
-        unwrap(bst_reverse_command(ctx));
-        break;
-    case 8:
-        unwrap(bst_sort_command(ctx));
-        break;
-    case 9:
-        unwrap(bst_strings_command(ctx));
-        break;
-    default:
-        puts_log("Unknown style-file command");
-        print_confusion();
-        longjmp(error_jmpbuf, 1);
-        break;
-    }
-}
-
 History
 bibtex_main(Bibtex* glbl_ctx, const char *aux_file_name)
 {
@@ -257,7 +116,7 @@ bibtex_main(Bibtex* glbl_ctx, const char *aux_file_name)
         while(true) {
             if (!eat_bst_white_space(ctx.glbl_ctx))
                 break;
-            get_bst_command_and_process(&ctx);
+            unwrap(get_bst_command_and_process(&ctx));
         }
     }
 

crates/engine_bibtex/bibtex/bibtex.c

@@ -29,30 +29,6 @@ typedef enum {
   HISTORY_ABORTED = 4,
 } History;
 
-enum StrIlk
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  STR_ILK_TEXT = 0,
-  STR_ILK_INTEGER = 1,
-  STR_ILK_AUX_COMMAND = 2,
-  STR_ILK_AUX_FILE = 3,
-  STR_ILK_BST_COMMAND = 4,
-  STR_ILK_BST_FILE = 5,
-  STR_ILK_BIB_FILE = 6,
-  STR_ILK_FILE_EXT = 7,
-  STR_ILK_CITE = 9,
-  STR_ILK_LC_CITE = 10,
-  STR_ILK_BST_FN = 11,
-  STR_ILK_BIB_COMMAND = 12,
-  STR_ILK_MACRO = 13,
-  STR_ILK_CONTROL_SEQ = 14,
-};
-#ifndef __cplusplus
-typedef uint8_t StrIlk;
-#endif // __cplusplus
-
 typedef struct PeekableInput PeekableInput;
 
 typedef struct XBuf_ExecVal XBuf_ExecVal;
@@ -118,36 +94,8 @@ typedef struct {
   StrNumber bib_str_ptr;
 } ExecCtx;
 
-typedef uint8_t ASCIICode;
-
 typedef uintptr_t BufPointer;
 
-typedef struct {
-  /**
-   * The location of the string - where it exists, was inserted, of if insert is false,
-   * where it *would* have been inserted
-   */
-  uintptr_t loc;
-  /**
-   * Whether the string existed in the hash table already
-   */
-  bool exists;
-} LookupRes;
-
-typedef enum {
-  CResultLookup_Error,
-  CResultLookup_Ok,
-} CResultLookup_Tag;
-
-typedef struct {
-  CResultLookup_Tag tag;
-  union {
-    struct {
-      LookupRes ok;
-    };
-  };
-} CResultLookup;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -172,40 +120,14 @@ CResult last_check_for_aux_errors(Bibtex *ctx);
 
 int32_t bib_line_num(void);
 
-CResult bst_entry_command(ExecCtx *ctx);
-
-CResult bst_execute_command(ExecCtx *ctx);
-
-CResult bst_function_command(ExecCtx *ctx);
-
-CResult bst_integers_command(ExecCtx *ctx);
-
-CResult bst_iterate_command(ExecCtx *ctx);
-
-CResult bst_macro_command(ExecCtx *ctx);
-
-CResult bst_read_command(ExecCtx *ctx);
-
-CResult bst_reverse_command(ExecCtx *ctx);
-
-CResult bst_sort_command(ExecCtx *ctx);
-
-CResult bst_strings_command(ExecCtx *ctx);
-
-ASCIICode bib_buf_at_offset(BufTy ty, uintptr_t num);
-
-BufPointer bib_buf_offset(BufTy ty, uintptr_t num);
+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);
 
-void lower_case(BufTy buf, BufPointer ptr, BufPointer len);
-
 ExecCtx init_exec_ctx(Bibtex *glbl_ctx);
 
-int32_t ilk_info(HashPointer pos);
-
 int32_t hash_size(void);
 
 uintptr_t hash_prime(void);
@@ -224,26 +146,18 @@ void puts_log(const char *str);
 
 void print_confusion(void);
 
-void print_a_token(void);
-
 CResult print_aux_name(void);
 
 CResult log_pr_aux_name(void);
 
 CResult print_bib_name(void);
 
-CResult bst_err_print_and_look_for_blank_line(Bibtex *ctx);
-
 int peekable_close(PeekableInput *peekable);
 
 bool input_ln(PeekableInput *peekable);
 
 uintptr_t bib_max_strings(void);
 
-CResultLookup str_lookup(BufTy buf, BufPointer ptr, BufPointer len, StrIlk ilk, bool insert);
-
-bool scan_alpha(void);
-
 bool eat_bst_white_space(Bibtex *ctx);
 
 #ifdef __cplusplus

crates/engine_bibtex/bibtex/bibtex_bindings.h

@@ -10,9 +10,8 @@ use crate::{
             aux_end1_err_print, aux_end2_err_print, aux_err_illegal_another_print,
             aux_err_no_right_brace_print, aux_err_print, aux_err_stuff_after_right_brace_print,
             aux_err_white_space_in_argument_print, hash_cite_confusion, log_pr_bst_name,
-            print_a_pool_str, print_confusion, print_overflow, rs_log_pr_aux_name,
-            rs_print_a_token, rs_print_aux_name, rs_print_bib_name, write_log_file, write_logs,
-            AuxTy,
+            print_a_pool_str, print_a_token, print_confusion, print_overflow, rs_log_pr_aux_name,
+            rs_print_aux_name, rs_print_bib_name, write_log_file, write_logs, AuxTy,
         },
         peekable::{peekable_close, peekable_open, PeekableInput},
         pool::{with_pool, StringPool},
@@ -320,7 +319,7 @@ fn aux_citation_command(
             let uc_res = pool.lookup_str(hash, cite, StrIlk::Cite);
             if !uc_res.exists {
                 write_logs("Case mismatch error between cite keys ");
-                rs_print_a_token(buffers);
+                print_a_token(buffers);
                 write_logs(" and ");
                 print_a_pool_str(
                     cites.get_cite(hash.ilk_info(hash.ilk_info(lc_res.loc) as usize) as usize),
@@ -385,7 +384,7 @@ fn aux_input_command(
 
     aux.set_ptr(aux.ptr() + 1);
     if aux.ptr() == AUX_STACK_SIZE {
-        rs_print_a_token(buffers);
+        print_a_token(buffers);
         write_logs(": ");
         print_overflow();
         write_logs(&format!("auxiliary file depth {}\n", AUX_STACK_SIZE));
@@ -400,7 +399,7 @@ fn aux_input_command(
                 [buffers.offset(BufTy::Base, 2) - aux_ext.len()..buffers.offset(BufTy::Base, 2)]);
 
     if !aux_extension_ok {
-        rs_print_a_token(buffers);
+        print_a_token(buffers);
         write_logs(" has a wrong extension");
         aux.set_ptr(aux.ptr() - 1);
         aux_err_print(buffers, aux, pool)?;

crates/engine_bibtex/src/c_api/auxi.rs

@@ -7,7 +7,7 @@ use crate::{
         log::{
             bib_cmd_confusion, bib_equals_sign_print, bib_err_print, bib_id_print,
             bib_one_of_two_print, bib_warn_print, cite_key_disappeared_confusion, eat_bib_print,
-            hash_cite_confusion, print_confusion, rs_print_a_token, write_log_file, write_logs,
+            hash_cite_confusion, print_a_token, print_confusion, write_log_file, write_logs,
         },
         peekable::{rs_input_ln, PeekableInput},
         pool::StringPool,
@@ -648,7 +648,7 @@ pub(crate) fn get_bib_command_or_entry_and_process(
                 .cites
                 .set_type(globals.cites.entry_ptr(), HashData::undefined());
             write_logs("Warning--entry type for \"");
-            rs_print_a_token(globals.buffers);
+            print_a_token(globals.buffers);
             write_logs("\" isn't style-file defined\n");
             bib_warn_print(globals.pool, globals.bibs)?;
         }