Changeset 609

Timestamp:

07/22/08 16:13:24 (4 months ago)

Author:

moenicke

Message:

* using std::stringstream for error output

Files:

• trunk/rphp/compiler/parser/php.g (modified) (2 diffs)
• trunk/rphp/compiler/parser/rphp_ast.h (modified) (1 diff)
• trunk/rphp/compiler/parser/rphp_parser.cpp (modified) (1 diff)

trunk/rphp/compiler/parser/php.g

@@ -26 +26 @@
-#include <string>
-#include <iostream>
+#include <sstream>
+
+// I hope this makes life easier
+#define str(stdstring) std::string(stdstring)
-
-namespace rphp
@@ -781 +785 @@
-void parser::yy_expected_symbol(int kind, const char* name)
-{
-#ifdef PEDNING_THOMAS
-// TODO pending
-
-    rint64 line;
-    rint64 col;
-    rint64 index = token_stream->index()-1;
-    token_type &token = token_stream->token(index);
-kDebug()
-kDebug()
-    token_stream->startP
+std::cout
+std::cout
+//    token_stream->start_p
-    UnicodeString tokenValue = tokenText(token.begin, token.end);
+
+    std::stringstream msg;
+    msg << "Expected symbol " 
+        << name 
+        << " (current token: \"" 
+//        + ( token.kind != 0 ? tokenValue : \"EOF\" )
+        + token.kind 
+        << " at line: "
+        << line
+        << " col: "
+        << col;
+
+//        reportProblem( parser::Error, msg.str() );
+
+#ifdef PENDING_THOMAS // can be removed
-    reportProblem( parser::Error,
-
-
+
-                  .arg(name)
-                  .arg(token.kind != 0 ? tokenValue : "EOF")

trunk/rphp/compiler/parser/rphp_ast.h

@@ -12 +12 @@
-#include <string>
-#include <iostream>
+#include <sstream>
+
+// I hope this makes life easier
+#define str(stdstring) std::string(stdstring)
-
-namespace rphp

trunk/rphp/compiler/parser/rphp_parser.cpp

@@ -72 +72 @@
-  void parser::yy_expected_symbol(int kind,  const char* name)
-  {
-#ifdef PEDNING_THOMAS 
-    // TODO pending
-
-    rint64 line;
-    rint64 col;
-    rint64 index =  token_stream->index() - 1;
-    token_type &token =  token_stream->token(index);
-kDebug()
-kDebug()
-token_stream->startPosition(index,  &line, 
+std::cout
+std::cout
+//    token_stream->start_position(index, &line,
-    UnicodeString tokenValue =  tokenText(token.begin,  token.end);
+
+    std::stringstream msg;
+    msg <<  "Expected symbol "
+    <<  name
+    <<  " (current token: \""
+    //        + ( token.kind != 0 ? tokenValue : \"EOF\" )
+    +  token.kind
+    <<  " at line: "
+    <<  line
+    <<  " col: "
+    <<  col;
+
+    //        reportProblem( parser::Error, msg.str() );
+
+#ifdef PENDING_THOMAS
+
-    reportProblem( parser::Error,
-                   // TODO port me