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

Inch by inch, getting closer to working out what the parser needs

Browse Source
This commit is contained in:
Jonathan Turner 2009-05-27 17:42:54 +00:00
parent 3dfe1fb8bd
commit 421a616924
5 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boxedcpp/proxy_constructors.hpp
View File

@ -27,14 +27,14 @@ boost::function<boost::shared_ptr<Class> ()> build_constructor()
# endif # endif
#else #else
# define n BOOST_PP_ITERATION() # define n BOOST_PP_ITERATION()
template<typename Class, BOOST_PP_ENUM_PARAMS(n, typename Param) > template<typename Class, BOOST_PP_ENUM_PARAMS(n, typename Param) >
boost::shared_ptr<Class> constructor( BOOST_PP_ENUM_BINARY_PARAMS(n, Param, p) ) boost::shared_ptr<Class> constructor( BOOST_PP_ENUM_BINARY_PARAMS(n, Param, p) )
{ {
return boost::shared_ptr<Class>(new Class( BOOST_PP_ENUM_PARAMS(n, p) )); return boost::shared_ptr<Class>(new Class( BOOST_PP_ENUM_PARAMS(n, p) ));
} }
template<typename Class, BOOST_PP_ENUM_PARAMS(n, typename Param) > template<typename Class, BOOST_PP_ENUM_PARAMS(n, typename Param) >
boost::function<boost::shared_ptr<Class> (BOOST_PP_ENUM_PARAMS(n, Param))> build_constructor() boost::function<boost::shared_ptr<Class> (BOOST_PP_ENUM_PARAMS(n, Param))> build_constructor()
{ {

5
boxedcpp/test.cpp
View File

@ -40,7 +40,7 @@ struct Test
double md; double md;
}; };
void print_out(const std::string &s) void print(const std::string &s)
{ {
std::cout << "Printed: " << s << std::endl; std::cout << "Printed: " << s << std::endl;
} }
@ -68,8 +68,7 @@ int main()
//Register a new function, this one with typing for us, so we don't have to ubox anything //Register a new function, this one with typing for us, so we don't have to ubox anything
//right here //right here
//JDT: Was giving me compiler errors (not sure why) ss.register_function(boost::function<void (const std::string &)>(&print), "print");
ss.register_function(boost::function<void (const std::string &)>(&print_out), "print");
//Now we have a print method, let's try to print out the earlier example: //Now we have a print method, let's try to print out the earlier example:
//so, we dispatch the to_string and pass its result as a param to "print" //so, we dispatch the to_string and pass its result as a param to "print"

52
langkit/langkit_parser.cpp
View File

@ -6,62 +6,68 @@
#include "langkit_lexer.hpp" #include "langkit_lexer.hpp"
#include "langkit_parser.hpp" #include "langkit_parser.hpp"
std::pair<Token_Iterator, TokenPtr> String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val) { std::pair<Token_Iterator, bool> String_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const std::string &val, bool keep) {
if (iter != end) { if (*iter != *end) {
if ((*iter)->text == val) { if ((*iter)->text == val) {
return std::pair<Token_Iterator, TokenPtr>(++iter, *iter); if (keep) {
parent->children.push_back(*iter);
}
return std::pair<Token_Iterator, bool>(++iter, true);
} }
} }
return std::pair<Token_Iterator, TokenPtr>(iter, *iter); return std::pair<Token_Iterator, bool>(iter, false);
} }
std::pair<Token_Iterator, TokenPtr> Type_Rule(Token_Iterator iter, Token_Iterator end, const int val) { std::pair<Token_Iterator, bool> Type_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const int val, bool keep) {
if (iter != end) { if (*iter != *end) {
if ((*iter)->identifier == val) { if ((*iter)->identifier == val) {
return std::pair<Token_Iterator, TokenPtr>(++iter, *iter); if (keep) {
parent->children.push_back(*iter);
}
return std::pair<Token_Iterator, bool>(++iter, true);
} }
} }
return std::pair<Token_Iterator, TokenPtr>(iter, *iter); return std::pair<Token_Iterator, bool>(iter, false);
} }
std::pair<Token_Iterator, TokenPtr> Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) { std::pair<Token_Iterator, bool> Or_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const Rule &lhs, const Rule &rhs, bool keep, int new_id) {
Token_Iterator new_iter; Token_Iterator new_iter;
if (iter != end) { if (*iter != *end) {
new_iter = lhs.rule(iter, end).first; new_iter = lhs.rule(iter, end, parent).first;
if (new_iter != iter) { if (new_iter != iter) {
return std::pair<Token_Iterator, TokenPtr>(new_iter, *iter); return std::pair<Token_Iterator, bool>(new_iter, true);
} }
else { else {
new_iter = rhs.rule(iter, end).first; new_iter = rhs.rule(iter, end, parent).first;
if (new_iter != iter) { if (new_iter != iter) {
return std::pair<Token_Iterator, TokenPtr>(new_iter, *iter); return std::pair<Token_Iterator, bool>(new_iter, true);
} }
} }
} }
return std::pair<Token_Iterator, TokenPtr>(iter, *iter); return std::pair<Token_Iterator, bool>(iter, false);
} }
std::pair<Token_Iterator, TokenPtr> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs) { std::pair<Token_Iterator, bool> And_Rule(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const Rule &lhs, const Rule &rhs, bool keep, int new_id) {
Token_Iterator lhs_iter, rhs_iter; Token_Iterator lhs_iter, rhs_iter;
if (iter != end) { if (*iter != *end) {
lhs_iter = lhs.rule(iter, end).first; lhs_iter = lhs.rule(iter, end, parent).first;
if (lhs_iter != iter) { if (lhs_iter != iter) {
rhs_iter = rhs.rule(iter, end).first; rhs_iter = rhs.rule(iter, end, parent).first;
if (rhs_iter != iter) { if (rhs_iter != iter) {
return std::pair<Token_Iterator, TokenPtr>(rhs_iter, *iter); return std::pair<Token_Iterator, bool>(rhs_iter, true);
} }
} }
} }
return std::pair<Token_Iterator, TokenPtr>(iter, *iter); return std::pair<Token_Iterator, bool>(iter, false);
} }
std::pair<Token_Iterator, TokenPtr> Rule::operator()(Token_Iterator iter, Token_Iterator end) { std::pair<Token_Iterator, bool> Rule::operator()(Token_Iterator iter, Token_Iterator end, TokenPtr parent) {
return this->rule(iter, end); return this->rule(iter, end, parent);
} }

19
langkit/langkit_parser.hpp
View File

@ -12,17 +12,24 @@ typedef std::vector<TokenPtr>::iterator Token_Iterator;
struct Rule { struct Rule {
int identifier; int identifier;
boost::function<std::pair<Token_Iterator, TokenPtr>(Token_Iterator iter, Token_Iterator end)> rule; boost::function<std::pair<Token_Iterator, bool>(Token_Iterator iter, Token_Iterator end, TokenPtr parent)> rule;
std::pair<Token_Iterator, TokenPtr> operator()(Token_Iterator iter, Token_Iterator end); std::pair<Token_Iterator, bool> operator()(Token_Iterator iter, Token_Iterator end, TokenPtr parent);
Rule() : identifier(-1) {} Rule() : identifier(-1) {}
Rule(int id) : identifier(id) {} Rule(int id) : identifier(id) {}
}; };
std::pair<Token_Iterator, TokenPtr> String_Rule(Token_Iterator iter, Token_Iterator end, const std::string &val); std::pair<Token_Iterator, bool> String_Rule
std::pair<Token_Iterator, TokenPtr> Type_Rule(Token_Iterator iter, Token_Iterator end, const int val); (Token_Iterator iter, Token_Iterator end, TokenPtr parent, const std::string &val, bool keep);
std::pair<Token_Iterator, TokenPtr> Or_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs);
std::pair<Token_Iterator, TokenPtr> And_Rule(Token_Iterator iter, Token_Iterator end, const Rule &lhs, const Rule &rhs); std::pair<Token_Iterator, bool> Type_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const int val, bool keep);
std::pair<Token_Iterator, bool> Or_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const Rule &lhs, const Rule &rhs, bool keep, int new_id);
std::pair<Token_Iterator, bool> And_Rule
(Token_Iterator iter, Token_Iterator end, TokenPtr parent, const Rule &lhs, const Rule &rhs, bool keep, int new_id);
#endif /* LANGKIT_PARSER_HPP_ */ #endif /* LANGKIT_PARSER_HPP_ */

20
langkit/main.cpp
View File

@ -13,13 +13,18 @@
class TokenType { public: enum Type { Whitespace, Identifier, Number, Operator, Parens_Open, Parens_Close, class TokenType { public: enum Type { Whitespace, Identifier, Number, Operator, Parens_Open, Parens_Close,
Square_Open, Square_Close, Curly_Open, Curly_Close, Comma, Quoted_String, Single_Quoted_String, Carriage_Return, Semicolon }; }; Square_Open, Square_Close, Curly_Open, Curly_Close, Comma, Quoted_String, Single_Quoted_String, Carriage_Return, Semicolon }; };
void debug_print(TokenPtr token) { void debug_print(TokenPtr token, std::string prepend) {
std::cout << "Token: " << token->text << "(" << token->identifier << ") @ " << token->filename << ": (" << token->start.column std::cout << prepend << "Token: " << token->text << "(" << token->identifier << ") @ " << token->filename << ": (" << token->start.column
<< ", " << token->start.line << ") to (" << token->end.column << ", " << token->end.line << ") " << std::endl; << ", " << token->start.line << ") to (" << token->end.column << ", " << token->end.line << ") " << std::endl;
for (unsigned int i = 0; i < token->children.size(); ++i) {
debug_print(token->children[i], prepend + " ");
}
} }
void debug_print(std::vector<TokenPtr> &tokens) { void debug_print(std::vector<TokenPtr> &tokens) {
for (unsigned int i = 0; i < tokens.size(); ++i) { for (unsigned int i = 0; i < tokens.size(); ++i) {
debug_print(tokens[i]); debug_print(tokens[i], "");
} }
} }
@ -44,15 +49,16 @@ std::string load_file(const char *filename) {
void parse(std::vector<TokenPtr> &tokens) { void parse(std::vector<TokenPtr> &tokens) {
Rule rule; Rule rule;
rule.rule = boost::bind(String_Rule, _1, _2, "def"); rule.rule = boost::bind(String_Rule, _1, _2, _3, "def", true);
Token_Iterator iter = tokens.begin(), end = tokens.end(); Token_Iterator iter = tokens.begin(), end = tokens.end();
TokenPtr parent(new Token("Root", 0, "test"));
std::pair<Token_Iterator, TokenPtr> results = rule(iter, end); std::pair<Token_Iterator, bool> results = rule(iter, end, parent);
if (results.first != iter) { if (results.second) {
std::cout << "Parse successful: " << std::endl; std::cout << "Parse successful: " << std::endl;
debug_print(results.second); debug_print(parent, "");
} }
} }