X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=824173ed83e3f76026d5b89db45b5528201fa0e9;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=9df38a2108a0820320f9d5de1f195c558c6609b9;hpb=c6c5eb530cf6c2b818e69dd55bc273286ff8513d;p=lyx.git

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 9df38a2108..824173ed83 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,26 +1,43 @@
 /**
  * \file lyxlex.C
- * Copyright 1996-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * Generalized simple lexical analyzer.
- * It can be used for simple syntax parsers, like lyxrc,
- * texclass and others to come.
+ * \author Alejandro Aguilar Sierra
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
  *
- * \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "lyxlex.h"
-#include "lyxlex_pimpl.h"
+
 #include "debug.h"
-#include "support/filetools.h"
+#include "lyxlex_pimpl.h"
+
+#include "support/convert.h"
 #include "support/lstrings.h"
 
-using std::ostream;
-using std::istream;
+#include <sstream>
+
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::isStrDbl;
+using support::isStrInt;
+using support::ltrim;
+using support::prefixIs;
+using support::subst;
+using support::trim;
+
 using std::endl;
+using std::string;
+using std::istream;
+using std::ostream;
 
 
 LyXLex::LyXLex(keyword_item * tab, int num)
@@ -52,12 +69,6 @@ int LyXLex::getLineNo() const
 }
 
 
-string const LyXLex::text() const
-{
-	return &pimpl_->buff[0];
-}
-
-
 istream & LyXLex::getStream()
 {
 	return pimpl_->is;
@@ -114,20 +125,20 @@ int LyXLex::lex()
 int LyXLex::getInteger() const
 {
 	if (isStrInt(pimpl_->getString()))
-		return strToInt(pimpl_->getString());
+		return convert<int>(pimpl_->getString());
 	pimpl_->printError("Bad integer `$$Token'");
 	return -1;
 }
 
 
-float LyXLex::getFloat() const
+double LyXLex::getFloat() const
 {
 	// 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(), ",", ".");
+	string const str = subst(pimpl_->getString(), ",", ".");
 	if (isStrDbl(str))
-		return strToDbl(str);
+		return convert<double>(str);
 	pimpl_->printError("Bad float `$$Token'");
 	return -1;
 }
@@ -139,8 +150,14 @@ string const LyXLex::getString() const
 }
 
 
+docstring const LyXLex::getDocString() const
+{
+	return pimpl_->getDocString();
+}
+
+
 // I would prefer to give a tag number instead of an explicit token
-// here, but it is not possible because Buffer::readLyXformat2 uses
+// here, but it is not possible because Buffer::readDocument uses
 // explicit tokens (JMarc)
 string const LyXLex::getLongString(string const & endtoken)
 {
@@ -157,8 +174,7 @@ string const LyXLex::getLongString(string const & endtoken)
 		lyxerr[Debug::PARSER] << "LongString: `"
 				      << getString() << '\'' << endl;
 
-		// We do a case independent comparison, like search_kw
-		// does.
+		// We do a case independent comparison, like search_kw does.
 		if (compare_ascii_no_case(token, endtoken) == 0)
 			break;
 
@@ -191,10 +207,11 @@ string const LyXLex::getLongString(string const & endtoken)
 
 bool LyXLex::getBool() const
 {
-	if (compare(pimpl_->buff, "true") == 0) {
+	if (pimpl_->getString() == "true") {
 		return true;
-	} else if (compare(pimpl_->buff, "false") != 0) {
-		pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
+	} else if (pimpl_->getString() != "false") {
+		pimpl_->printError("Bad boolean `$$Token'. "
+				   "Use \"false\" or \"true\"");
 	}
 	return false;
 }
@@ -223,25 +240,89 @@ void LyXLex::pushToken(string const & pt)
 	pimpl_->pushToken(pt);
 }
 
+LyXLex::operator void const *() const
+{
+	// This behaviour is NOT the same as the std::streams which would
+	// use fail() here. However, our implementation of getString() et al.
+	// can cause the eof() and fail() bits to be set, even though we
+	// haven't tried to read 'em.
+	return pimpl_->is.bad() ? 0 : this;
+}
+
+
+bool LyXLex::operator!() const
+{
+	return pimpl_->is.bad();
+}
+
+
+LyXLex & LyXLex::operator>>(std::string & s)
+{
+	if (isOK()) {
+		next();
+		s = getString();
+	}
+	return *this;
+}
+
 
-int LyXLex::findToken(char const * str[])
+LyXLex & LyXLex::operator>>(docstring & s)
 {
-	if (!next()) {
-		pimpl_->printError("file ended while scanning string token");
-		return -1;
+	if (isOK()) {
+		next();
+		s = getDocString();
 	}
+	return *this;
+}
 
-	int i = 0;
 
-	if (compare(pimpl_->buff, "default")) {
-		while (str[i][0] && compare(str[i], pimpl_->buff)) {
-			++i;
-		}
-		if (!str[i][0]) {
-			pimpl_->printError("Unknown argument `$$Token'");
-			i = -1;
-		}
+LyXLex & LyXLex::operator>>(double & s)
+{
+	if (isOK()) {
+		next();
+		s = getFloat();
+	}
+	return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(int & s)
+{
+	if (isOK()) {
+		next();
+		s = getInteger();
+	}
+	return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(unsigned int & s)
+{
+	if (isOK()) {
+		next();
+		s = getInteger();
+	}
+	return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(bool & s)
+{
+	if (isOK()) {
+		next();
+		s = getBool();
 	}
+	return *this;
+}
+
 
-	return i;
+/// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
+string const LyXLex::quoteString(string const & arg)
+{
+	std::ostringstream os;
+	os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
+	return os.str();
 }
+
+
+} // namespace lyx