generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing the last of the const change issues

Browse Source
This commit is contained in:
Jonathan Turner 2009-09-06 02:55:39 +00:00
parent b3656c95f5
commit cba5731576
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/chaiscript/language/chaiscript_eval.hpp
View File

@ -87,7 +87,7 @@ namespace chaiscript
template <typename Eval_System> template <typename Eval_System>
Boxed_Value eval_int(Eval_System &, const TokenPtr &node) { Boxed_Value eval_int(Eval_System &, const TokenPtr &node) {
//return Boxed_Value(atoi(node->text.c_str())); //return Boxed_Value(atoi(node->text.c_str()));
return const_var(double(atoi(node->text.c_str()))); return const_var(int(atoi(node->text.c_str())));
} }
/** /**
@ -510,7 +510,7 @@ namespace chaiscript
Boxed_Value retval = eval_token(ss, node->children[0]); Boxed_Value retval = eval_token(ss, node->children[0]);
bool cond; bool cond;
try { try {
cond = boxed_cast<bool &>(retval); cond = boxed_cast<bool>(retval);
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {
throw Eval_Error("If condition not boolean", node->children[0]); throw Eval_Error("If condition not boolean", node->children[0]);
@ -529,7 +529,7 @@ namespace chaiscript
else if (node->children[i]->text == "else if") { else if (node->children[i]->text == "else if") {
retval = eval_token(ss, node->children[i+1]); retval = eval_token(ss, node->children[i+1]);
try { try {
cond = boxed_cast<bool &>(retval); cond = boxed_cast<bool>(retval);
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {
throw Eval_Error("'else if' condition not boolean", node->children[i+1]); throw Eval_Error("'else if' condition not boolean", node->children[i+1]);
@ -556,7 +556,7 @@ namespace chaiscript
ss.new_scope(); ss.new_scope();
try { try {
cond = boxed_cast<bool &>(eval_token(ss, node->children[0])); cond = boxed_cast<bool>(eval_token(ss, node->children[0]));
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {
ss.pop_scope(); ss.pop_scope();
@ -566,7 +566,7 @@ namespace chaiscript
try { try {
eval_token(ss, node->children[1]); eval_token(ss, node->children[1]);
try { try {
cond = boxed_cast<bool &>(eval_token(ss, node->children[0])); cond = boxed_cast<bool>(eval_token(ss, node->children[0]));
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {
ss.pop_scope(); ss.pop_scope();
@ -593,10 +593,10 @@ namespace chaiscript
try { try {
if (node->children.size() == 4) { if (node->children.size() == 4) {
eval_token(ss, node->children[0]); eval_token(ss, node->children[0]);
cond = boxed_cast<bool &>(eval_token(ss, node->children[1])); cond = boxed_cast<bool>(eval_token(ss, node->children[1]));
} }
else { else {
cond = boxed_cast<bool &>(eval_token(ss, node->children[0])); cond = boxed_cast<bool>(eval_token(ss, node->children[0]));
} }
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {
@ -608,12 +608,12 @@ namespace chaiscript
if (node->children.size() == 4) { if (node->children.size() == 4) {
eval_token(ss, node->children[3]); eval_token(ss, node->children[3]);
eval_token(ss, node->children[2]); eval_token(ss, node->children[2]);
cond = boxed_cast<bool &>(eval_token(ss, node->children[1])); cond = boxed_cast<bool>(eval_token(ss, node->children[1]));
} }
else { else {
eval_token(ss, node->children[2]); eval_token(ss, node->children[2]);
eval_token(ss, node->children[1]); eval_token(ss, node->children[1]);
cond = boxed_cast<bool &>(eval_token(ss, node->children[0])); cond = boxed_cast<bool>(eval_token(ss, node->children[0]));
} }
} }
catch (const bad_boxed_cast &) { catch (const bad_boxed_cast &) {