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 1d25abbe98edff1fa8299e0eb82fc7585b6397d7..da15822c39794eeac79e8a37a62866c2e19ffd5f 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TPushLexer.cc
+++ b/helm/DEVEL/mathml_editor/src/TPushLexer.cc
@@ -1,3 +1,31 @@
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
+ * 
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
+ */
+
+#include <string>
+#include <cctype>
+#include <cassert>
 
 #include "TToken.hh"
 #include "TPushLexer.hh"
@@ -13,6 +41,8 @@ TPushLexer::reset()
 {
   buffer.erase();
   state = ACCEPT;
+
+  displayCursor();
 }
 
 void
@@ -35,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:
@@ -55,7 +85,6 @@ TPushLexer::push(char ch)
     case ACCEPT:
       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;
@@ -65,10 +94,6 @@ TPushLexer::push(char ch)
          buffer.push_back(ch);
          state = MACRO;
        }
-      else if (ch == '\b')
-        {
-         state = ACCEPT;
-       }
       else if (ch == -1) error();
       else
        {
@@ -89,11 +114,6 @@ TPushLexer::push(char ch)
          buffer.erase();
          state = PARAMETER;
        }
-      else if (ch == '\b')
-       {
-         buffer.erase(buffer.length() - 1, 1);
-         if (buffer.length() == 0) state = ESCAPE;
-       }
       else if (isalpha(ch))
        buffer.push_back(ch);
       else if (ch == -1)
@@ -114,7 +134,6 @@ TPushLexer::push(char ch)
       if (ch == '\\') state = ESCAPE;
       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;
@@ -131,6 +150,47 @@ TPushLexer::push(char ch)
       break;
     }
 
+  displayCursor();
+
+}
+
+void
+TPushLexer::drop(bool alt)
+{
+  std::string restore = "";
+
+  switch (state)
+    {
+    case ACCEPT:
+    case IGNORE_SPACE:
+      restore = parser.drop(alt);
+      if (restore.length() > 0 && restore[0] == '\\')
+       {
+         buffer = std::string(restore, 1, restore.length() - 1);
+         state = (buffer.length() > 0) ? MACRO : ESCAPE;
+       }
+      break;
+    case ESCAPE:
+      state = ACCEPT;
+      break;
+    case MACRO:
+      if (alt) buffer.erase();
+      else buffer.erase(buffer.length() - 1, 1);
+      if (buffer.length() == 0) state = ESCAPE;
+      break;
+    case PARAMETER:
+    default:
+      assert(0);
+      break;
+    }
+
+  displayCursor();
+
+}
+
+void
+TPushLexer::displayCursor()
+{
   switch (state)
     {
     case ESCAPE: parser.setCursorHint("\\"); break;