Skip to content

Exception Handling #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 21, 2016
Merged

Exception Handling #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fdae674
Init exception handling
rajithv Jul 23, 2016
8cf9e08
Fixed minor memory leak
rajithv Jul 24, 2016
9fbfcd8
Error handling for unary and binary operations, one arg and two arg f…
rajithv Jul 24, 2016
c61c08e
Different Exceptions added
rajithv Jul 25, 2016
52236c6
Functions Spec Tests
rajithv Aug 16, 2016
acfd1f3
Merge branch 'master' of https://github.com/symengine/symengine.rb in…
rajithv Aug 16, 2016
4e64375
Changes to symengine_utils
rajithv Aug 17, 2016
c5205a2
Test for Division By Zero
rajithv Aug 19, 2016
09553f1
Division by Zero tests for trig functions
rajithv Aug 19, 2016
2ada844
Changed int to enum type for error code
rajithv Aug 19, 2016
c5f755a
Changed all instances of error codes to symengine_exceptions_t
rajithv Aug 19, 2016
7de5e6d
Update symengine version and adapt changes to basic_diff
rajithv Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions ext/symengine/ruby_basic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ VALUE cbasic_alloc(VALUE klass)
return Data_Wrap_Struct(klass, NULL, cbasic_free_heap, struct_ptr);
}

VALUE cbasic_binary_op(VALUE self, VALUE operand2,
void (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *))
VALUE cbasic_binary_op(
VALUE self, VALUE operand2,
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *))
{
basic_struct *this, *cresult;
VALUE result;
VALUE result = Qnil;

basic cbasic_operand2;
basic_new_stack(cbasic_operand2);
Expand All @@ -32,27 +33,37 @@ VALUE cbasic_binary_op(VALUE self, VALUE operand2,
sympify(operand2, cbasic_operand2);

cresult = basic_new_heap();
cwfunc_ptr(cresult, this, cbasic_operand2);
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL, cbasic_free_heap,
cresult);
basic_free_stack(cbasic_operand2);

symengine_exceptions_t error_code
= cwfunc_ptr(cresult, this, cbasic_operand2);
if (error_code == SYMENGINE_NO_EXCEPTION) {
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL,
cbasic_free_heap, cresult);
basic_free_stack(cbasic_operand2);
} else {
basic_free_stack(cbasic_operand2);
raise_exception(error_code);
}
return result;
}

VALUE cbasic_unary_op(VALUE self,
void (*cwfunc_ptr)(basic_struct *, const basic_struct *))
VALUE cbasic_unary_op(VALUE self, symengine_exceptions_t (*cwfunc_ptr)(
basic_struct *, const basic_struct *))
{
basic_struct *this, *cresult;
VALUE result;
VALUE result = Qnil;

Data_Get_Struct(self, basic_struct, this);

cresult = basic_new_heap();
cwfunc_ptr(cresult, this);
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL, cbasic_free_heap,
cresult);

symengine_exceptions_t error_code = cwfunc_ptr(cresult, this);
Copy link
Member

@isuruf isuruf Aug 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use one convention. int or symengine_exceptions_t or CWRAPPER_OUTPUT_TYPE. All 3 are used in this PR.

if (error_code == SYMENGINE_NO_EXCEPTION) {
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL,
cbasic_free_heap, cresult);
} else {
raise_exception(error_code);
}
return result;
}

Expand Down Expand Up @@ -93,8 +104,8 @@ VALUE cbasic_diff(VALUE self, VALUE operand2)
sympify(operand2, cbasic_operand2);

cresult = basic_new_heap();
int status = basic_diff(cresult, this, cbasic_operand2);
if (status == 0) {
symengine_exceptions_t status = basic_diff(cresult, this, cbasic_operand2);
if (status == SYMENGINE_RUNTIME_ERROR) {
basic_free_stack(cbasic_operand2);
basic_free_heap(cresult);
return Qnil;
Expand Down
11 changes: 6 additions & 5 deletions ext/symengine/ruby_basic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ void cbasic_free_heap(void *ptr);

VALUE cbasic_alloc(VALUE klass);

VALUE cbasic_binary_op(VALUE self, VALUE operand2,
void (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *));
VALUE cbasic_binary_op(
VALUE self, VALUE operand2,
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *));

VALUE cbasic_unary_op(VALUE self,
void (*cwfunc_ptr)(basic_struct *, const basic_struct *));
VALUE cbasic_unary_op(VALUE self, symengine_exceptions_t (*cwfunc_ptr)(
basic_struct *, const basic_struct *));

VALUE cbasic_add(VALUE self, VALUE operand2);

Expand Down
15 changes: 10 additions & 5 deletions ext/symengine/ruby_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,20 @@ VALUE cutils_sympify(VALUE self, VALUE operand)

VALUE cutils_evalf(VALUE self, VALUE operand, VALUE prec, VALUE real)
{
VALUE result;
VALUE result = Qnil;

basic_struct *cresult;
cresult = basic_new_heap();

sympify(operand, cresult);
basic_evalf(cresult, cresult, NUM2INT(prec), (real == Qtrue ? 1 : 0));
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL, cbasic_free_heap,
cresult);

symengine_exceptions_t error_code
= basic_evalf(cresult, cresult, NUM2INT(prec), (real == Qtrue ? 1 : 0));

if (error_code == SYMENGINE_NO_EXCEPTION) {
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL,
cbasic_free_heap, cresult);
} else {
raise_exception(error_code);
}
return result;
}
70 changes: 54 additions & 16 deletions ext/symengine/symengine_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,31 +199,37 @@ VALUE Klass_of_Basic(const basic_struct *basic_ptr)
}
}

VALUE function_onearg(void (*cwfunc_ptr)(basic_struct *, const basic_struct *),
VALUE operand1)
VALUE function_onearg(
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *),
VALUE operand1)
{
basic_struct *cresult;
VALUE result;
VALUE result = Qnil;

basic cbasic_operand1;
basic_new_stack(cbasic_operand1);
sympify(operand1, cbasic_operand1);

cresult = basic_new_heap();
cwfunc_ptr(cresult, cbasic_operand1);
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL, cbasic_free_heap,
cresult);
basic_free_stack(cbasic_operand1);

symengine_exceptions_t error_code = cwfunc_ptr(cresult, cbasic_operand1);
if (error_code == SYMENGINE_NO_EXCEPTION) {
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL,
cbasic_free_heap, cresult);
basic_free_stack(cbasic_operand1);
} else {
basic_free_stack(cbasic_operand1);
raise_exception(error_code);
}
return result;
}

VALUE function_twoarg(void (*cwfunc_ptr)(basic_struct *, const basic_struct *,
VALUE function_twoarg(
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *),
VALUE operand1, VALUE operand2)
VALUE operand1, VALUE operand2)
{
basic_struct *cresult;
VALUE result;
VALUE result = Qnil;

basic cbasic_operand1;
basic_new_stack(cbasic_operand1);
Expand All @@ -234,11 +240,43 @@ VALUE function_twoarg(void (*cwfunc_ptr)(basic_struct *, const basic_struct *,
sympify(operand2, cbasic_operand2);

cresult = basic_new_heap();
cwfunc_ptr(cresult, cbasic_operand1, cbasic_operand2);
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL, cbasic_free_heap,
cresult);
basic_free_stack(cbasic_operand1);
basic_free_stack(cbasic_operand2);
symengine_exceptions_t error_code
= cwfunc_ptr(cresult, cbasic_operand1, cbasic_operand2);

if (error_code == SYMENGINE_NO_EXCEPTION) {
result = Data_Wrap_Struct(Klass_of_Basic(cresult), NULL,
cbasic_free_heap, cresult);
basic_free_stack(cbasic_operand1);
basic_free_stack(cbasic_operand2);
} else {
basic_free_stack(cbasic_operand1);
basic_free_stack(cbasic_operand2);
raise_exception(error_code);
}
return result;
}

void raise_exception(symengine_exceptions_t error_code)
{
char *str = "";
switch (error_code) {
case SYMENGINE_NO_EXCEPTION:
return;
case SYMENGINE_RUNTIME_ERROR:
str = "Runtime Error";
break;
case SYMENGINE_DIV_BY_ZERO:
str = "Division by Zero";
break;
case SYMENGINE_NOT_IMPLEMENTED:
str = "Not Implemented";
break;
case SYMENGINE_UNDEFINED:
str = "Undefined";
break;
case SYMENGINE_PARSE_ERROR:
str = "Parse Error";
break;
}
rb_raise(rb_eRuntimeError, "%s", str);
}
11 changes: 7 additions & 4 deletions ext/symengine/symengine_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ void get_symintfromval(VALUE operand2, basic_struct *cbasic_operand2);
VALUE Klass_of_Basic(const basic_struct *basic_ptr);
// Returns the result from the function pointed by cwfunc_ptr: for one argument
// functions
VALUE function_onearg(void (*cwfunc_ptr)(basic_struct *, const basic_struct *),
VALUE operand1);
VALUE function_onearg(
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *),
VALUE operand1);
// Returns the result from the function pointed by cwfunc_ptr: for two argument
// functions
VALUE function_twoarg(void (*cwfunc_ptr)(basic_struct *, const basic_struct *,
VALUE function_twoarg(
symengine_exceptions_t (*cwfunc_ptr)(basic_struct *, const basic_struct *,
const basic_struct *),
VALUE operand1, VALUE operand2);
VALUE operand1, VALUE operand2);
void raise_exception(symengine_exceptions_t error_code);

#endif // SYMENGINE_UTILS_H_
3 changes: 3 additions & 0 deletions spec/functions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@
expect(SymEngine::cos(pi)).to eq(-1)
expect(SymEngine::tan(pi)).to eq(0)
expect(SymEngine::csc(pi/2)).to eq(1)
expect { SymEngine::csc(pi) }.to raise_error(RuntimeError)
expect(SymEngine::sec(pi)).to eq(-1)
expect { SymEngine::sec(pi/2) }.to raise_error(RuntimeError)
expect(SymEngine::cot(pi/4)).to eq(1)
expect { SymEngine::cot(pi) }.to raise_error(RuntimeError)

expect(SymEngine::asin(1)).to eq(pi/2)
expect(SymEngine::acos(1)).to eq(0)
Expand Down
6 changes: 6 additions & 0 deletions spec/integer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,10 @@
end
end
end

describe 'errors' do
it 'raises an exception on division by zero' do
expect { SymEngine(1)/SymEngine(0) }.to raise_error(RuntimeError)
end
end
end
2 changes: 1 addition & 1 deletion symengine_version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ab5f5da3a9aa501a7a5bf7889a68f67c21a3b9c8
d674459efdfb2871643a2ae4616715ba98323ada