diff options
| author | Kim F. Storm | 2004-11-16 23:26:45 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-11-16 23:26:45 +0000 |
| commit | d4a38fddf7c85c554f9af7491510bdec5ff2b8d8 (patch) | |
| tree | 0493bd9887b658458d6f6c2f4fe81da62401f0a2 /lib-src | |
| parent | 71a539151a9a3990255567cc7aab6e0a2a1955f4 (diff) | |
| download | emacs-d4a38fddf7c85c554f9af7491510bdec5ff2b8d8.tar.gz emacs-d4a38fddf7c85c554f9af7491510bdec5ff2b8d8.zip | |
Undo last change.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/etags.c | 38 |
2 files changed, 4 insertions, 38 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 8d6e7f2b734..994102f5a87 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-11-17 Kim F. Storm <storm@cua.dk> | ||
| 2 | |||
| 3 | * etags.c: Undo last change. | ||
| 4 | |||
| 1 | 2004-11-09 Kim F. Storm <storm@cua.dk> | 5 | 2004-11-09 Kim F. Storm <storm@cua.dk> |
| 2 | 6 | ||
| 3 | * make-docfile.c (scan_c_file): Set defvarperbufferflag to | 7 | * make-docfile.c (scan_c_file): Set defvarperbufferflag to |
diff --git a/lib-src/etags.c b/lib-src/etags.c index e435c4d3926..a6004a048a9 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -1400,8 +1400,6 @@ main (argc, argv) | |||
| 1400 | this_file = argbuffer[i].what; | 1400 | this_file = argbuffer[i].what; |
| 1401 | process_file (stdin, this_file, lang); | 1401 | process_file (stdin, this_file, lang); |
| 1402 | break; | 1402 | break; |
| 1403 | case at_end: | ||
| 1404 | break; | ||
| 1405 | } | 1403 | } |
| 1406 | } | 1404 | } |
| 1407 | 1405 | ||
| @@ -2902,8 +2900,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 2902 | case tkeyseen: | 2900 | case tkeyseen: |
| 2903 | switch (toktype) | 2901 | switch (toktype) |
| 2904 | { | 2902 | { |
| 2905 | default: | ||
| 2906 | break; | ||
| 2907 | case st_none: | 2903 | case st_none: |
| 2908 | case st_C_class: | 2904 | case st_C_class: |
| 2909 | case st_C_struct: | 2905 | case st_C_struct: |
| @@ -2921,16 +2917,12 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 2921 | case tend: | 2917 | case tend: |
| 2922 | switch (toktype) | 2918 | switch (toktype) |
| 2923 | { | 2919 | { |
| 2924 | default: | ||
| 2925 | break; | ||
| 2926 | case st_C_class: | 2920 | case st_C_class: |
| 2927 | case st_C_struct: | 2921 | case st_C_struct: |
| 2928 | case st_C_enum: | 2922 | case st_C_enum: |
| 2929 | return FALSE; | 2923 | return FALSE; |
| 2930 | } | 2924 | } |
| 2931 | return TRUE; | 2925 | return TRUE; |
| 2932 | default: | ||
| 2933 | break; | ||
| 2934 | } | 2926 | } |
| 2935 | 2927 | ||
| 2936 | /* | 2928 | /* |
| @@ -2968,8 +2960,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 2968 | fvdef = fvnone; | 2960 | fvdef = fvnone; |
| 2969 | } | 2961 | } |
| 2970 | return FALSE; | 2962 | return FALSE; |
| 2971 | default: | ||
| 2972 | break; | ||
| 2973 | } | 2963 | } |
| 2974 | 2964 | ||
| 2975 | if (structdef == skeyseen) | 2965 | if (structdef == skeyseen) |
| @@ -2993,8 +2983,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 2993 | case st_C_objimpl: | 2983 | case st_C_objimpl: |
| 2994 | objdef = oimplementation; | 2984 | objdef = oimplementation; |
| 2995 | return FALSE; | 2985 | return FALSE; |
| 2996 | default: | ||
| 2997 | break; | ||
| 2998 | } | 2986 | } |
| 2999 | break; | 2987 | break; |
| 3000 | case oimplementation: | 2988 | case oimplementation: |
| @@ -3051,8 +3039,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 3051 | objdef = onone; | 3039 | objdef = onone; |
| 3052 | } | 3040 | } |
| 3053 | return FALSE; | 3041 | return FALSE; |
| 3054 | default: | ||
| 3055 | break; | ||
| 3056 | } | 3042 | } |
| 3057 | 3043 | ||
| 3058 | /* A function, variable or enum constant? */ | 3044 | /* A function, variable or enum constant? */ |
| @@ -3105,8 +3091,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 3105 | return FALSE; | 3091 | return FALSE; |
| 3106 | } | 3092 | } |
| 3107 | break; | 3093 | break; |
| 3108 | default: | ||
| 3109 | break; | ||
| 3110 | } | 3094 | } |
| 3111 | /* FALLTHRU */ | 3095 | /* FALLTHRU */ |
| 3112 | case fvnameseen: | 3096 | case fvnameseen: |
| @@ -3123,12 +3107,8 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var) | |||
| 3123 | fvdef = fvnameseen; /* function or variable */ | 3107 | fvdef = fvnameseen; /* function or variable */ |
| 3124 | *is_func_or_var = TRUE; | 3108 | *is_func_or_var = TRUE; |
| 3125 | return TRUE; | 3109 | return TRUE; |
| 3126 | default: | ||
| 3127 | break; | ||
| 3128 | } | 3110 | } |
| 3129 | break; | 3111 | break; |
| 3130 | default: | ||
| 3131 | break; | ||
| 3132 | } | 3112 | } |
| 3133 | 3113 | ||
| 3134 | return FALSE; | 3114 | return FALSE; |
| @@ -3604,8 +3584,6 @@ C_entries (c_ext, inf) | |||
| 3604 | fvdef = fignore; | 3584 | fvdef = fignore; |
| 3605 | } | 3585 | } |
| 3606 | break; | 3586 | break; |
| 3607 | default: | ||
| 3608 | break; | ||
| 3609 | } | 3587 | } |
| 3610 | if (structdef == stagseen && !cjava) | 3588 | if (structdef == stagseen && !cjava) |
| 3611 | { | 3589 | { |
| @@ -3616,8 +3594,6 @@ C_entries (c_ext, inf) | |||
| 3616 | case dsharpseen: | 3594 | case dsharpseen: |
| 3617 | savetoken = token; | 3595 | savetoken = token; |
| 3618 | break; | 3596 | break; |
| 3619 | default: | ||
| 3620 | break; | ||
| 3621 | } | 3597 | } |
| 3622 | if (!yacc_rules || lp == newlb.buffer + 1) | 3598 | if (!yacc_rules || lp == newlb.buffer + 1) |
| 3623 | { | 3599 | { |
| @@ -3656,8 +3632,6 @@ C_entries (c_ext, inf) | |||
| 3656 | linebuffer_setlen (&token_name, token_name.len + 1); | 3632 | linebuffer_setlen (&token_name, token_name.len + 1); |
| 3657 | strcat (token_name.buffer, ":"); | 3633 | strcat (token_name.buffer, ":"); |
| 3658 | break; | 3634 | break; |
| 3659 | default: | ||
| 3660 | break; | ||
| 3661 | } | 3635 | } |
| 3662 | if (structdef == stagseen) | 3636 | if (structdef == stagseen) |
| 3663 | { | 3637 | { |
| @@ -3735,8 +3709,6 @@ C_entries (c_ext, inf) | |||
| 3735 | make_C_tag (TRUE); /* an Objective C method */ | 3709 | make_C_tag (TRUE); /* an Objective C method */ |
| 3736 | objdef = oinbody; | 3710 | objdef = oinbody; |
| 3737 | break; | 3711 | break; |
| 3738 | default: | ||
| 3739 | break; | ||
| 3740 | } | 3712 | } |
| 3741 | switch (fvdef) | 3713 | switch (fvdef) |
| 3742 | { | 3714 | { |
| @@ -3807,8 +3779,6 @@ C_entries (c_ext, inf) | |||
| 3807 | fvdef = fvnone; | 3779 | fvdef = fvnone; |
| 3808 | } | 3780 | } |
| 3809 | break; | 3781 | break; |
| 3810 | default: | ||
| 3811 | break; | ||
| 3812 | } | 3782 | } |
| 3813 | break; | 3783 | break; |
| 3814 | case '(': | 3784 | case '(': |
| @@ -3842,8 +3812,6 @@ C_entries (c_ext, inf) | |||
| 3842 | case flistseen: | 3812 | case flistseen: |
| 3843 | fvdef = finlist; | 3813 | fvdef = finlist; |
| 3844 | break; | 3814 | break; |
| 3845 | default: | ||
| 3846 | break; | ||
| 3847 | } | 3815 | } |
| 3848 | parlev++; | 3816 | parlev++; |
| 3849 | break; | 3817 | break; |
| @@ -3869,8 +3837,6 @@ C_entries (c_ext, inf) | |||
| 3869 | case finlist: | 3837 | case finlist: |
| 3870 | fvdef = flistseen; | 3838 | fvdef = flistseen; |
| 3871 | break; | 3839 | break; |
| 3872 | default: | ||
| 3873 | break; | ||
| 3874 | } | 3840 | } |
| 3875 | if (!instruct | 3841 | if (!instruct |
| 3876 | && (typdef == tend | 3842 | && (typdef == tend |
| @@ -3920,8 +3886,6 @@ C_entries (c_ext, inf) | |||
| 3920 | bracelev = -1; | 3886 | bracelev = -1; |
| 3921 | } | 3887 | } |
| 3922 | break; | 3888 | break; |
| 3923 | default: | ||
| 3924 | break; | ||
| 3925 | } | 3889 | } |
| 3926 | switch (structdef) | 3890 | switch (structdef) |
| 3927 | { | 3891 | { |
| @@ -3935,8 +3899,6 @@ C_entries (c_ext, inf) | |||
| 3935 | structdef = snone; | 3899 | structdef = snone; |
| 3936 | make_C_tag (FALSE); /* a struct or enum */ | 3900 | make_C_tag (FALSE); /* a struct or enum */ |
| 3937 | break; | 3901 | break; |
| 3938 | default: | ||
| 3939 | break; | ||
| 3940 | } | 3902 | } |
| 3941 | bracelev++; | 3903 | bracelev++; |
| 3942 | break; | 3904 | break; |