From aa1d245d9c71799bbcf3dbf46741d69fec58f708 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Mon, 29 Jun 2009 18:37:44 +0000 Subject: [PATCH] Add floating point parsing --- chaioop/CMakeLists.txt | 2 +- chaioop/main.cpp | 811 +---------------------------------------- 2 files changed, 5 insertions(+), 808 deletions(-) diff --git a/chaioop/CMakeLists.txt b/chaioop/CMakeLists.txt index 1dc9c0a..72a9f92 100644 --- a/chaioop/CMakeLists.txt +++ b/chaioop/CMakeLists.txt @@ -6,6 +6,6 @@ SET (CMAKE_BUILD_TYPE gdb) SET (CMAKE_C_FLAGS_GDB " -Wall -ggdb") SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb") -include_directories(../langkit ../dispatchkit) +include_directories(../chaioop ../dispatchkit) add_executable(chaioop_test main.cpp) diff --git a/chaioop/main.cpp b/chaioop/main.cpp index 4bfdcb4..3df29bf 100644 --- a/chaioop/main.cpp +++ b/chaioop/main.cpp @@ -7,810 +7,7 @@ #include #include -namespace langkit { - struct File_Position { - int line; - int column; - // std::string::iterator text_pos; - - File_Position(int file_line, int file_column) - : line(file_line), column(file_column) { } - - File_Position() : line(0), column(0) { } - }; - - struct Parse_Error { - std::string reason; - File_Position position; - - Parse_Error(const std::string &why, const File_Position &where) : - reason(why), position(where) { } - - virtual ~Parse_Error() throw() {} - }; - - typedef std::tr1::shared_ptr TokenPtr; - - class Token_Type { public: enum Type { Internal_Match_Begin, Int, Id, Char, Str, Eol, Fun_Call, Arg_List, Variable, Equation, Var_Decl, - Expression, Comparison, Additive, Multiplicative, Negate, Not, Array_Call, Dot_Access, Quoted_String, Single_Quoted_String }; }; - - const char *token_type_to_string(int tokentype) { - const char *token_types[] = { "Internal: match begin", "Int", "Id", "Char", "Str", "Eol", "Fun_Call", "Arg_List", "Variable", "Equation", "Var_Decl", - "Expression", "Comparison", "Additive", "Multiplicative", "Negate", "Not", "Array_Call", "Dot_Access", "Quoted_String", "Single_Quoted_String" }; - - return token_types[tokentype]; - } - - struct Token { - std::string text; - int identifier; - const char *filename; - File_Position start, end; - - std::vector children; - - Token(const std::string &token_text, int id, const char *fname) : text(token_text), identifier(id), filename(fname) { } - Token(const std::string &token_text, int id, const char *fname, int start_line, int start_col, int end_line, int end_col) : - text(token_text), identifier(id), filename(fname) { - - start.line = start_line; - start.column = start_col; - end.line = end_line; - end.column = end_col; - } - }; - - void debug_print(TokenPtr t, std::string prepend = "") { - std::cout << prepend << "text: " << t->text << " id: " << token_type_to_string(t->identifier) << " pos: " << t->start.line << ", " << t->start.column << std::endl; - for (unsigned int j = 0; j < t->children.size(); ++j) { - debug_print(t->children[j], prepend + " "); - } - } - - class Parser { - std::string::iterator input_pos, input_end; - int line, col; - std::string multiline_comment_begin, multiline_comment_end; - std::string singleline_comment; - char *filename; - std::vector match_stack; - - public: - void show_match_stack() { - for (unsigned int i = 0; i < match_stack.size(); ++i) { - debug_print(match_stack[i]); - } - } - - void clear_match_stack() { - match_stack.clear(); - } - - void build_match(Token_Type::Type match_type, int match_start) { - //so we want to take everything to the right of this and make them children - TokenPtr t(new Token("", match_type, filename, match_stack[match_start]->start.line, match_stack[match_start]->start.column, line, col)); - t->children.assign(match_stack.begin() + (match_start), match_stack.end()); - match_stack.erase(match_stack.begin() + (match_start), match_stack.end()); - match_stack.push_back(t); - } - - bool SkipComment() { - bool retval = false; - - if (Str_(multiline_comment_begin.c_str())) { - while (input_pos != input_end) { - if (Str_(multiline_comment_end.c_str())) { - break; - } - else if (!Eol_()) { - ++col; - ++input_pos; - } - } - retval = true; - } - else if (Str_(singleline_comment.c_str())) { - while (input_pos != input_end) { - if (Eol_()) { - break; - } - else { - ++col; - ++input_pos; - } - } - retval = true; - } - return retval; - } - - bool SkipWS() { - bool retval = false; - while (input_pos != input_end) { - if ((*input_pos == ' ') || (*input_pos == '\t')) { - ++input_pos; - ++col; - retval = true; - } - else if (SkipComment()) { - retval = true; - } - else { - break; - } - } - return retval; - } - - bool Int_() { - bool retval = false; - if ((input_pos != input_end) && (*input_pos >= '0') && (*input_pos <= '9')) { - retval = true; - while ((input_pos != input_end) && (*input_pos >= '0') && (*input_pos <= '9')) { - ++input_pos; - ++col; - } - } - - return retval; - } - - bool Int(bool capture = false) { - SkipWS(); - - if (!capture) { - return Int_(); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Int_()) { - std::string match(start, input_pos); - TokenPtr t(new Token(match, Token_Type::Int, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Id_() { - bool retval = false; - if ((input_pos != input_end) && (((*input_pos >= 'A') && (*input_pos <= 'Z')) || (*input_pos == '_') || ((*input_pos >= 'a') && (*input_pos <= 'z')))) { - retval = true; - while ((input_pos != input_end) && (((*input_pos >= 'A') && (*input_pos <= 'Z')) || (*input_pos == '_') || ((*input_pos >= 'a') && (*input_pos <= 'z')) - || ((*input_pos >= '0') && (*input_pos <= '9')))) { - ++input_pos; - ++col; - } - } - - return retval; - } - - bool Id(bool capture = false) { - SkipWS(); - - if (!capture) { - return Id_(); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Id_()) { - std::string match(start, input_pos); - TokenPtr t(new Token(match, Token_Type::Id, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Quoted_String_() { - bool retval = false; - char prev_char = 0; - if ((input_pos != input_end) && (*input_pos == '\"')) { - retval = true; - prev_char = *input_pos; - ++input_pos; - ++col; - - while ((input_pos != input_end) && ((*input_pos != '\"') || ((*input_pos == '\"') && (prev_char == '\\')))) { - if (!Eol_()) { - if (prev_char == '\\') { - prev_char = 0; - } - else { - prev_char = *input_pos; - } - ++input_pos; - ++col; - } - } - - if (input_pos != input_end) { - ++input_pos; - ++col; - } - else { - throw Parse_Error("Unclosed quoted string", File_Position(line, col)); - } - } - return retval; - } - - bool Quoted_String(bool capture = false) { - SkipWS(); - - if (!capture) { - return Quoted_String_(); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Quoted_String_()) { - std::string match; - bool is_escaped = false; - for (std::string::iterator s = start + 1, end = input_pos - 1; s != end; ++s) { - if (*s == '\\') { - if (is_escaped) { - match.push_back('\\'); - is_escaped = false; - } - else { - is_escaped = true; - } - } - else { - if (is_escaped) { - switch (*s) { - case ('b') : match.push_back('\b'); break; - case ('f') : match.push_back('\f'); break; - case ('n') : match.push_back('\n'); break; - case ('r') : match.push_back('\r'); break; - case ('t') : match.push_back('\t'); break; - case ('\'') : match.push_back('\''); break; - case ('\"') : match.push_back('\"'); break; - default: throw Parse_Error("Unknown escaped sequence in string", File_Position(prev_line, prev_col)); - } - } - else { - match.push_back(*s); - } - is_escaped = false; - } - } - TokenPtr t(new Token(match, Token_Type::Quoted_String, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Single_Quoted_String_() { - bool retval = false; - char prev_char = 0; - if ((input_pos != input_end) && (*input_pos == '\'')) { - retval = true; - prev_char = *input_pos; - ++input_pos; - ++col; - - while ((input_pos != input_end) && ((*input_pos != '\'') || ((*input_pos == '\'') && (prev_char == '\\')))) { - if (!Eol_()) { - if (prev_char == '\\') { - prev_char = 0; - } - else { - prev_char = *input_pos; - } - ++input_pos; - ++col; - } - } - - if (input_pos != input_end) { - ++input_pos; - ++col; - } - else { - throw Parse_Error("Unclosed single-quoted string", File_Position(line, col)); - } - } - return retval; - } - - bool Single_Quoted_String(bool capture = false) { - SkipWS(); - - if (!capture) { - return Single_Quoted_String_(); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Single_Quoted_String_()) { - std::string match; - bool is_escaped = false; - for (std::string::iterator s = start + 1, end = input_pos - 1; s != end; ++s) { - if (*s == '\\') { - if (is_escaped) { - match.push_back('\\'); - is_escaped = false; - } - else { - is_escaped = true; - } - } - else { - if (is_escaped) { - switch (*s) { - case ('b') : match.push_back('\b'); break; - case ('f') : match.push_back('\f'); break; - case ('n') : match.push_back('\n'); break; - case ('r') : match.push_back('\r'); break; - case ('t') : match.push_back('\t'); break; - case ('\'') : match.push_back('\''); break; - case ('\"') : match.push_back('\"'); break; - default: throw Parse_Error("Unknown escaped sequence in string", File_Position(prev_line, prev_col)); - } - } - else { - match.push_back(*s); - } - is_escaped = false; - } - } - TokenPtr t(new Token(match, Token_Type::Single_Quoted_String, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - - bool Char_(char c) { - bool retval = false; - if ((input_pos != input_end) && (*input_pos == c)) { - ++input_pos; - ++col; - retval = true; - } - - return retval; - } - - bool Char(char c, bool capture = false) { - SkipWS(); - - if (!capture) { - return Char_(c); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Char_(c)) { - std::string match(start, input_pos); - TokenPtr t(new Token(match, Token_Type::Char, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Str_(const char *s) { - bool retval = false; - int len = strlen(s); - - if ((input_end - input_pos) >= len) { - std::string::iterator tmp = input_pos; - for (int i = 0; i < len; ++i) { - if (*tmp != s[i]) { - return false; - } - ++tmp; - } - retval = true; - input_pos = tmp; - col += len; - } - - return retval; - } - - bool Str(const char *s, bool capture = false) { - SkipWS(); - - if (!capture) { - return Str_(s); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Str_(s)) { - std::string match(start, input_pos); - TokenPtr t(new Token(match, Token_Type::Str, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Eol_() { - bool retval = false; - - if ((input_pos != input_end) && (Str_("\r\n") || Char_('\n'))) { - retval = true; - ++line; - col = 1; - } - else if ((input_pos != input_end) && Char_(';')) { - retval = true; - } - - return retval; - } - - bool Eol(bool capture = false) { - SkipWS(); - - if (!capture) { - return Eol_(); - } - else { - std::string::iterator start = input_pos; - int prev_col = col; - int prev_line = line; - if (Eol_()) { - std::string match(start, input_pos); - TokenPtr t(new Token(match, Token_Type::Eol, filename, prev_line, prev_col, line, col)); - match_stack.push_back(t); - return true; - } - else { - return false; - } - } - } - - bool Arg_List() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Expression()) { - retval = true; - if (Char(',')) { - do { - if (!Expression()) { - throw Parse_Error("Unexpected value in parameter list", File_Position(line, col)); - } - } while (retval && Char(',')); - } - build_match(Token_Type::Arg_List, prev_stack_top); - } - - return retval; - - } - - bool Id_Fun_Array() { - bool retval = false; - std::string::iterator prev_pos = input_pos; - - unsigned int prev_stack_top = match_stack.size(); - if (Id(true)) { - retval = true; - bool has_more = true; - - while (has_more) { - has_more = false; - - if (Char('(')) { - has_more = true; - - Arg_List(); - if (!Char(')')) { - throw Parse_Error("Incomplete function call", File_Position(line, col)); - } - - build_match(Token_Type::Fun_Call, prev_stack_top); - } - else if (Char('[')) { - has_more = true; - - if (!(Expression() && Char(']'))) { - throw Parse_Error("Incomplete array access", File_Position(line, col)); - } - - build_match(Token_Type::Array_Call, prev_stack_top); - } - } - } - - return retval; - } - - /* - * TODO: Look into if we need an explicit LHS for equations - bool LHS() { - if (Var_Decl() || Id()) { - return true; - } - else { - return false; - } - } - */ - - bool Var_Decl() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Str("var")) { - retval = true; - - if (!Id(true)) { - throw Parse_Error("Incomplete variable declaration", File_Position(line, col)); - } - - build_match(Token_Type::Var_Decl, prev_stack_top); - } - - return retval; - - } - - bool Paren_Expression() { - bool retval = false; - - if (Char('(')) { - retval = true; - if (!Expression()) { - throw Parse_Error("Incomplete expression", File_Position(line, col)); - } - if (!Char(')')) { - throw Parse_Error("Missing closing parenthesis", File_Position(line, col)); - } - } - return retval; - } - - bool Value() { - if (Var_Decl() || Id_Fun_Array() || Int(true) || Negate() || Not() || Quoted_String(true) || Single_Quoted_String(true) || Paren_Expression()) { - return true; - } - else { - return false; - } - } - - bool Negate() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Char('-')) { - retval = true; - - if (!Additive()) { - throw Parse_Error("Incomplete negation expression", File_Position(line, col)); - } - - build_match(Token_Type::Negate, prev_stack_top); - } - - return retval; - - } - - bool Not() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Char('!')) { - retval = true; - - if (!Expression()) { - throw Parse_Error("Incomplete '!' expression", File_Position(line, col)); - } - - build_match(Token_Type::Not, prev_stack_top); - } - - return retval; - - } - - bool Comparison() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Additive()) { - retval = true; - if (Str(">=", true) || Char('>', true) || Str("<=", true) || Char('<', true) || Str("==", true) || Str("!=", true)) { - do { - if (!Additive()) { - throw Parse_Error("Incomplete comparison expression", File_Position(line, col)); - } - } while (retval && (Str(">=", true) || Char('>', true) || Str("<=", true) || Char('<', true) || Str("==", true) || Str("!=", true))); - - build_match(Token_Type::Comparison, prev_stack_top); - } - } - - return retval; - - } - - bool Additive() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Multiplicative()) { - retval = true; - if (Char('+', true) || Char('-', true)) { - do { - if (!Multiplicative()) { - throw Parse_Error("Incomplete math expression", File_Position(line, col)); - } - } while (retval && (Char('+', true) || Char('-', true))); - - build_match(Token_Type::Additive, prev_stack_top); - } - } - - return retval; - } - - bool Multiplicative() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Dot_Access()) { - retval = true; - if (Char('*', true) || Char('/', true)) { - do { - if (!Dot_Access()) { - throw Parse_Error("Incomplete math expression", File_Position(line, col)); - } - } while (retval && (Char('*', true) || Char('/', true))); - - build_match(Token_Type::Multiplicative, prev_stack_top); - } - } - - return retval; - - } - - bool Dot_Access() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Value()) { - retval = true; - if (Char('.')) { - do { - if (!Value()) { - throw Parse_Error("Incomplete dot notation", File_Position(line, col)); - } - } while (retval && Char('.')); - - build_match(Token_Type::Dot_Access, prev_stack_top); - } - } - - return retval; - } - - bool Expression() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Comparison()) { - retval = true; - if (Str("&&", true) || Str("||", true)) { - do { - if (!Comparison()) { - throw Parse_Error("Incomplete expression", File_Position(line, col)); - } - } while (retval && (Str("&&", true) || Str("||", true))); - - build_match(Token_Type::Expression, prev_stack_top); - } - } - - return retval; - } - - bool Equation() { - bool retval = false; - - int prev_stack_top = match_stack.size(); - - if (Expression()) { - retval = true; - if (Char('=', true)) { - do { - if (!Expression()) { - throw Parse_Error("Incomplete math expression", File_Position(line, col)); - } - } while (retval && (Char('=', true))); - - build_match(Token_Type::Equation, prev_stack_top); - } - } - - return retval; - - } - - bool Statement() { - if (Equation()) { - if (Eol()) { - return true; - } - else { - return false; - } - } - return false; - } - - bool Statements() { - bool retval = false; - while (Statement() || Eol()) { } - - if (input_pos == input_end) { - retval = true; - } - - return retval; - } - - bool parse(std::string input) { - input_pos = input.begin(); - input_end = input.end(); - line = 1; col = 1; - multiline_comment_begin = "/*"; - multiline_comment_end = "*/"; - singleline_comment = "//"; - - return Statements(); - } - }; -}; +#include "chaiscript.hpp" std::string load_file(const char *filename) { std::ifstream infile (filename, std::ios::in | std::ios::ate); @@ -832,7 +29,7 @@ std::string load_file(const char *filename) { } int main(int argc, char *argv[]) { - langkit::Parser parser; + chaiscript::Parser parser; std::string input; if (argc > 1) { @@ -840,7 +37,7 @@ int main(int argc, char *argv[]) { std::cout << parser.parse(load_file(argv[1])) << std::endl; parser.show_match_stack(); } - catch (langkit::Parse_Error &pe) { + catch (chaiscript::Parse_Error &pe) { std::cout << pe.reason << " at " << pe.position.line << ", " << pe.position.column << std::endl; parser.clear_match_stack(); } @@ -854,7 +51,7 @@ int main(int argc, char *argv[]) { parser.show_match_stack(); parser.clear_match_stack(); } - catch (langkit::Parse_Error &pe) { + catch (chaiscript::Parse_Error &pe) { std::cout << pe.reason << " at " << pe.position.line << ", " << pe.position.column << std::endl; parser.clear_match_stack(); }