Changeset 620

Timestamp:

08/02/08 11:10:49 (4 months ago)

Author:

weyrick

Message:

try to plug the parser in. currently it appears to create and traverse a random parse tree

Files:

• trunk/rphp/compiler/pDriver.cpp (modified) (2 diffs)
• trunk/rphp/compiler/pDriver.h (modified) (1 diff)
• trunk/rphp/frontend/cli/main.cpp (modified) (2 diffs)
• trunk/rphp/runtime/pFunctionManager.cpp (modified) (1 diff)
• trunk/rphp/runtime/standard/pStandardExt.cpp (modified) (2 diffs)

trunk/rphp/compiler/pDriver.cpp

@@ -25 +25 @@
-#include <unicode/ustream.h>
-
+#include "parser/rphp_debug_visitor.h"
-#include "parser/phplexer.h"
-#include "parser/rphp_parser.h"
@@ -369 +370 @@
-    }
-
+    void pDriver::dumpAST(string fileName) {
+
+        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/pDriver.h

@@ -30 +30 @@
-        public:
-            void dumpTokens(std::string fileName);
+            void dumpAST(std::string fileName);
-
-    };

trunk/rphp/frontend/cli/main.cpp

@@ -19 +19 @@
-    desc.add_options()
-        ("help", "produce help message")
+        ("dump-toks", "dump tokens from lexer")
+        ("dump-ast", "dump AST")
-//        ("optimization", po::value<int>(&opt)->default_value(10), "optimization level")
-        ("input-file", po::value< std::vector<std::string> >(), "input file")
@@ -32 +34 @@
-
-    if (vm.count("help") || !vm.count("input-file")) {
+        std::cout << "Roadsend PHP" << std::endl;
-        std::cout << desc << "\n";
-        return 1;
-    }
-
-    //std::cout << "Roadsend PHP" << std::endl;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-//std::cout << "Optimization level is " << opt << "\n"
+return 0
-
-}

trunk/rphp/runtime/pFunctionManager.cpp

@@ -24 +24 @@
-void pFunctionManager::registerBuiltin(const pExtBase* sourceExt, const pUString& funName, const pFunPointer1& f) {
-
-    std::cout << "registering " << funName << std::endl;
-    functionRegistry.insert(functionEntry(funName, new pFunctionSig(sourceExt, funName, f)));
-

trunk/rphp/runtime/standard/pStandardExt.cpp

@@ -24 +24 @@
-void pStandardExt::extensionStartup() {
-
-
+//
-
-    registerBuiltin("strlen", boost::bind(&pStandardExt::strlen, this, _1));
@@ -32 +32 @@
-void pStandardExt::extensionShutdown() {
-
-
+//
-
-}