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 6529a7da36311e657573a03773043ba6439044a2..da15822c39794eeac79e8a37a62866c2e19ffd5f 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TPushLexer.cc
+++ b/helm/DEVEL/mathml_editor/src/TPushLexer.cc
@@ -1,28 +1,32 @@
-/* Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
- *                    2003, Paolo Marinelli <pmarinel@cs.unibo.it>.
- *
- * This file is part of EdiTeX, an editor of mathematical
- * expressions based on TeX syntax
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
  * 
- * EdiTeX is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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.
  *
- * EdiTeX is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with EdiTeX; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- * 
- * For details, see the EdiTeX World-Wide-Web page,
- * http://helm.cs.unibo.it/editex, or send a mail to
- * <luca.padovani@cs.unibo.it>
+ * 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"
 #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;