ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / src / TPushLexer.cc

diff --git a/helm/DEVEL/mathml_editor/src/TPushLexer.cc b/helm/DEVEL/mathml_editor/src/TPushLexer.cc
index 2411a0e219dc65d0dbb8667530f10c7f3356e6f0..da15822c39794eeac79e8a37a62866c2e19ffd5f 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TPushLexer.cc
+++ b/helm/DEVEL/mathml_editor/src/TPushLexer.cc
@@ -23,6 +23,10 @@
  * or send an email to <lpadovan@cs.unibo.it>
  */
 
+#include <string>
+#include <cctype>
+#include <cassert>
+
 #include "TToken.hh"
 #include "TPushLexer.hh"
 #include "APushParser.hh"
@@ -37,6 +41,8 @@ TPushLexer::reset()
 {
   buffer.erase();
   state = ACCEPT;
+
+  displayCursor();
 }
 
 void
@@ -59,7 +65,7 @@ TPushLexer::transaction(char ch, State newState)
     case '^': parser.push(TToken(TToken::SUPERSCRIPT)); break;
     case '_': parser.push(TToken(TToken::SUBSCRIPT)); break;
     case '\t':
-    case ' ': parser.push(TToken(TToken::SPACE, ch)); break;
+    case ' ': parser.push(TToken(TToken::IGNORABLE_SPACE, ch)); break;
     case '~': parser.push(TToken(TToken::ACTIVE, ch)); break;
     case '%': parser.push(TToken(TToken::COMMENT)); break;     
     default:
@@ -144,13 +150,8 @@ TPushLexer::push(char ch)
       break;
     }
 
-  switch (state)
-    {
-    case ESCAPE: parser.setCursorHint("\\"); break;
-    case MACRO: parser.setCursorHint("\\" + buffer); break;
-    case PARAMETER: parser.setCursorHint("#"); break;
-    default: parser.setCursorHint(""); break;
-    }
+  displayCursor();
+
 }
 
 void
@@ -183,6 +184,13 @@ TPushLexer::drop(bool alt)
       break;
     }
 
+  displayCursor();
+
+}
+
+void
+TPushLexer::displayCursor()
+{
   switch (state)
     {
     case ESCAPE: parser.setCursorHint("\\"); break;