personal/mumble
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: extend to floats!

Browse Source
This commit is contained in:
NunoSempere 2023-05-01 20:14:33 -04:00
parent 85d2ede92d
commit ff8b45489b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mumble
View File

Binary file not shown.

12
src/mumble.c
View File

@ -10,7 +10,7 @@
// Types // Types
typedef struct lispval { typedef struct lispval {
int type; int type;
long num; double num;
char* err; char* err;
char* sym; char* sym;
int count; int count;
@ -31,7 +31,7 @@ enum {
}; };
// Constructors // Constructors
lispval* lispval_num(long x) lispval* lispval_num(double x)
{ {
lispval* v = malloc(sizeof(lispval)); lispval* v = malloc(sizeof(lispval));
v->type = LISPVAL_NUM; v->type = LISPVAL_NUM;
@ -99,7 +99,7 @@ lispval* lispval_append_child(lispval* parent, lispval* child)
lispval* read_lispval_num(mpc_ast_t* t) lispval* read_lispval_num(mpc_ast_t* t)
{ {
errno = 0; errno = 0;
long x = strtol(t->contents, NULL, 10); double x = strtod(t->contents, NULL);
return errno != ERANGE ? lispval_num(x) return errno != ERANGE ? lispval_num(x)
: lispval_err("Error: Invalid number."); : lispval_err("Error: Invalid number.");
} }
@ -141,7 +141,7 @@ void print_lispval_tree(lispval* v, int indent_level)
switch (v->type) { switch (v->type) {
case LISPVAL_NUM: case LISPVAL_NUM:
printf("\n%sNumber: %li", indent, v->num); printf("\n%sNumber: %f", indent, v->num);
break; break;
case LISPVAL_ERR: case LISPVAL_ERR:
printf("\n%sError: %s", indent, v->err); printf("\n%sError: %s", indent, v->err);
@ -166,7 +166,7 @@ void print_lispval_parenthesis(lispval* v)
{ {
switch (v->type) { switch (v->type) {
case LISPVAL_NUM: case LISPVAL_NUM:
printf("%li ", v->num); printf("%f ", v->num);
break; break;
case LISPVAL_ERR: case LISPVAL_ERR:
printf("%s ", v->err); printf("%s ", v->err);
@ -313,7 +313,7 @@ int main(int argc, char** argv)
/* Define them with the following Language */ /* Define them with the following Language */
mpca_lang(MPCA_LANG_DEFAULT, " \ mpca_lang(MPCA_LANG_DEFAULT, " \
number : /-?[0-9]+/ ; \ number : /-?[0-9]+\\.?([0-9]+)?/ ; \
symbol : '+' | '-' | '*' | '/' ; \ symbol : '+' | '-' | '*' | '/' ; \
sexpr : '(' <expr>* ')' ; \ sexpr : '(' <expr>* ')' ; \
expr : <number> | <symbol> | <sexpr> ; \ expr : <number> | <symbol> | <sexpr> ; \