* code cleanup

[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 4b24523da5e494c01ac2202bfbea438063fbf996..1d25abbe98edff1fa8299e0eb82fc7585b6397d7 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TPushLexer.cc
+++ b/helm/DEVEL/mathml_editor/src/TPushLexer.cc
@@ -3,7 +3,7 @@
 #include "TPushLexer.hh"
 #include "APushParser.hh"
 
-TPushLexer::TPushLexer(APushParser& p) : APushLexer(p)
+TPushLexer::TPushLexer(ALogger& l, APushParser& p) : APushLexer(l, p)
 {
   state = ACCEPT;
 }
@@ -15,6 +15,12 @@ TPushLexer::reset()
   state = ACCEPT;
 }
 
+void
+TPushLexer::flush()
+{
+  push(-1);
+}
+
 void
 TPushLexer::transaction(char ch, State newState)
 {
@@ -50,6 +56,7 @@ TPushLexer::push(char ch)
       if (ch == '\\') state = ESCAPE;
       else if (ch == '#') state = PARAMETER;
       else if (ch == '\b') parser.push(TToken(TToken::GDELETE));
+      else if (ch == -1) ;
       else transaction(ch, ACCEPT);
       break;
     case ESCAPE:
@@ -62,6 +69,7 @@ TPushLexer::push(char ch)
         {
          state = ACCEPT;
        }
+      else if (ch == -1) error();
       else
        {
          parser.push(TToken(TToken::CONTROL, ch));
@@ -88,6 +96,12 @@ TPushLexer::push(char ch)
        }
       else if (isalpha(ch))
        buffer.push_back(ch);
+      else if (ch == -1)
+        {
+         parser.push(TToken(TToken::CONTROL, buffer));
+         buffer.erase();
+         state = ACCEPT;
+       }
       else
        {
          parser.push(TToken(TToken::CONTROL, buffer));
@@ -101,11 +115,16 @@ TPushLexer::push(char ch)
       else if (ch == '#') state = PARAMETER;
       else if (isspace(ch)) ;
       else if (ch == '\b') parser.push(TToken(TToken::GDELETE));
+      else if (ch == -1) state = ACCEPT;
       else transaction(ch, ACCEPT);
       break;
     case PARAMETER:
-      parser.push(TToken(TToken::PARAMETER, ch));
-      state = ACCEPT;
+      if (ch == -1) error();
+      else
+        {
+         parser.push(TToken(TToken::PARAMETER, ch));
+         state = ACCEPT;
+       }
       break;
     default:
       assert(0);
@@ -114,10 +133,10 @@ TPushLexer::push(char ch)
 
   switch (state)
     {
-    case ESCAPE: parser.setCursor("\\"); break;
-    case MACRO: parser.setCursor("\\" + buffer); break;
-    case PARAMETER: parser.setCursor("#"); break;
-    default: parser.setCursor("?"); break;
+    case ESCAPE: parser.setCursorHint("\\"); break;
+    case MACRO: parser.setCursorHint("\\" + buffer); break;
+    case PARAMETER: parser.setCursorHint("#"); break;
+    default: parser.setCursorHint(""); break;
     }
 }