coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-07 02:09:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added deep function and array access

Browse Source
This commit is contained in:
Jonathan Turner 2009-06-29 15:28:45 +00:00
parent 85f9d049eb
commit 519eab12c3
1 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
chaioop/main.cpp
View File

@ -32,11 +32,11 @@ namespace langkit {
typedef std::tr1::shared_ptr<struct Token> TokenPtr; typedef std::tr1::shared_ptr<struct Token> TokenPtr;
class Token_Type { public: enum Type { Internal_Match_Begin, Int, Id, Char, Str, Eol, Fun_Call, Arg_List, Variable, Equation, Var_Decl, 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 }; }; Expression, Comparison, Additive, Multiplicative, Negate, Not, Array_Call }; };
const char *token_type_to_string(int tokentype) { 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", 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" }; "Expression", "Comparison", "Additive", "Multiplicative", "Negate", "Not", "Array_Call" };
return token_types[tokentype]; return token_types[tokentype];
} }
@ -345,21 +345,37 @@ namespace langkit {
} }
bool Fun_Or_Id() { bool Id_Fun_Array() {
bool retval = false; bool retval = false;
std::string::iterator prev_pos = input_pos; std::string::iterator prev_pos = input_pos;
unsigned int prev_stack_top = match_stack.size(); unsigned int prev_stack_top = match_stack.size();
if (Id(true)) { if (Id(true)) {
retval = true; retval = true;
bool has_more = true;
if (Char('(')) { while (has_more) {
Arg_List(); has_more = false;
if (!Char(')')) {
throw Parse_Error("Incomplete function call", File_Position(line, col)); 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;
build_match(Token_Type::Fun_Call, prev_stack_top); if (!(Expression() && Char(']'))) {
throw Parse_Error("Incomplete array access", File_Position(line, col));
}
build_match(Token_Type::Array_Call, prev_stack_top);
}
} }
} }
@ -394,8 +410,23 @@ namespace langkit {
} }
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() { bool Value() {
if (Fun_Or_Id() || Int(true) || Negate() || Not()) { if (Id_Fun_Array() || Int(true) || Negate() || Not() || Paren_Expression()) {
return true; return true;
} }
else { else {
@ -550,7 +581,7 @@ namespace langkit {
} }
bool Statement() { bool Statement() {
if (Equation() || Expression()) { if (Equation()) {
if (Eol()) { if (Eol()) {
return true; return true;
} }