Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-08 05:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

conditionally toggling isalpha/isxdigit between function or macro depending on platform

Browse source 
needed for plan9 where the function definitions are not provided
This commit is contained in:
Alex Shinn 2011-05-19 23:32:23 -07:00
parent 280ea1cddb
commit 78f0e9bd22
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/chibi/sexp.h
View file

@ -16,6 +16,8 @@ extern "C" {
#if defined(_WIN32) || defined(__MINGW32__) #if defined(_WIN32) || defined(__MINGW32__)
#include <windows.h> #include <windows.h>
#define sexp_isalpha(x) ((isalpha)(x))
#define sexp_isxdigit(x) ((isxdigit)(x))
#else #else
#if SEXP_USE_DL #if SEXP_USE_DL
#include <dlfcn.h> #include <dlfcn.h>
@ -25,6 +27,8 @@ extern "C" {
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#define sexp_isalpha(x) (isalpha(x))
#define sexp_isxdigit(x) (isxdigit(x))
#endif #endif
#ifdef PLAN9 #ifdef PLAN9

4
main.c
View file

@ -201,10 +201,10 @@ void run_main (int argc, char **argv) {
arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2); arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2);
check_nonull_arg('h', arg); check_nonull_arg('h', arg);
heap_size = strtoul(arg, &arg, 0); heap_size = strtoul(arg, &arg, 0);
if ((isalpha)(*arg)) heap_size *= multiplier(*arg++); if (sexp_isalpha(*arg)) heap_size *= multiplier(*arg++);
if (*arg == '/') { if (*arg == '/') {
heap_max_size = strtoul(arg+1, &arg, 0); heap_max_size = strtoul(arg+1, &arg, 0);
if ((isalpha)(*arg)) heap_max_size *= multiplier(*arg++); if (sexp_isalpha(*arg)) heap_max_size *= multiplier(*arg++);
} }
break; break;
case 'V': case 'V':

7
sexp.c
View file

@ -1539,7 +1539,7 @@ sexp sexp_read_string (sexp ctx, sexp in) {
case 't': c = '\t'; break; case 't': c = '\t'; break;
case 'x': case 'x':
c = sexp_read_char(ctx, in); c = sexp_read_char(ctx, in);
if (isxdigit(c)) { if (sexp_isxdigit(c)) {
c = digit_value(c)*16 + digit_value(sexp_read_char(ctx, in)); c = digit_value(c)*16 + digit_value(sexp_read_char(ctx, in));
} else { } else {
sexp_push_char(ctx, c, in); c = 'x'; sexp_push_char(ctx, c, in); c = 'x';
@ -1651,7 +1651,7 @@ sexp sexp_read_number (sexp ctx, sexp in, int base) {
c = sexp_read_char(ctx, in); c = sexp_read_char(ctx, in);
} }
for ( ; isxdigit(c); c=sexp_read_char(ctx, in)) { for ( ; sexp_isxdigit(c); c=sexp_read_char(ctx, in)) {
digit = digit_value(c); digit = digit_value(c);
if ((digit < 0) || (digit >= base)) if ((digit < 0) || (digit >= base))
break; break;
@ -1919,7 +1919,8 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
if (sexp_string_length(res) == 1) { if (sexp_string_length(res) == 1) {
res = sexp_make_character(c1); res = sexp_make_character(c1);
} else if ((c1 == 'x' || c1 == 'X') && } else if ((c1 == 'x' || c1 == 'X') &&
(isxdigit)(str[1]) && (isxdigit)(str[2]) && str[3] == '\0') { sexp_isxdigit(str[1])
&& sexp_isxdigit(str[2]) && str[3] == '\0') {
res = sexp_make_character(16 * digit_value(str[1]) res = sexp_make_character(16 * digit_value(str[1])
+ digit_value(str[2])); + digit_value(str[2]));
} else { } else {