Changeset 614

Timestamp:

07/25/08 08:02:42 (4 months ago)

Author:

weyrick

Message:

get a dumpTokens() working to some degree, for testing the lexer. add debug_visitor.

Files:

• trunk/rphp/compiler/pDriver.cpp (modified) (1 diff)
• trunk/rphp/compiler/pDriver.h (modified) (2 diffs)
• trunk/rphp/compiler/parser/phplexer.cpp (modified) (2 diffs)
• trunk/rphp/compiler/parser/phplexer.h (modified) (1 diff)
• trunk/rphp/compiler/parser/rphp_debug_visitor.h (added)
• trunk/rphp/frontend/cli/main.cpp (modified) (1 diff)

trunk/rphp/compiler/pDriver.cpp

@@ -18 +18 @@
-*/
-
+#include <iostream>
+#include <iomanip>
+#include <fstream>
-#include <string>
-
-
+
+
+
+
-#include "parser/rphp_parser.h"
-#include "parser/phplexer.h"
-#include "pDriver.h"
-
+using namespace std;
+
-namespace rphp {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
+    
+    void pDriver::dumpTokens(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();
+        
+        Lexer lexer(0, contents);
+        int token;
+        while ((token = lexer.nextTokenKind())) {
+            printToken(token, lexer, contents);
+        }
+        printToken(token, lexer, contents);
+
+    }
-
-}

trunk/rphp/compiler/pDriver.h

@@ -21 +21 @@
-#define RPHP_PDRIVER_H_
-
+#include <string>
-
-namespace rphp {
@@ -28 +29 @@
-
-        public:
-compile
+dumpTokens
-
-    };

trunk/rphp/compiler/parser/phplexer.cpp

@@ -101 +101 @@
-    }
-    int pos = m_curpos;
-    #ifdef THOMAS_TEMP_DISABLED
-    // TODO temp. disabled code, tokenBegin was not in use
-    m_tokenBegin = m_curpos;
-    #endif
-    switch ( state() )
-    {
@@ -149 +146 @@
-                while (m_curpos < m_contentSize && lookAt( pos ) == ' ') {
-                    if ( lookAt( pos ) == '\n') createNewline(m_curpos);
-
+++
-                    m_curpos++;
-                }

trunk/rphp/compiler/parser/phplexer.h

@@ -65 +65 @@
-    bool isHeredocEnd(const UChar32& it, int pos);
-
-m_cur
+
-
-    std::vector<int> m_state; // was: QStack<int>

trunk/rphp/frontend/cli/main.cpp

@@ -38 +38 @@
-    std::vector<std::string> infiles = vm["input-file"].as< std::vector<std::string> >();
-    for (std::vector<std::string>::iterator it = infiles.begin(); it!=infiles.end(); ++it) {
-compile
+dumpTokens
-    }
-