archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* encoding.c (rb_isalnum): defined.

Browse source 
(rb_isalpha): ditto.
  (rb_isblank): ditto.
  (rb_iscntrl): ditto.
  (rb_isdigit): ditto.
  (rb_isgraph): ditto.
  (rb_islower): ditto.
  (rb_isprint): ditto.
  (rb_ispunct): ditto.
  (rb_isspace): ditto.
  (rb_isupper): ditto.
  (rb_isxdigit): ditto.
  (rb_tolower): ditto.
  (rb_toupper): ditto.

* include/ruby/ruby.h: don't include include/ruby/encoding.h.
  (rb_isascii): defined.
  (rb_isalnum): declared.
  (rb_isalpha): ditto.
  (rb_isblank): ditto.
  (rb_iscntrl): ditto.
  (rb_isdigit): ditto.
  (rb_isgraph): ditto.
  (rb_islower): ditto.
  (rb_isprint): ditto.
  (rb_ispunct): ditto.
  (rb_isspace): ditto.
  (rb_isupper): ditto.
  (rb_isxdigit): ditto.
  (rb_tolower): ditto.
  (rb_toupper): ditto.
  (ISASCII): simplified.
  (ISPRINT): ditto.
  (ISSPACE): ditto.
  (ISUPPER): ditto.
  (ISLOWER): ditto.
  (ISALNUM): ditto.
  (ISALPHA): ditto.
  (ISDIGIT): ditto.
  (ISXDIGIT): ditto.
  (TOUPPER): ditto.
  (TOLOWER): ditto.

* include/ruby/encoding.h (rb_isascii): removed.
  (rb_isalnum): ditto.
  (rb_isalpha): ditto.
  (rb_isblank): ditto.
  (rb_iscntrl): ditto.
  (rb_isdigit): ditto.
  (rb_isgraph): ditto.
  (rb_islower): ditto.
  (rb_isprint): ditto.
  (rb_ispunct): ditto.
  (rb_isspace): ditto.
  (rb_isupper): ditto.
  (rb_isxdigit): ditto.
  (rb_tolower): ditto.
  (rb_toupper): ditto.

* common.mk: dependency updated.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-01-03 08:44:01 +00:00
parent 155fda385e
commit 5f237d7903
5 changed files with 188 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

40
include/ruby/ruby.h
View file

@ -969,21 +969,37 @@ int rb_remove_event_hook(rb_event_hook_func_t func);
#endif
/* locale insensitive functions */
#include "encoding.h"
#define rb_isascii(c) ((unsigned long)(c) < 128)
int rb_isalnum(int c);
int rb_isalpha(int c);
int rb_isblank(int c);
int rb_iscntrl(int c);
int rb_isdigit(int c);
int rb_isgraph(int c);
int rb_islower(int c);
int rb_isprint(int c);
int rb_ispunct(int c);
int rb_isspace(int c);
int rb_isupper(int c);
int rb_isxdigit(int c);
int rb_tolower(int c);
int rb_toupper(int c);
#ifndef ISPRINT
#define ISASCII(c) rb_isascii((int)(unsigned char)(c))
#define ISASCII(c) rb_isascii((unsigned char)(c))
#undef ISPRINT
#define ISPRINT(c) (ISASCII(c) && rb_isprint((int)(unsigned char)(c)))
#define ISSPACE(c) (ISASCII(c) && rb_isspace((int)(unsigned char)(c)))
#define ISUPPER(c) (ISASCII(c) && rb_isupper((int)(unsigned char)(c)))
#define ISLOWER(c) (ISASCII(c) && rb_islower((int)(unsigned char)(c)))
#define ISALNUM(c) (ISASCII(c) && rb_isalnum((int)(unsigned char)(c)))
#define ISALPHA(c) (ISASCII(c) && rb_isalpha((int)(unsigned char)(c)))
#define ISDIGIT(c) (ISASCII(c) && rb_isdigit((int)(unsigned char)(c)))
#define ISXDIGIT(c) (ISASCII(c) && rb_isxdigit((int)(unsigned char)(c)))
#define ISPRINT(c) rb_isprint((unsigned char)c)
#define ISSPACE(c) rb_isspace((unsigned char)c)
#define ISUPPER(c) rb_isupper((unsigned char)c)
#define ISLOWER(c) rb_islower((unsigned char)c)
#define ISALNUM(c) rb_isalnum((unsigned char)c)
#define ISALPHA(c) rb_isalpha((unsigned char)c)
#define ISDIGIT(c) rb_isdigit((unsigned char)c)
#define ISXDIGIT(c) rb_isxdigit((unsigned char)c)
#endif
#define TOUPPER(c) (rb_toupper((int)(unsigned char)(c)))
#define TOLOWER(c) (rb_tolower((int)(unsigned char)(c)))
#define TOUPPER(c) rb_toupper((unsigned char)c)
#define TOLOWER(c) rb_tolower((unsigned char)c)
#define STRCASECMP(s1, s2) (st_strcasecmp(s1, s2))
#define STRNCASECMP(s1, s2, n) (st_strncasecmp(s1, s2, n))