From 1d8c8070dd1f9277b85b425bec885a1134548c3b Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 15 Jul 1987 22:10:56 +0000 Subject: [PATCH] Shorten names to 31 characters for VMS. --- v7/src/microcode/bitstr.c | 8 ++++---- v7/src/microcode/comutl.c | 9 ++++----- v7/src/microcode/interp.c | 6 +++--- v7/src/microcode/regex.c | 28 ++++++++++++++-------------- v7/src/microcode/rgxprim.c | 6 +++--- v7/src/microcode/string.c | 8 ++++---- v8/src/microcode/interp.c | 6 +++--- 7 files changed, 35 insertions(+), 36 deletions(-) diff --git a/v7/src/microcode/bitstr.c b/v7/src/microcode/bitstr.c index 3f409fbf2..c95864f86 100644 --- a/v7/src/microcode/bitstr.c +++ b/v7/src/microcode/bitstr.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/bitstr.c,v 9.29 1987/05/14 13:46:57 cph Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/bitstr.c,v 9.30 1987/07/15 22:10:15 cph Rel $ Bit string primitives. */ @@ -841,7 +841,7 @@ Built_In_Primitive (Prim_write_bits_x, 3, "WRITE-BITS!", 0xE0) } \ } -Built_In_Primitive (Prim_bit_substring_find_next_set_bit, 3, +Built_In_Primitive (Prim_bitstr_find_next_set_bit, 3, "BIT-SUBSTRING-FIND-NEXT-SET-BIT", 0xDA) { substring_find_next_initialize (); @@ -854,14 +854,14 @@ Built_In_Primitive (Prim_bit_substring_find_next_set_bit, 3, return (NIL); } else if (*scan & - ((bit == 0) ? ~0 : (any_mask ((POINTER_LENGTH - bit), bit)))) + ((bit == 0) ? (~ 0) : (any_mask ((POINTER_LENGTH - bit), bit)))) find_next_set_loop (bit); while (--word > end_word) if (*--scan) find_next_set_loop (0); - if (*--scan & ((end_bit == POINTER_LENGTH) ? ~0 : (low_mask (end_bit)))) + if (*--scan & ((end_bit == POINTER_LENGTH) ? (~ 0) : (low_mask (end_bit)))) find_next_set_loop (0); return (NIL); diff --git a/v7/src/microcode/comutl.c b/v7/src/microcode/comutl.c index e7204be27..3081caf67 100644 --- a/v7/src/microcode/comutl.c +++ b/v7/src/microcode/comutl.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/comutl.c,v 1.5 1987/07/14 04:56:41 mhwu Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/comutl.c,v 1.6 1987/07/15 22:09:17 cph Rel $ Copyright (c) 1987 Massachusetts Institute of Technology @@ -42,7 +42,7 @@ MIT in each case. */ (((OBJECT_TYPE (object)) == TC_COMPILED_EXPRESSION) || \ ((OBJECT_TYPE (object)) == TC_RETURN_ADDRESS)) -Built_In_Primitive (Prim_compiled_code_address_block, 1, +Built_In_Primitive (Prim_comp_code_address_block, 1, "COMPILED-CODE-ADDRESS->BLOCK", 0xB5) { Pointer *address; @@ -59,7 +59,7 @@ Built_In_Primitive (Prim_compiled_code_address_block, 1, #endif /* CMPGCFILE */ } -Built_In_Primitive (Prim_compiled_code_address_offset, 1, +Built_In_Primitive (Prim_comp_code_address_offset, 1, "COMPILED-CODE-ADDRESS->OFFSET", 0xAC) { Pointer *address; @@ -69,8 +69,7 @@ Built_In_Primitive (Prim_compiled_code_address_offset, 1, address = (Get_Pointer (Arg1)); #ifdef CMPGCFILE - return (Make_Non_Pointer (TC_FIXNUM, - (Get_Compiled_Offset (address)))); + return (Make_Signed_Fixnum (Get_Compiled_Offset (address))); #else /* not CMPGCFILE */ error_external_return (); #endif /* CMPGCFILE */ diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c index d8c921b6d..7b5747ac5 100644 --- a/v7/src/microcode/interp.c +++ b/v7/src/microcode/interp.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.30 1987/07/07 21:01:25 cph Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.31 1987/07/15 22:08:05 cph Rel $ * * This file contains the heart of the Scheme Scode * interpreter @@ -887,10 +887,10 @@ Pop_Return: comp_uuo_link_trap_restart) define_compiler_restart (RC_COMP_CACHE_REF_APPLY_RESTART, - comp_cache_reference_apply_restart) + comp_cache_ref_apply_restart) define_compiler_restart (RC_COMP_SAFE_REF_TRAP_RESTART, - comp_safe_reference_trap_restart) + comp_safe_ref_trap_restart) define_compiler_restart (RC_COMP_UNASSIGNED_TRAP_RESTART, comp_unassigned_p_trap_restart) diff --git a/v7/src/microcode/regex.c b/v7/src/microcode/regex.c index adba8fc58..078d87e0c 100644 --- a/v7/src/microcode/regex.c +++ b/v7/src/microcode/regex.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/regex.c,v 1.1 1987/07/14 03:00:59 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/regex.c,v 1.2 1987/07/15 22:10:56 cph Exp $ Copyright (c) 1987 Massachusetts Institute of Technology @@ -873,7 +873,7 @@ re_match (pattern_start, pattern_end, buffer, registers, READ_PATTERN_OFFSET (offset); if (pattern_pc == pattern_end) - goto maybe_finalize_jump_finalize; + goto finalize_jump; /* Compare what follows with the beginning of the repeat. If we can establish that there is nothing that they @@ -894,7 +894,7 @@ re_match (pattern_start, pattern_end, buffer, registers, break; default: - goto maybe_finalize_jump_not_finalize; + goto dont_finalize_jump; } /* (pattern_pc [(offset - 3)]) is an `on_failure_jump'. @@ -904,15 +904,15 @@ re_match (pattern_start, pattern_end, buffer, registers, case regexpcode_exact_1: { if (ascii != (pattern_pc [(offset + 1)])) - goto maybe_finalize_jump_finalize; - goto maybe_finalize_jump_not_finalize; + goto finalize_jump; + goto dont_finalize_jump; } case regexpcode_exact_n: { if (ascii != (pattern_pc [(offset + 2)])) - goto maybe_finalize_jump_finalize; - goto maybe_finalize_jump_not_finalize; + goto finalize_jump; + goto dont_finalize_jump; } case regexpcode_char_set: @@ -920,8 +920,8 @@ re_match (pattern_start, pattern_end, buffer, registers, if (CHAR_SET_MEMBER_P ((pattern_pc [(offset + 1)]), (& (pattern_pc [(offset + 2)])), ascii)) - goto maybe_finalize_jump_not_finalize; - goto maybe_finalize_jump_finalize; + goto dont_finalize_jump; + goto finalize_jump; } case regexpcode_not_char_set: @@ -929,20 +929,20 @@ re_match (pattern_start, pattern_end, buffer, registers, if (CHAR_SET_MEMBER_P ((pattern_pc [(offset + 1)]), (& (pattern_pc [(offset + 2)])), ascii)) - goto maybe_finalize_jump_finalize; - goto maybe_finalize_jump_not_finalize; + goto finalize_jump; + goto dont_finalize_jump; } default: - goto maybe_finalize_jump_not_finalize; + goto dont_finalize_jump; } - maybe_finalize_jump_finalize: + finalize_jump: pattern_pc -= 2; (pattern_pc [-1]) = ((unsigned char) regexpcode_finalize_jump); goto re_match_finalize_jump; - maybe_finalize_jump_not_finalize: + dont_finalize_jump: pattern_pc -= 2; (pattern_pc [-1]) = ((unsigned char) regexpcode_jump); goto re_match_jump; diff --git a/v7/src/microcode/rgxprim.c b/v7/src/microcode/rgxprim.c index 86c05da3e..e59743dd9 100644 --- a/v7/src/microcode/rgxprim.c +++ b/v7/src/microcode/rgxprim.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/rgxprim.c,v 1.1 1987/07/14 03:00:03 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/rgxprim.c,v 1.2 1987/07/15 22:09:57 cph Exp $ Copyright (c) 1987 Massachusetts Institute of Technology @@ -180,11 +180,11 @@ Built_In_Primitive (Prim_re_compile_fastmap, 4, "RE-COMPILE-FASTMAP", 0x191) Built_In_Primitive (Prim_re_match_substring, 7, "RE-MATCH-SUBSTRING", 0x118) RE_SUBSTRING_PRIMITIVE (re_match) -Built_In_Primitive (Prim_re_search_substring_forward, 7, +Built_In_Primitive (Prim_re_search_substr_forward, 7, "RE-SEARCH-SUBSTRING-FORWARD", 0x119) RE_SUBSTRING_PRIMITIVE (re_search_forward) -Built_In_Primitive (Prim_re_search_substring_backward, 7, +Built_In_Primitive (Prim_re_search_substr_backward, 7, "RE-SEARCH-SUBSTRING-BACKWARD", 0x11A) RE_SUBSTRING_PRIMITIVE (re_search_backward) diff --git a/v7/src/microcode/string.c b/v7/src/microcode/string.c index cc1701d68..c9ba7c57c 100644 --- a/v7/src/microcode/string.c +++ b/v7/src/microcode/string.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/string.c,v 9.24 1987/05/14 13:49:47 cph Exp $ */ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/string.c,v 9.25 1987/07/15 22:09:33 cph Rel $ */ /* String primitives. */ @@ -288,7 +288,7 @@ Built_In_Primitive(Prim_Vec_8b_Find_Prev_Char_Ci, 4, return (NIL); } -#define substring_find_char_in_set_prefix() \ +#define substr_find_char_in_set_prefix() \ long start, end, length; \ char *char_set, *scan; \ Primitive_4_Args (); \ @@ -308,7 +308,7 @@ Built_In_Primitive(Prim_Vec_8b_Find_Prev_Char_Ci, 4, Built_In_Primitive(Prim_Find_Next_Char_In_Set, 4, "SUBSTRING-FIND-NEXT-CHAR-IN-SET", 0x146) { - substring_find_char_in_set_prefix (); + substr_find_char_in_set_prefix (); char_set = (Scheme_String_To_C_String (Arg4)); scan = (string_pointer (Arg1, start)); @@ -324,7 +324,7 @@ Built_In_Primitive(Prim_Find_Next_Char_In_Set, 4, Built_In_Primitive(Prim_Find_Prev_Char_In_Set, 4, "SUBSTRING-FIND-PREVIOUS-CHAR-IN-SET", 0x147) { - substring_find_char_in_set_prefix (); + substr_find_char_in_set_prefix (); char_set = Scheme_String_To_C_String(Arg4); scan = (string_pointer (Arg1, end)); diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c index 834f2116b..fa3d86eda 100644 --- a/v8/src/microcode/interp.c +++ b/v8/src/microcode/interp.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.30 1987/07/07 21:01:25 cph Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.31 1987/07/15 22:08:05 cph Rel $ * * This file contains the heart of the Scheme Scode * interpreter @@ -887,10 +887,10 @@ Pop_Return: comp_uuo_link_trap_restart) define_compiler_restart (RC_COMP_CACHE_REF_APPLY_RESTART, - comp_cache_reference_apply_restart) + comp_cache_ref_apply_restart) define_compiler_restart (RC_COMP_SAFE_REF_TRAP_RESTART, - comp_safe_reference_trap_restart) + comp_safe_ref_trap_restart) define_compiler_restart (RC_COMP_UNASSIGNED_TRAP_RESTART, comp_unassigned_p_trap_restart) -- 2.25.1