Allow non-ASCII characters in function names.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index b0f936db1f00be9f3840ce75a5c48e4c61863ac4..14315a83240d3f3ae4e85978789f0ed7eee9db3c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-25  Bruno Haible  <bruno@clisp.org>
+
+       * x-php.c (x_php_lex): Treat byte values >= 127 like alphabetic.
+       Reported by Hagen Fritsch <itooktheredpill@gmx.de>.
+
 2005-12-25  Bruno Haible  <bruno@clisp.org>
 
        Tell Python developers to use named arguments in format strings.

diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 7cabbce29396190b5513699f408a5071833021a6..90a33606708045b4c9442860df21ffb78858f92d 100644 (file)
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1,5 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -40,7 +40,11 @@
 
 
 /* The PHP syntax is defined in phpdoc/manual/langref.html.
-   See also php-4.1.0/Zend/zend_language_scanner.l.  */
+   See also php-4.1.0/Zend/zend_language_scanner.l.
+   Note that variable and function names can contain bytes in the range
+   0x7f..0xff; see
+     http://www.php.net/manual/en/language.variables.php
+     http://www.php.net/manual/en/language.functions.php  */
 
 
 /* ====================== Keyword set customization.  ====================== */
@@ -801,6 +805,25 @@ x_php_lex (token_ty *tp)
        case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
        case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
        case 'v': case 'w': case 'x': case 'y': case 'z':
+       case 127: case 128: case 129: case 130: case 131: case 132: case 133:
+       case 134: case 135: case 136: case 137: case 138: case 139: case 140:
+       case 141: case 142: case 143: case 144: case 145: case 146: case 147:
+       case 148: case 149: case 150: case 151: case 152: case 153: case 154:
+       case 155: case 156: case 157: case 158: case 159: case 160: case 161:
+       case 162: case 163: case 164: case 165: case 166: case 167: case 168:
+       case 169: case 170: case 171: case 172: case 173: case 174: case 175:
+       case 176: case 177: case 178: case 179: case 180: case 181: case 182:
+       case 183: case 184: case 185: case 186: case 187: case 188: case 189:
+       case 190: case 191: case 192: case 193: case 194: case 195: case 196:
+       case 197: case 198: case 199: case 200: case 201: case 202: case 203:
+       case 204: case 205: case 206: case 207: case 208: case 209: case 210:
+       case 211: case 212: case 213: case 214: case 215: case 216: case 217:
+       case 218: case 219: case 220: case 221: case 222: case 223: case 224:
+       case 225: case 226: case 227: case 228: case 229: case 230: case 231:
+       case 232: case 233: case 234: case 235: case 236: case 237: case 238:
+       case 239: case 240: case 241: case 242: case 243: case 244: case 245:
+       case 246: case 247: case 248: case 249: case 250: case 251: case 252:
+       case 253: case 254: case 255:
          bufpos = 0;
          for (;;)
            {
@@ -826,6 +849,28 @@ x_php_lex (token_ty *tp)
                case 'y': case 'z':
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':
+               case 127: case 128: case 129: case 130: case 131: case 132:
+               case 133: case 134: case 135: case 136: case 137: case 138:
+               case 139: case 140: case 141: case 142: case 143: case 144:
+               case 145: case 146: case 147: case 148: case 149: case 150:
+               case 151: case 152: case 153: case 154: case 155: case 156:
+               case 157: case 158: case 159: case 160: case 161: case 162:
+               case 163: case 164: case 165: case 166: case 167: case 168:
+               case 169: case 170: case 171: case 172: case 173: case 174:
+               case 175: case 176: case 177: case 178: case 179: case 180:
+               case 181: case 182: case 183: case 184: case 185: case 186:
+               case 187: case 188: case 189: case 190: case 191: case 192:
+               case 193: case 194: case 195: case 196: case 197: case 198:
+               case 199: case 200: case 201: case 202: case 203: case 204:
+               case 205: case 206: case 207: case 208: case 209: case 210:
+               case 211: case 212: case 213: case 214: case 215: case 216:
+               case 217: case 218: case 219: case 220: case 221: case 222:
+               case 223: case 224: case 225: case 226: case 227: case 228:
+               case 229: case 230: case 231: case 232: case 233: case 234:
+               case 235: case 236: case 237: case 238: case 239: case 240:
+               case 241: case 242: case 243: case 244: case 245: case 246:
+               case 247: case 248: case 249: case 250: case 251: case 252:
+               case 253: case 254: case 255: 
                  continue;
 
                default: