Mercurial > emacs
comparison lib-src/etags.c @ 75675:37aa3bcd315f
(gperf, in_word_set): changed attribute for Java to (C_JAVA & ~C_PLPL).
The previous change introduced 2004-09-13 was broken, as (C_JAVA &
!C_PLPL) always evaluates to 0. This caused import, package, extends,
implements and interface to be treated specially for all kinds of
C-style files, not just Java files. (by Per Cederqvist).
author | Francesco Potortì <pot@gnu.org> |
---|---|
date | Sun, 04 Feb 2007 22:03:09 +0000 |
parents | 8f0016c7d0b9 |
children | a3a7c25796a4 |
comparison
equal
deleted
inserted
replaced
75674:dff5237eda65 | 75675:37aa3bcd315f |
---|---|
2416 __attribute__, 0, st_C_attribute | 2416 __attribute__, 0, st_C_attribute |
2417 @interface, 0, st_C_objprot | 2417 @interface, 0, st_C_objprot |
2418 @protocol, 0, st_C_objprot | 2418 @protocol, 0, st_C_objprot |
2419 @implementation,0, st_C_objimpl | 2419 @implementation,0, st_C_objimpl |
2420 @end, 0, st_C_objend | 2420 @end, 0, st_C_objend |
2421 import, (C_JAVA & !C_PLPL), st_C_ignore | 2421 import, (C_JAVA & ~C_PLPL), st_C_ignore |
2422 package, (C_JAVA & !C_PLPL), st_C_ignore | 2422 package, (C_JAVA & ~C_PLPL), st_C_ignore |
2423 friend, C_PLPL, st_C_ignore | 2423 friend, C_PLPL, st_C_ignore |
2424 extends, (C_JAVA & !C_PLPL), st_C_javastruct | 2424 extends, (C_JAVA & ~C_PLPL), st_C_javastruct |
2425 implements, (C_JAVA & !C_PLPL), st_C_javastruct | 2425 implements, (C_JAVA & ~C_PLPL), st_C_javastruct |
2426 interface, (C_JAVA & !C_PLPL), st_C_struct | 2426 interface, (C_JAVA & ~C_PLPL), st_C_struct |
2427 class, 0, st_C_class | 2427 class, 0, st_C_class |
2428 namespace, C_PLPL, st_C_struct | 2428 namespace, C_PLPL, st_C_struct |
2429 domain, C_STAR, st_C_struct | 2429 domain, C_STAR, st_C_struct |
2430 union, 0, st_C_struct | 2430 union, 0, st_C_struct |
2431 struct, 0, st_C_struct | 2431 struct, 0, st_C_struct |
2532 {"if", 0, st_C_ignore}, | 2532 {"if", 0, st_C_ignore}, |
2533 {""}, | 2533 {""}, |
2534 {"@end", 0, st_C_objend}, | 2534 {"@end", 0, st_C_objend}, |
2535 {"union", 0, st_C_struct}, | 2535 {"union", 0, st_C_struct}, |
2536 {"define", 0, st_C_define}, | 2536 {"define", 0, st_C_define}, |
2537 {"import", (C_JAVA & !C_PLPL), st_C_ignore}, | 2537 {"import", (C_JAVA & ~C_PLPL), st_C_ignore}, |
2538 {"template", 0, st_C_template}, | 2538 {"template", 0, st_C_template}, |
2539 {"operator", C_PLPL, st_C_operator}, | 2539 {"operator", C_PLPL, st_C_operator}, |
2540 {"@interface", 0, st_C_objprot}, | 2540 {"@interface", 0, st_C_objprot}, |
2541 {"implements", (C_JAVA & !C_PLPL), st_C_javastruct}, | 2541 {"implements", (C_JAVA & ~C_PLPL), st_C_javastruct}, |
2542 {"friend", C_PLPL, st_C_ignore}, | 2542 {"friend", C_PLPL, st_C_ignore}, |
2543 {"typedef", 0, st_C_typedef}, | 2543 {"typedef", 0, st_C_typedef}, |
2544 {"return", 0, st_C_ignore}, | 2544 {"return", 0, st_C_ignore}, |
2545 {"@implementation",0, st_C_objimpl}, | 2545 {"@implementation",0, st_C_objimpl}, |
2546 {"@protocol", 0, st_C_objprot}, | 2546 {"@protocol", 0, st_C_objprot}, |
2547 {"interface", (C_JAVA & !C_PLPL), st_C_struct}, | 2547 {"interface", (C_JAVA & ~C_PLPL), st_C_struct}, |
2548 {"extern", 0, st_C_extern}, | 2548 {"extern", 0, st_C_extern}, |
2549 {"extends", (C_JAVA & !C_PLPL), st_C_javastruct}, | 2549 {"extends", (C_JAVA & ~C_PLPL), st_C_javastruct}, |
2550 {"struct", 0, st_C_struct}, | 2550 {"struct", 0, st_C_struct}, |
2551 {"domain", C_STAR, st_C_struct}, | 2551 {"domain", C_STAR, st_C_struct}, |
2552 {"switch", 0, st_C_ignore}, | 2552 {"switch", 0, st_C_ignore}, |
2553 {"enum", 0, st_C_enum}, | 2553 {"enum", 0, st_C_enum}, |
2554 {"for", 0, st_C_ignore}, | 2554 {"for", 0, st_C_ignore}, |
2555 {"namespace", C_PLPL, st_C_struct}, | 2555 {"namespace", C_PLPL, st_C_struct}, |
2556 {"class", 0, st_C_class}, | 2556 {"class", 0, st_C_class}, |
2557 {"while", 0, st_C_ignore}, | 2557 {"while", 0, st_C_ignore}, |
2558 {"undef", 0, st_C_define}, | 2558 {"undef", 0, st_C_define}, |
2559 {"package", (C_JAVA & !C_PLPL), st_C_ignore}, | 2559 {"package", (C_JAVA & ~C_PLPL), st_C_ignore}, |
2560 {"__attribute__", 0, st_C_attribute}, | 2560 {"__attribute__", 0, st_C_attribute}, |
2561 {"SYSCALL", 0, st_C_gnumacro}, | 2561 {"SYSCALL", 0, st_C_gnumacro}, |
2562 {"ENTRY", 0, st_C_gnumacro}, | 2562 {"ENTRY", 0, st_C_gnumacro}, |
2563 {"PSEUDO", 0, st_C_gnumacro}, | 2563 {"PSEUDO", 0, st_C_gnumacro}, |
2564 {"DEFUN", 0, st_C_gnumacro} | 2564 {"DEFUN", 0, st_C_gnumacro} |