Mercurial > hg > xemacs-beta
annotate lib-src/vcdiff @ 5607:1a507c4c6c42
Refactor out sequence-oriented builtins from fns.c to the new sequence.c.
src/ChangeLog addition:
2011-12-04 Aidan Kehoe <kehoea@parhasard.net>
* Makefile.in.in (objs):
* depend:
Add sequence.o to the list of objects and dependencies.
* alloc.c:
* alloc.c (mark_bit_vector):
* alloc.c (print_bit_vector):
* alloc.c (bit_vector_equal):
* alloc.c (internal_bit_vector_equalp_hash):
* alloc.c (bit_vector_hash):
* alloc.c (init_alloc_once_early):
Move the implementation of the bit vector type here from fns.c.
* emacs.c (main_1):
Call syms_of_sequence() here, now sequence.c is included.
* fns.c (Fold_rassq):
Move this together with the rest of the Fold_* functions.
* fns.c:
* fns.c (syms_of_fns):
Move most functions dealing with sequences generally, and
especially those taking key arguments, to a separate file,
sequence.c.
* general-slots.h:
Qyes_or_no_p belong here, not fns.c.
* lisp.h:
Make Flist_length available here, it's used by sequence.c
* sequence.c:
* sequence.c (check_sequence_range):
* sequence.c (Flength):
* sequence.c (check_other_nokey):
* sequence.c (check_other_key):
* sequence.c (check_if_key):
* sequence.c (check_match_eq_key):
* sequence.c (check_match_eql_key):
* sequence.c (check_match_equal_key):
* sequence.c (check_match_equalp_key):
* sequence.c (check_match_other_key):
* sequence.c (check_lss_key):
* sequence.c (check_lss_key_car):
* sequence.c (check_string_lessp_key):
* sequence.c (check_string_lessp_key_car):
* sequence.c (get_check_match_function_1):
* sequence.c (get_merge_predicate):
* sequence.c (count_with_tail):
* sequence.c (list_count_from_end):
* sequence.c (string_count_from_end):
* sequence.c (Fcount):
* sequence.c (Fsubseq):
* sequence.c (list_position_cons_before):
* sequence.c (FmemberX):
* sequence.c (Fadjoin):
* sequence.c (FassocX):
* sequence.c (FrassocX):
* sequence.c (position):
* sequence.c (Fposition):
* sequence.c (Ffind):
* sequence.c (delq_no_quit_and_free_cons):
* sequence.c (FdeleteX):
* sequence.c (FremoveX):
* sequence.c (list_delete_duplicates_from_end):
* sequence.c (Fdelete_duplicates):
* sequence.c (Fremove_duplicates):
* sequence.c (Fnreverse):
* sequence.c (Freverse):
* sequence.c (list_merge):
* sequence.c (array_merge):
* sequence.c (list_array_merge_into_list):
* sequence.c (list_list_merge_into_array):
* sequence.c (list_array_merge_into_array):
* sequence.c (Fmerge):
* sequence.c (list_sort):
* sequence.c (array_sort):
* sequence.c (FsortX):
* sequence.c (Ffill):
* sequence.c (mapcarX):
* sequence.c (shortest_length_among_sequences):
* sequence.c (Fmapconcat):
* sequence.c (FmapcarX):
* sequence.c (Fmapvector):
* sequence.c (Fmapcan):
* sequence.c (Fmap):
* sequence.c (Fmap_into):
* sequence.c (Fsome):
* sequence.c (Fevery):
* sequence.c (Freduce):
* sequence.c (replace_string_range_1):
* sequence.c (Freplace):
* sequence.c (Fnsubstitute):
* sequence.c (Fsubstitute):
* sequence.c (subst):
* sequence.c (sublis):
* sequence.c (Fsublis):
* sequence.c (nsublis):
* sequence.c (Fnsublis):
* sequence.c (Fsubst):
* sequence.c (Fnsubst):
* sequence.c (tree_equal):
* sequence.c (Ftree_equal):
* sequence.c (mismatch_from_end):
* sequence.c (mismatch_list_list):
* sequence.c (mismatch_list_string):
* sequence.c (mismatch_list_array):
* sequence.c (mismatch_string_array):
* sequence.c (mismatch_string_string):
* sequence.c (mismatch_array_array):
* sequence.c (get_mismatch_func):
* sequence.c (Fmismatch):
* sequence.c (Fsearch):
* sequence.c (venn):
* sequence.c (nvenn):
* sequence.c (Funion):
* sequence.c (Fset_exclusive_or):
* sequence.c (Fnset_exclusive_or):
* sequence.c (syms_of_sequence):
Add this file, containing those general functions that dealt with
sequences that were in fns.c.
* symsinit.h:
Make syms_of_sequence() available here.
man/ChangeLog addition:
2011-12-04 Aidan Kehoe <kehoea@parhasard.net>
* internals/internals.texi (Basic Lisp Modules):
Document sequence.c here too.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 04 Dec 2011 18:42:50 +0000 |
| parents | 06dd936cde16 |
| children |
| rev | line source |
|---|---|
| 5491 | 1 #! /bin/sh |
| 2 | |
| 0 | 3 # Enhanced sccs diff utility for use with vc mode. |
| 4 # This version is more compatible with rcsdiff(1). | |
| 5491 | 5 |
| 6 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, | |
| 7 # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | |
| 8 | |
| 9 # Author: Paul Eggert | |
| 10 # (according to authors.el) | |
| 11 | |
| 12 # This file is part of XEmacs. | |
| 13 | |
| 14 # XEmacs is free software: you can redistribute it and/or modify | |
| 15 # it under the terms of the GNU General Public License as published by | |
| 16 # the Free Software Foundation, either version 3 of the License, or | |
| 17 # (at your option) any later version. | |
| 18 | |
| 19 # XEmacs is distributed in the hope that it will be useful, | |
| 20 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 22 # GNU General Public License for more details. | |
| 23 | |
| 24 # You should have received a copy of the GNU General Public License | |
| 25 # along with XEmacs. If not, see <http://www.gnu.org/licenses/>. | |
| 26 | |
| 0 | 27 # Modified by: vladimir@Eng.Sun.COM on 95-06-07 |
| 28 # * Made sure that file arguments are specifed as s.<filename>. | |
| 5491 | 29 |
| 30 # Synced up with: GNU 23.1.92. | |
| 31 # Synced by: Ben Wing, 2-17-10. | |
| 32 | |
| 0 | 33 |
| 34 DIFF="diff" | |
| 35 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." | |
| 36 | |
| 5491 | 37 # Now that we use `sccs get' rather than just `get', we don't need this. |
| 38 # PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts | |
| 0 | 39 |
| 5491 | 40 echo="echo" |
| 0 | 41 sid1= sid2= |
| 42 | |
| 43 for f | |
| 44 do | |
| 45 case $f in | |
| 46 -*) | |
| 47 case $f in | |
| 48 --brief) | |
| 49 DIFF=cmp;; | |
| 50 -q) | |
| 51 echo=:;; | |
| 52 -r?*) | |
| 53 case $sid1 in | |
| 5491 | 54 '') |
| 55 sid1=$f | |
| 0 | 56 ;; |
| 57 *) | |
| 58 case $sid2 in | |
| 5491 | 59 ?*) echo "$usage" >&2; exit 2 ;; |
| 0 | 60 esac |
| 5491 | 61 sid2=$f |
| 0 | 62 ;; |
| 63 esac | |
| 64 ;; | |
| 65 *) | |
| 66 options="$options $f" | |
| 67 ;; | |
| 68 esac | |
| 69 shift | |
| 70 ;; | |
| 71 *) | |
| 72 break | |
| 73 ;; | |
| 74 esac | |
| 75 done | |
| 76 | |
| 77 case $# in | |
| 78 0) | |
| 79 echo "$usage" >&2 | |
| 80 exit 2 | |
| 81 esac | |
| 82 | |
| 83 | |
| 84 rev1= rev2= status=0 | |
| 85 trap 'status=2; exit' 1 2 13 15 | |
| 86 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 | |
| 87 | |
| 88 for f | |
| 89 do | |
| 5491 | 90 s=2 |
| 91 | |
| 92 # For files under SCCS control, fixup the file name to be the | |
| 93 # s. filename | |
| 94 if [ -d SCCS ]; then | |
| 95 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then | |
| 96 f="SCCS/s.$f" | |
| 97 fi | |
| 98 fi | |
| 0 | 99 |
| 100 case $f in | |
| 101 s.* | */s.*) | |
| 102 if | |
| 5491 | 103 rev1=`mktemp /tmp/geta.XXXXXXXX` |
| 104 sccs get -s -p -k $sid1 "$f" > $rev1 && | |
| 0 | 105 case $sid2 in |
| 106 '') | |
| 107 workfile=`expr " /$f" : '.*/s.\(.*\)'` | |
| 108 ;; | |
| 109 *) | |
| 5491 | 110 rev2=`mktemp /tmp/getb.XXXXXXXX` |
| 111 sccs get -s -p -k $sid2 "$f" > $rev2 | |
| 0 | 112 workfile=$rev2 |
| 113 esac | |
| 114 then | |
| 5491 | 115 $echo $DIFF $options $rev1 $workfile >&2 |
| 0 | 116 $DIFF $options $rev1 $workfile |
| 117 s=$? | |
| 118 fi | |
| 119 ;; | |
| 120 *) | |
| 121 echo "$0: $f is not an SCCS file" >&2 | |
| 122 esac | |
| 123 | |
| 124 if test $status -lt $s | |
| 125 then status=$s | |
| 126 fi | |
| 127 done | |
| 5491 | 128 |
| 129 # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a |