From 379eee35c9184545527b5d67e5754dc95108e8d5 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 21 Jul 1987 04:33:17 +0000 Subject: [PATCH] Redo macro so that open-paren of macro is on same line as its name. --- v7/src/microcode/regex.c | 32 ++++++++++++++++---------------- v7/src/microcode/rgxprim.c | 24 +++++++++++------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/v7/src/microcode/regex.c b/v7/src/microcode/regex.c index 078d87e0c..08c884818 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.2 1987/07/15 22:10:56 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/regex.c,v 1.3 1987/07/21 04:33:17 cph Rel $ Copyright (c) 1987 Massachusetts Institute of Technology @@ -756,21 +756,21 @@ re_match (pattern_start, pattern_end, buffer, registers, } #define RE_MATCH_WORD_BOUND(word_bound_p) \ - { \ - if ((match_pc == gap_end) \ - ? (word_bound_p \ - (((gap_start != (buffer -> text_start)) && \ - (WORD_CONSTITUENT_P (TRANSLATE_CHAR (gap_start [-1])))), \ - ((gap_end != (buffer -> text_end)) && \ - (WORD_CONSTITUENT_P (TRANSLATE_CHAR (gap_end [0])))))) \ - : (word_bound_p \ - (((match_pc != (buffer -> text_start)) && \ - (WORD_CONSTITUENT_P (TRANSLATE_CHAR (match_pc [-1])))), \ - ((match_pc != (buffer -> text_end)) && \ - (WORD_CONSTITUENT_P (TRANSLATE_CHAR (match_pc [0]))))))) \ - goto re_match_loop; \ - goto re_match_fail; \ - } + if ((match_pc == gap_end) \ + ? (word_bound_p (((gap_start != (buffer -> text_start)) && \ + (WORD_CONSTITUENT_P (TRANSLATE_CHAR (gap_start [-1])) \ + )), \ + ((gap_end != (buffer -> text_end)) && \ + (WORD_CONSTITUENT_P (TRANSLATE_CHAR (gap_end [0]))) \ + ))) \ + : (word_bound_p (((match_pc != (buffer -> text_start)) && \ + (WORD_CONSTITUENT_P (TRANSLATE_CHAR (match_pc [-1]))) \ + ), \ + ((match_pc != (buffer -> text_end)) && \ + (WORD_CONSTITUENT_P (TRANSLATE_CHAR (match_pc [0]))) \ + )))) \ + goto re_match_loop; \ + goto re_match_fail case regexpcode_word_bound: #define WORD_BOUND_P(left_p, right_p) ((left_p) != (right_p)) diff --git a/v7/src/microcode/rgxprim.c b/v7/src/microcode/rgxprim.c index e59743dd9..cdcd7929e 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.2 1987/07/15 22:09:57 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/rgxprim.c,v 1.3 1987/07/21 04:32:56 cph Rel $ Copyright (c) 1987 Massachusetts Institute of Technology @@ -71,19 +71,17 @@ MIT in each case. */ for (i = 0; (i < RE_NREGS); i += 1) \ { \ index = ((registers . start) [i]); \ - User_Vector_Set \ - (vector, \ - i, \ - ((index == -1) \ - ? NIL \ - : (C_Integer_To_Scheme_Integer (index)))); \ + User_Vector_Set (vector, \ + i, \ + ((index == -1) \ + ? NIL \ + : (C_Integer_To_Scheme_Integer (index)))); \ index = ((registers . end) [i]); \ - User_Vector_Set \ - (vector, \ - (i + RE_NREGS), \ - ((index == -1) \ - ? NIL \ - : (C_Integer_To_Scheme_Integer (index)))); \ + User_Vector_Set (vector, \ + (i + RE_NREGS), \ + ((index == -1) \ + ? NIL \ + : (C_Integer_To_Scheme_Integer (index)))); \ } \ } \ return (C_Integer_To_Scheme_Integer (result)); \ -- 2.25.1