nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add strto{f,d,ld}(3).

This commit is contained in:
Jonas 'Sortie' Termansen 2013-03-23 19:20:44 +01:00
parent 28a4fe477b
commit 7f543dc910
6 changed files with 157 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Makefile
View File

@ -126,8 +126,11 @@ strrchr.o \
strsignal.o \
strspn.o \
strstr.o \
strtod.o \
strtof.o \
strtok.o \
strtok_r.o \
strtold.o \
strxfrm.o \
time/asctime.o \
time/asctime_r.o \

53
libc/atof.cpp
View File

@ -23,59 +23,8 @@
*******************************************************************************/
#include <stdlib.h>
#include <stdio.h>
// TODO: This horribly hacky code is taken from sdlquake's common.c, which is
// licensed under the GPL. Since most Sortix software is GPL-compatible
// this will do for now. It's a temporary measure until I get around to
// writing a real strtod function - most of them are true horrors.
extern "C" double atof(const char* str)
{
int sign = *str == '-' ? (str++, -1) : 1;
double val = 0.0;
if ( str[0] == '0' && (str[1] == 'x' || str[1] == 'X') )
{
str += 2;
while ( true )
{
char c = *str++;
if ( '0' <= c && c <= '9' )
val = val * 16 + c - '0';
else if ( 'a' <= c && c <= 'f' )
val = val * 16 + c - 'a' + 10;
else if ( 'A' <= c && c <= 'F' )
val = val * 16 + c - 'A' + 10;
else
return val * sign;
}
}
int decimal = -1;
int total = 0;
while ( true )
{
char c = *str++;
if (c == '.')
{
decimal = total;
continue;
}
if ( c < '0' || c > '9' )
break;
val = val * 10 + c - '0';
total++;
}
if ( decimal == -1 )
return val * sign;
while ( decimal < total )
{
val /= 10;
total--;
}
return val * sign;
return strtod(str, NULL);
}

6
libc/include/stdlib.h
View File

@ -95,7 +95,10 @@ void* realloc(void*, size_t);
char* realpath(const char* __restrict, char* __restrict);
int setenv(const char*, const char*, int);
void srand(unsigned);
double strtod(const char* __restrict, char** __restrict);
float strtof(const char* __restrict, char** __restrict);
long strtol(const char* __restrict, char** __restrict, int);
long double strtold(const char* __restrict, char** __restrict);
unsigned long strtoul(const char* __restrict, char** __restrict, int);
unsigned long long strtoull(const char* __restrict, char** __restrict, int);
long long strtoll(const char* __restrict, char** __restrict, int);
@ -146,9 +149,6 @@ void setkey(const char*);
char* setstate(char*);
void srand48(long);
void srandom(unsigned);
double strtod(const char* __restrict, char** __restrict);
float strtof(const char* __restrict, char** __restrict);
long double strtold(const char* __restrict, char** __restrict);
int unlockpt(int);
#if __POSIX_OBSOLETE <= 200801

28
libc/strtod.cpp Normal file
View File

@ -0,0 +1,28 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2013.
This file is part of the Sortix C Library.
The Sortix C Library is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
The Sortix C Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
strtod.cpp
Converts floating numbers represented as strings to binary representation.
*******************************************************************************/
#define FLOAT double
#define STRTOF strtod
#include "strtof.cpp"

94
libc/strtof.cpp Normal file
View File

@ -0,0 +1,94 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2013.
This file is part of the Sortix C Library.
The Sortix C Library is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
The Sortix C Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
strtof.cpp
Converts floating numbers represented as strings to binary representation.
*******************************************************************************/
#ifndef FLOAT
#define FLOAT float
#define STRTOF strtof
#endif
#include <stdlib.h>
#include <stdio.h>
// TODO: This horribly hacky code is taken from sdlquake's common.c, which is
// licensed under the GPL. Since most Sortix software is GPL-compatible
// this will do for now. It's a temporary measure until I get around to
// writing a real strtod function - most of them are true horrors.
extern "C" FLOAT STRTOF(const char* str, char** nptr)
{
int sign = *str == '-' ? (str++, -1) : 1;
FLOAT val = 0.0;
if ( false )
{
out:
if ( nptr )
*nptr = (char*) str;
return val * sign;
}
if ( str[0] == '0' && (str[1] == 'x' || str[1] == 'X') )
{
str += 2;
while ( true )
{
char c = *str++;
if ( '0' <= c && c <= '9' )
val = val * 16 + c - '0';
else if ( 'a' <= c && c <= 'f' )
val = val * 16 + c - 'a' + 10;
else if ( 'A' <= c && c <= 'F' )
val = val * 16 + c - 'A' + 10;
else
goto out;
}
}
int decimal = -1;
int total = 0;
while ( true )
{
char c = *str++;
if (c == '.')
{
decimal = total;
continue;
}
if ( c < '0' || c > '9' )
break;
val = val * 10 + c - '0';
total++;
}
if ( decimal == -1 )
goto out;
while ( decimal < total )
{
val /= 10;
total--;
}
goto out;
}

28
libc/strtold.cpp Normal file
View File

@ -0,0 +1,28 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2013.
This file is part of the Sortix C Library.
The Sortix C Library is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
The Sortix C Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
strtold.cpp
Converts floating numbers represented as strings to binary representation.
*******************************************************************************/
#define FLOAT long double
#define STRTOF strtold
#include "strtof.cpp"