X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=4b93787423c7685d12ba833372bd9cd52e37b25c;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=6fe01651b427b9d89bf6fe14bbd205fbc9eab5ab;hpb=76938908d7da15b92bad3908e71eb969c9449c0e;p=lyx.git

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 6fe01651b4..4b93787423 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,8 +1,15 @@
-//  Generalized simple lexical analizer.
-//  It can be used for simple syntax parsers, like lyxrc,
-//  texclass and others to come.   [asierra30/03/96]
-//
-//   Copyright 1996 Lyx Team.
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *
+ *           Copyright 1996-2000 The LyX Team.
+ *
+ *   Generalized simple lexical analizer.
+ *   It can be used for simple syntax parsers, like lyxrc,
+ *   texclass and others to come.   [asierra30/03/96]
+ *
+ * ====================================================== */
 
 #include <config.h>
 
@@ -13,6 +20,7 @@
 #include "lyxlex.h"
 #include "lyxlex_pimpl.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 using std::istream;
@@ -47,7 +55,8 @@ int LyXLex::GetLineNo() const
 	return pimpl_->lineno;
 }
 
-char const * LyXLex::text() const
+
+string const LyXLex::text() const
 {
 	return &pimpl_->buff[0];
 }
@@ -95,6 +104,11 @@ void LyXLex::setStream(istream & i)
 }
 
 
+void LyXLex::setCommentChar(char c)
+{
+	pimpl_->setCommentChar(c);
+}
+
 int LyXLex::lex()
 {
 	return pimpl_->lex();
@@ -103,8 +117,8 @@ int LyXLex::lex()
 
 int LyXLex::GetInteger() const
 {
-	if (pimpl_->buff[0] > ' ')   
-		return atoi(pimpl_->buff);
+	if (isStrInt(pimpl_->GetString()))
+		return strToInt(pimpl_->GetString());
 	else {
 		pimpl_->printError("Bad integer `$$Token'");
 		return -1;
@@ -114,12 +128,16 @@ int LyXLex::GetInteger() const
 
 float LyXLex::GetFloat() const
 {
-   if (pimpl_->buff[0] > ' ')
-       return atof(pimpl_->buff);
-   else {
-	pimpl_->printError("Bad float `$$Token'");
-	return -1;
-   }
+	// replace comma with dot in case the file was written with
+	// the wrong locale (should be rare, but is easy enough to
+	// avoid). 
+	string str = subst(pimpl_->GetString(), ",", ".");
+	if (isStrDbl(str))
+		return strToDbl(str);
+	else {
+		pimpl_->printError("Bad float `$$Token'");
+		return -1;
+	}
 }
 
 
@@ -132,7 +150,7 @@ string const LyXLex::GetString() const
 // I would prefer to give a tag number instead of an explicit token
 // here, but it is not possible because Buffer::readLyXformat2 uses
 // explicit tokens (JMarc) 
-string LyXLex::getLongString(string const & endtoken)
+string const LyXLex::getLongString(string const & endtoken)
 {
 	string str, prefix;
 	bool firstline = true;
@@ -164,10 +182,10 @@ string LyXLex::getLongString(string const & endtoken)
 			} 
 
 			if (!prefix.empty() 
-			    && prefixIs(tmpstr, prefix.c_str())) {
+			    && prefixIs(tmpstr, prefix)) {
 				tmpstr.erase(0, prefix.length() - 1);
 			}
-			str += tmpstr + '\n';
+			str += frontStrip(tmpstr, "\t") + '\n';
                 }
 		else // token == endtoken
 			break;
@@ -207,6 +225,12 @@ bool LyXLex::nextToken()
 }
 
 
+void LyXLex::pushToken(string const & pt)
+{
+	pimpl_->pushToken(pt);
+}
+
+
 int LyXLex::FindToken(char const * str[])
 {  
    int i = -1;