mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-26 00:10:27 +00:00
Code Issues 1 Releases Wiki Activity

Fix integer division by 0 error.

Browse Source
This commit is contained in:
Calvin Rose 2017-05-08 12:08:48 -04:00
parent 4fd398ac97
commit 6246c43e22
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@
###################################################### ######################################################
##### Set global variables for all gst Makefiles ##### ##### Set global variables for all gst Makefiles #####
###################################################### ######################################################
CFLAGS=-std=c99 -Wall -Wextra -Wpedantic -I./include -g -lreadline CFLAGS=-std=c99 -Wall -Wextra -Wpedantic -I./include -lreadline -g
PREFIX=/usr/local PREFIX=/usr/local
GST_TARGET=client/gst GST_TARGET=client/gst
GST_CORELIB=core/libgst.a GST_CORELIB=core/libgst.a

27
core/stl.c
View File

@ -54,7 +54,7 @@ GstValue gst_stl_binop_##name(GstValue lhs, GstValue rhs) {\
return gst_wrap_nil();\ return gst_wrap_nil();\
} }
#define SIMPLE_ACCUM_FUNCTION(name, start, op)\ #define SIMPLE_ACCUM_FUNCTION(name, op)\
MAKE_BINOP(name, op)\ MAKE_BINOP(name, op)\
int gst_stl_##name(Gst* vm) {\ int gst_stl_##name(Gst* vm) {\
GstValue lhs, rhs;\ GstValue lhs, rhs;\
@ -70,10 +70,27 @@ int gst_stl_##name(Gst* vm) {\
gst_c_return(vm, lhs);\ gst_c_return(vm, lhs);\
} }
SIMPLE_ACCUM_FUNCTION(add, 0, +) SIMPLE_ACCUM_FUNCTION(add, +)
SIMPLE_ACCUM_FUNCTION(mul, 1, *) SIMPLE_ACCUM_FUNCTION(mul, *)
SIMPLE_ACCUM_FUNCTION(sub, 0, -) SIMPLE_ACCUM_FUNCTION(sub, -)
SIMPLE_ACCUM_FUNCTION(div, 1, /)
/* Detect division by zero */
MAKE_BINOP(div, /)
int gst_stl_div(Gst *vm) {
GstValue lhs, rhs;
uint32_t j, count;
count = gst_count_args(vm);
lhs = gst_arg(vm, 0);
for (j = 1; j < count; ++j) {
rhs = gst_arg(vm, j);
if (lhs.type == GST_INTEGER && rhs.type == GST_INTEGER && rhs.data.integer == 0)
gst_c_throwc(vm, "cannot integer divide by 0");
lhs = gst_stl_binop_div(lhs, rhs);
}
if (lhs.type == GST_NIL)
gst_c_throwc(vm, "expected integer/real");
gst_c_return(vm, lhs);
}
#undef SIMPLE_ACCUM_FUNCTION #undef SIMPLE_ACCUM_FUNCTION