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

Clean up warnings. Add simple blocks.

Browse Source
This commit is contained in:
Jonathan Turner
2009-10-08 03:01:19 +00:00
parent ff177b5eaf
commit 315d7521a7
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/chaiscript/language/chaiscript_parser.hpp
View File

@@ -145,8 +145,6 @@ namespace chaiscript
bool Float_() { bool Float_() {
bool retval = false; bool retval = false;
std::string::iterator start = input_pos; std::string::iterator start = input_pos;
int prev_col = col;
int prev_line = line;
if ((input_pos != input_end) && (((*input_pos >= '0') && (*input_pos <= '9')) || (*input_pos == '.'))) { if ((input_pos != input_end) && (((*input_pos >= '0') && (*input_pos <= '9')) || (*input_pos == '.'))) {
while ((input_pos != input_end) && (*input_pos >= '0') && (*input_pos <= '9')) { while ((input_pos != input_end) && (*input_pos >= '0') && (*input_pos <= '9')) {
@@ -257,8 +255,8 @@ namespace chaiscript
else { else {
TokenPtr t(new Token(match, Token_Type::Int, filename, prev_line, prev_col, line, col)); TokenPtr t(new Token(match, Token_Type::Int, filename, prev_line, prev_col, line, col));
match_stack.push_back(t); match_stack.push_back(t);
return true;
} }
return true;
} }
} }
else { else {
@@ -1004,16 +1002,6 @@ namespace chaiscript
*/ */
bool Try() { bool Try() {
bool retval = false; bool retval = false;
bool is_annotated = false;
TokenPtr annotation;
if (Annotation()) {
while (Eol_());
annotation = match_stack.back();
match_stack.pop_back();
is_annotated = true;
}
int prev_stack_top = match_stack.size(); int prev_stack_top = match_stack.size();
@@ -1781,6 +1769,11 @@ namespace chaiscript
retval = true; retval = true;
saw_eol = true; saw_eol = true;
} }
else if (Block()) {
has_more = true;
retval = true;
saw_eol = true;
}
else { else {
has_more = false; has_more = false;
} }