Changeset 640

Timestamp:

08/26/08 15:13:49 (3 months ago)

Author:

weyrick

Message:

get the lexer spitting out tokens like zend (enough for a hello world), and sketch out some ast stuff

Files:

• trunk/rphp/compiler/CMakeLists.txt (modified) (1 diff)
• trunk/rphp/compiler/pAST.h (added)
• trunk/rphp/compiler/pASTVisitors.cpp (added)
• trunk/rphp/compiler/pASTVisitors.h (added)
• trunk/rphp/compiler/pDriver.cpp (modified) (4 diffs)
• trunk/rphp/compiler/pLexers.h (modified) (4 diffs)
• trunk/rphp/compiler/pParser.h (modified) (7 diffs)
• trunk/rphp/compiler/pTokens.h (modified) (1 diff)

trunk/rphp/compiler/CMakeLists.txt

@@ -23 +23 @@
-
-set(EVAL_SRC_FILES
+  pASTVisitors.cpp
-  pDriver.cpp
-)

trunk/rphp/compiler/pDriver.cpp

@@ -22 +22 @@
-#include <fstream>
-#include <string>
+#include <sstream>
-#include <unicode/unistr.h>
-#include <unicode/ustream.h>
@@ -306 +307 @@
-    pLangLexer lexer(tokens);
-
+    string tokID;
+    stringstream val;
+    
-    std::string::iterator source_it = contents.begin();
-    for (tokIteratorType iter = lexer.begin(source_it, contents.end()); iter != lexer.end(); ++iter)
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -330 +357 @@
-
-void pDriver::dumpAST(string fileName) {
-
+
-    ifstream inFile;
-
@@ -347 +374 @@
-    bool r = phrase_parse(iter, end, parser, in_state(ws)[tokens.skip_toks]);
-
-
-
-
-
-
-
-
-
-
+
-        std::cout << "Parsing failed\n";
-        std::cout << "-------------------------\n";
-    }
-
-    /*
-    ifstream inFile;
-
-    inFile.open(fileName.c_str(), ifstream::in);
-    if (!inFile) {
-        cout << "Unable to open file: " << endl;
-        exit(1); // terminate with error
-    }
-
-    UnicodeString contents;
-    char buf[512];
-    while (inFile) {
-        inFile.getline(buf, 512);
-        //cout << "read: " << buf << endl;
-        contents += buf;
-    }
-
-    inFile.close();
-
-    parser p;
-    p.set_token_stream( new parser::token_stream_type() );
-    p.set_memory_pool( new parser::memory_pool_type() );
-    p.setDebug( true );
-
-    p.tokenize(contents);
-    start_ast* phpAst;
-    bool matched = p.parse_start(&phpAst);
-    if( matched )
-    {
-        std::cout << "Successfully parsed" << std::endl;
-        debug_visitor dv;
-        dv.visit_start(phpAst);
-    }else
-    {
-        //*ast = 0;
-        //std::cout << p.expected_symbol(ast_node::Kind_start, "start");
-        std::cout << "Couldn't parse content" << std::endl;
-    }
-*/

trunk/rphp/compiler/pLexers.h

@@ -44 +44 @@
-    {
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        skip_toks
-
-
-
+, T_WHITESPACE
+, T_ML_COMMENT
+, T_SL_COMMENT
-
-        // associate the tokens and the token set with the lexer
-
-
+
+
+
-
-        // whitespace tokens in WS lexer state
@@ -71 +79 @@
-
-    // these tokens have no value
-
+, echo, opentag, closetag, dqstring
-
-    // tokens with string value
@@ -77 +85 @@
-
-    // tokens with int value
-
+
+
-
-    // token set to be used as the skip parser (whitespace and comments)
@@ -105 +114 @@
-typedef lexer<pLangTokens>::iterator_type tokIteratorType;
-
+const char* getTokenDescription(const std::size_t t) {
+
+    switch (t) {
+        case T_VARIABLE:
+            return "T_VARIABLE";
+        case T_WHITESPACE:
+            return "T_WHITESPACE";
+        case T_ML_COMMENT:
+            return "T_ML_COMMENT";
+        case T_SL_COMMENT:
+            return "T_SL_COMMENT";
+        case T_ECHO:
+            return "T_ECHO";
+        case T_OPEN_TAG:
+            return "T_OPEN_TAG";
+        case T_CLOSE_TAG:
+            return "T_CLOSE_TAG";
+        case T_LNUMBER:
+            return "T_LNUMBER";
+        case T_INLINE_HTML:
+            return "T_INLINE_HTML";
+        case T_IF:
+            return "T_IF";
+        case T_ELSE:
+            return "T_ELSE";
+        case T_WHILE:
+            return "T_WHILE";
+        case T_IDENTIFIER:
+            return "T_IDENTIFIER";
+        case T_CONSTANT_ENCAPSED_STRING:
+            return "T_CONSTANT_ENCAPSED_STRING";
+    }
+    return "";
+
+}
-
-} // namespace

trunk/rphp/compiler/pParser.h

@@ -21 +21 @@
-#define RPHP_PPARSER_H_
-
+//#define BOOST_SPIRIT_LEXERTL_DEBUG
+//#define BOOST_SPIRIT_DEBUG
+
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
@@ -30 +33 @@
-
-#include "pLexers.h"
+#include "pAST.h"
-
-using namespace boost::spirit;
@@ -72 +76 @@
-    template <typename TokenDef>
-    rphpLangGrammarDef(TokenDef const& tok)
-program, "program
+module, "module
-    {
-
-
+
+
+
+
+
+
+
-            ;
-
-
+statement_
-            =   '{' >> *statement >> '}'
-            ;
-
-        statement
-
+
+
-            |   if_stmt
-            |   while_stmt
+            |   echo_stmt
-            ;
-
@@ -91 +102 @@
-            =   (tok.identifier >> '=' >> expression >> ';')
-                [
-
+ from "<< _2 <<  "
-                ]
-            ;
-
-        if_stmt
-> ')' >> 
-
+ ')' >> statement_
+statement_
-                )
-                [
@@ -105 +116 @@
-
-        while_stmt
-
+statement_
-                [
-                    std::cout << val("while expression: ") << _1 << "\n"
+                ]
+            ;
+
+        echo_stmt
+            =   (tok.echo >> expression >> ';')
+                [
+                    std::cout << val("echo: ") << _1 << "\n"
-                ]
-            ;
@@ -117 +135 @@
-            =   tok.identifier [ _val = _1 ]
-            |   tok.variable   [ _val = _1 ]
-constant
+lnumber
-            ;
-
-
-
-
-
+
+
-        statement.name("statement");
-        assignment.name("assignment");
-        if_stmt.name("if_stmt");
-        while_stmt.name("while_stmt");
+        echo_stmt.name("echo_stmt");
-
-
-
-
-
-
-
-
-
-
+
-
-    }
@@ -144 +153 @@
-    typedef typename base_type::skipper_type skipper_type;
-
-program, block, statement
+module, statement, statement_block
-    rule<Iterator, skipper_type> assignment, if_stmt;
-
+, echo_stmt
-
-    //  the expression is the only rule having a return value

trunk/rphp/compiler/pTokens.h

@@ -23 +23 @@
-namespace rphp {
-
-
+
+
-    T_VARIABLE = 1000,
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}