[Emacs-diffs] Changes to emacs/src/syntax.h

[Andreas Schwab]

Index: emacs/src/syntax.h
diff -c emacs/src/syntax.h:1.41 emacs/src/syntax.h:1.42
*** emacs/src/syntax.h:1.41     Sun May  2 18:46:39 2004
--- emacs/src/syntax.h  Sun Jun 13 15:30:31 2004
***************
*** 68,83 ****
  
  #ifdef __GNUC__
  #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                  \
!   ({ Lisp_Object tbl = table;                                 \
!      Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)];     \
!      while (NILP (temp))                                      \
         {                                                      \
!        tbl = XCHAR_TABLE (tbl)->parent;                       \
!        if (NILP (tbl))                                        \
           break;                                               \
!        temp = XCHAR_TABLE (tbl)->contents[(c)];               \
         }                                                      \
!      temp; })
  #else
  extern Lisp_Object syntax_temp;
  extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
--- 68,83 ----
  
  #ifdef __GNUC__
  #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                  \
!   ({ Lisp_Object _syntax_tbl = (table);                               \
!      Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
!      while (NILP (_syntax_temp))                              \
         {                                                      \
!        _syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent;       \
!        if (NILP (_syntax_tbl))                                \
           break;                                               \
!        _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
         }                                                      \
!      _syntax_temp; })
  #else
  extern Lisp_Object syntax_temp;
  extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
***************
*** 117,140 ****
  
  #ifdef __GNUC__
  #define SYNTAX(c)                                                     \
!   ({ Lisp_Object temp;                                                        
\
!      temp = SYNTAX_ENTRY (c);                                         \
!      (CONSP (temp)                                                    \
!       ? (enum syntaxcode) (XINT (XCAR (temp)) & 0xff)         \
        : Swhitespace); })
  
  #define SYNTAX_WITH_FLAGS(c)                                          \
!   ({ Lisp_Object temp;                                                        
\
!      temp = SYNTAX_ENTRY (c);                                         \
!      (CONSP (temp)                                                    \
!       ? XINT (XCAR (temp))                                    \
        : (int) Swhitespace); })
  
  #define SYNTAX_MATCH(c)                                                       
\
!   ({ Lisp_Object temp;                                                        
\
!      temp = SYNTAX_ENTRY (c);                                         \
!      (CONSP (temp)                                                    \
!       ? XCDR (temp)                                           \
        : Qnil); })
  #else
  #define SYNTAX(c)                                                     \
--- 117,140 ----
  
  #ifdef __GNUC__
  #define SYNTAX(c)                                                     \
!   ({ Lisp_Object _syntax_temp;                                                
\
!      _syntax_temp = SYNTAX_ENTRY (c);                                 \
!      (CONSP (_syntax_temp)                                            \
!       ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff)         \
        : Swhitespace); })
  
  #define SYNTAX_WITH_FLAGS(c)                                          \
!   ({ Lisp_Object _syntax_temp;                                                
\
!      _syntax_temp = SYNTAX_ENTRY (c);                                 \
!      (CONSP (_syntax_temp)                                            \
!       ? XINT (XCAR (_syntax_temp))                                    \
        : (int) Swhitespace); })
  
  #define SYNTAX_MATCH(c)                                                       
\
!   ({ Lisp_Object _syntax_temp;                                                
\
!      _syntax_temp = SYNTAX_ENTRY (c);                                 \
!      (CONSP (_syntax_temp)                                            \
!       ? XCDR (_syntax_temp)                                           \
        : Qnil); })
  #else
  #define SYNTAX(c)                                                     \