aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-12-13 23:40:04 -0800
committerPaul Eggert2014-12-13 23:41:33 -0800
commit3de474e4ac7418d06b9f37489f939a16d9bde1c2 (patch)
treecbcba843251af8de054f3a1166f30fb3434e635e /src
parent2e7f6d53f3831bdf8c96a630abca2f926fc45aae (diff)
downloademacs-3de474e4ac7418d06b9f37489f939a16d9bde1c2.tar.gz
emacs-3de474e4ac7418d06b9f37489f939a16d9bde1c2.zip
Spelling fixes
All uses changed. * lib-src/etags.c (analyze_regex): Rename from analyse_regex. * lisp/cedet/semantic/lex-spp.el: (semantic-lex-spp-analyzer-do-replace): Rename from semantic-lex-spp-anlyzer-do-replace. * lisp/emacs-lisp/cconv.el (cconv--analyze-use): Rename from cconv--analyse-use. (cconv--analyze-function): Rename from cconv--analyse-function. (cconv-analyze-form): Rename from cconv-analyse-form. * src/regex.c (analyze_first): Rename from analyze_first.
Diffstat (limited to 'src')
-rw-r--r--src/regex.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/regex.c b/src/regex.c
index 766ad26e709..85266458917 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -515,7 +515,7 @@ init_syntax_once (void)
515 515
516#define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) 516#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
517 517
518#ifndef emacs 518#ifndef emacs
519# undef max 519# undef max
520# undef min 520# undef min
521# define max(a, b) ((a) > (b) ? (a) : (b)) 521# define max(a, b) ((a) > (b) ? (a) : (b))
@@ -1632,7 +1632,7 @@ static boolean at_begline_loc_p (re_char *pattern, re_char *p,
1632static boolean at_endline_loc_p (re_char *p, re_char *pend, 1632static boolean at_endline_loc_p (re_char *p, re_char *pend,
1633 reg_syntax_t syntax); 1633 reg_syntax_t syntax);
1634static re_char *skip_one_char (re_char *p); 1634static re_char *skip_one_char (re_char *p);
1635static int analyse_first (re_char *p, re_char *pend, 1635static int analyze_first (re_char *p, re_char *pend,
1636 char *fastmap, const int multibyte); 1636 char *fastmap, const int multibyte);
1637 1637
1638/* Fetch the next character in the uncompiled pattern, with no 1638/* Fetch the next character in the uncompiled pattern, with no
@@ -2688,7 +2688,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax,
2688 size_t startoffset = 0; 2688 size_t startoffset = 0;
2689 re_opcode_t ofj = 2689 re_opcode_t ofj =
2690 /* Check if the loop can match the empty string. */ 2690 /* Check if the loop can match the empty string. */
2691 (simple || !analyse_first (laststart, b, NULL, 0)) 2691 (simple || !analyze_first (laststart, b, NULL, 0))
2692 ? on_failure_jump : on_failure_jump_loop; 2692 ? on_failure_jump : on_failure_jump_loop;
2693 assert (skip_one_char (laststart) <= b); 2693 assert (skip_one_char (laststart) <= b);
2694 2694
@@ -2735,7 +2735,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax,
2735 GET_BUFFER_SPACE (7); /* We might use less. */ 2735 GET_BUFFER_SPACE (7); /* We might use less. */
2736 if (many_times_ok) 2736 if (many_times_ok)
2737 { 2737 {
2738 boolean emptyp = analyse_first (laststart, b, NULL, 0); 2738 boolean emptyp = analyze_first (laststart, b, NULL, 0);
2739 2739
2740 /* The non-greedy multiple match looks like 2740 /* The non-greedy multiple match looks like
2741 a repeat..until: we only need a conditional jump 2741 a repeat..until: we only need a conditional jump
@@ -3836,7 +3836,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
3836 return false; 3836 return false;
3837} 3837}
3838 3838
3839/* analyse_first. 3839/* analyze_first.
3840 If fastmap is non-NULL, go through the pattern and fill fastmap 3840 If fastmap is non-NULL, go through the pattern and fill fastmap
3841 with all the possible leading chars. If fastmap is NULL, don't 3841 with all the possible leading chars. If fastmap is NULL, don't
3842 bother filling it up (obviously) and only return whether the 3842 bother filling it up (obviously) and only return whether the
@@ -3847,7 +3847,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
3847 Return -1 if fastmap was not updated accurately. */ 3847 Return -1 if fastmap was not updated accurately. */
3848 3848
3849static int 3849static int
3850analyse_first (const_re_char *p, const_re_char *pend, char *fastmap, 3850analyze_first (const_re_char *p, const_re_char *pend, char *fastmap,
3851 const int multibyte) 3851 const int multibyte)
3852{ 3852{
3853 int j, k; 3853 int j, k;
@@ -4089,7 +4089,7 @@ analyse_first (const_re_char *p, const_re_char *pend, char *fastmap,
4089 { /* We have to look down both arms. 4089 { /* We have to look down both arms.
4090 We first go down the "straight" path so as to minimize 4090 We first go down the "straight" path so as to minimize
4091 stack usage when going through alternatives. */ 4091 stack usage when going through alternatives. */
4092 int r = analyse_first (p, pend, fastmap, multibyte); 4092 int r = analyze_first (p, pend, fastmap, multibyte);
4093 if (r) return r; 4093 if (r) return r;
4094 p += j; 4094 p += j;
4095 } 4095 }
@@ -4139,7 +4139,7 @@ analyse_first (const_re_char *p, const_re_char *pend, char *fastmap,
4139 /* We reached the end without matching anything. */ 4139 /* We reached the end without matching anything. */
4140 return 1; 4140 return 1;
4141 4141
4142} /* analyse_first */ 4142} /* analyze_first */
4143 4143
4144/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in 4144/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
4145 BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible 4145 BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible
@@ -4169,7 +4169,7 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
4169 memset (fastmap, 0, 1 << BYTEWIDTH); /* Assume nothing's valid. */ 4169 memset (fastmap, 0, 1 << BYTEWIDTH); /* Assume nothing's valid. */
4170 bufp->fastmap_accurate = 1; /* It will be when we're done. */ 4170 bufp->fastmap_accurate = 1; /* It will be when we're done. */
4171 4171
4172 analysis = analyse_first (bufp->buffer, bufp->buffer + bufp->used, 4172 analysis = analyze_first (bufp->buffer, bufp->buffer + bufp->used,
4173 fastmap, RE_MULTIBYTE_P (bufp)); 4173 fastmap, RE_MULTIBYTE_P (bufp));
4174 bufp->can_be_null = (analysis != 0); 4174 bufp->can_be_null = (analysis != 0);
4175 return 0; 4175 return 0;