(archive-l-e): New optional argument `float' means generate a float value.

[gnu-emacs] / src / syntax.h

diff --git a/src/syntax.h b/src/syntax.h
index 4cbd2e2edf9070b6452daf85c90d03ea0de347ec..92d55967b338ed268aeada2f9d66e801d2eb2111 100644 (file)
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,5 +1,6 @@
 /* Declarations having to do with GNU Emacs syntax tables.
 /* Declarations having to do with GNU Emacs syntax tables.

-   Copyright (C) 1985, 93, 94, 97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 extern Lisp_Object Qsyntax_table_p;
 
 
 extern Lisp_Object Qsyntax_table_p;


@@ -58,7 +59,7 @@ enum syntaxcode
 /* Set the syntax entry VAL for char C in table TABLE.  */
 
 #define SET_RAW_SYNTAX_ENTRY(table, c, val)                            \
 /* Set the syntax entry VAL for char C in table TABLE.  */
 
 #define SET_RAW_SYNTAX_ENTRY(table, c, val)                            \

-  ((c) < CHAR_TABLE_SINGLE_BYTE_SLOTS                                  \
+  ((((c) & 0xFF) == (c))                                               \

    ? (XCHAR_TABLE (table)->contents[(unsigned char) (c)] = (val))      \
    : Faset ((table), make_number (c), (val)))
 
    ? (XCHAR_TABLE (table)->contents[(unsigned char) (c)] = (val))      \
    : Faset ((table), make_number (c), (val)))
 


@@ -68,16 +69,16 @@ enum syntaxcode
 
 #ifdef __GNUC__
 #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                   \
 
 #ifdef __GNUC__
 #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                   \

-  ({ Lisp_Object tbl = table;                                  \
-     Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)];      \
-     while (NILP (temp))                                       \
+  ({ Lisp_Object _syntax_tbl = (table);                                \
+     Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
+     while (NILP (_syntax_temp))                               \

        {                                                       \
        {                                                       \

-        tbl = XCHAR_TABLE (tbl)->parent;                       \
-        if (NILP (tbl))                                        \
+        _syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent;       \
+        if (NILP (_syntax_tbl))                                \

           break;                                               \
           break;                                               \

-        temp = XCHAR_TABLE (tbl)->contents[(c)];               \
+        _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \

        }                                                       \
        }                                                       \

-     temp; })
+     _syntax_temp; })

 #else
 extern Lisp_Object syntax_temp;
 extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 #else
 extern Lisp_Object syntax_temp;
 extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));


@@ -90,7 +91,7 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 #endif
 
 /* SYNTAX_ENTRY fetches the information from the entry for character C
 #endif
 
 /* SYNTAX_ENTRY fetches the information from the entry for character C

-   in syntax table TABLE, or from globally kept data (gl_state).  
+   in syntax table TABLE, or from globally kept data (gl_state).

    Does inheritance.  */
 /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current
    position, it is either the buffer's syntax table, or syntax table
    Does inheritance.  */
 /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current
    position, it is either the buffer's syntax table, or syntax table


@@ -106,7 +107,7 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 #endif
 
 #define SYNTAX_ENTRY_INT(c)                            \
 #endif
 
 #define SYNTAX_ENTRY_INT(c)                            \

-  ((c) < CHAR_TABLE_SINGLE_BYTE_SLOTS                  \
+  ((((c) & 0xFF) == (c))                               \

    ? SYNTAX_ENTRY_FOLLOW_PARENT (CURRENT_SYNTAX_TABLE, \
                                 (unsigned char) (c))   \
    : Faref (CURRENT_SYNTAX_TABLE,                      \
    ? SYNTAX_ENTRY_FOLLOW_PARENT (CURRENT_SYNTAX_TABLE, \
                                 (unsigned char) (c))   \
    : Faref (CURRENT_SYNTAX_TABLE,                      \


@@ -117,24 +118,24 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 
 #ifdef __GNUC__
 #define SYNTAX(c)                                                      \
 
 #ifdef __GNUC__
 #define SYNTAX(c)                                                      \

-  ({ Lisp_Object temp;                                                 \
-     temp = SYNTAX_ENTRY (c);                                          \
-     (CONSP (temp)                                                     \
-      ? (enum syntaxcode) (XINT (XCAR (temp)) & 0xff)          \
+  ({ 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)                                           \
       : Swhitespace); })
 
 #define SYNTAX_WITH_FLAGS(c)                                           \

-  ({ Lisp_Object temp;                                                 \
-     temp = SYNTAX_ENTRY (c);                                          \
-     (CONSP (temp)                                                     \
-      ? XINT (XCAR (temp))                                     \
+  ({ Lisp_Object _syntax_temp;                                         \
+     _syntax_temp = SYNTAX_ENTRY (c);                                  \
+     (CONSP (_syntax_temp)                                             \
+      ? XINT (XCAR (_syntax_temp))                                     \

       : (int) Swhitespace); })
 
 #define SYNTAX_MATCH(c)                                                        \
       : (int) Swhitespace); })
 
 #define SYNTAX_MATCH(c)                                                        \

-  ({ Lisp_Object temp;                                                 \
-     temp = SYNTAX_ENTRY (c);                                          \
-     (CONSP (temp)                                                     \
-      ? XCDR (temp)                                            \
+  ({ Lisp_Object _syntax_temp;                                         \
+     _syntax_temp = SYNTAX_ENTRY (c);                                  \
+     (CONSP (_syntax_temp)                                             \
+      ? XCDR (_syntax_temp)                                            \

       : Qnil); })
 #else
 #define SYNTAX(c)                                                      \
       : Qnil); })
 #else
 #define SYNTAX(c)                                                      \


@@ -277,7 +278,7 @@ extern char syntax_code_spec[16];
    search, or after the last position of the backward search.  It
    makes sure that the first char is picked up with correct table, so
    one does not need to call UPDATE_SYNTAX_TABLE immediately after the
    search, or after the last position of the backward search.  It
    makes sure that the first char is picked up with correct table, so
    one does not need to call UPDATE_SYNTAX_TABLE immediately after the

-   call. 
+   call.

    Sign of COUNT gives the direction of the search.
  */
 
    Sign of COUNT gives the direction of the search.
  */
 


@@ -371,3 +372,6 @@ extern int parse_sexp_lookup_properties;
 extern INTERVAL interval_of P_ ((int, Lisp_Object));
 
 extern int scan_words P_ ((int, int));
 extern INTERVAL interval_of P_ ((int, Lisp_Object));
 
 extern int scan_words P_ ((int, int));

+
+/* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0
+   (do not change this comment) */