X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=afda6e35ebf616a77a9bfe2911950278290a5e4f;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=a6aca998a6197f0ca56dc60d9f298b2837e155c9;hpb=3f1a78fbeb103a580e14a517f0ed632efa42c2a2;p=lyx.git

diff --git a/src/lyxlex.C b/src/lyxlex.C
index a6aca998a6..afda6e35eb 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,31 +1,39 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxlex.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Alejandro Aguilar Sierra
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
  *
- *           Copyright 1996-2001 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]
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation "lyxlex.h"
-#endif
-
 #include "lyxlex.h"
-#include "lyxlex_pimpl.h"
+
 #include "debug.h"
-#include "support/filetools.h"
+#include "lyxlex_pimpl.h"
+
 #include "support/lstrings.h"
 
-using std::ostream;
-using std::istream;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::isStrDbl;
+using lyx::support::isStrInt;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::strToDbl;
+using lyx::support::strToInt;
+using lyx::support::subst;
+using lyx::support::trim;
+
 using std::endl;
+using std::string;
+using std::istream;
+using std::ostream;
 
 
 LyXLex::LyXLex(keyword_item * tab, int num)
@@ -57,12 +65,6 @@ int LyXLex::getLineNo() const
 }
 
 
-string const LyXLex::text() const
-{
-	return &pimpl_->buff[0];
-}
-
-
 istream & LyXLex::getStream()
 {
 	return pimpl_->is;
@@ -118,12 +120,10 @@ int LyXLex::lex()
 
 int LyXLex::getInteger() const
 {
-	if (isStrInt(pimpl_->getString())) {
+	if (isStrInt(pimpl_->getString()))
 		return strToInt(pimpl_->getString());
-	} else {
-		pimpl_->printError("Bad integer `$$Token'");
-		return -1;
-	}
+	pimpl_->printError("Bad integer `$$Token'");
+	return -1;
 }
 
 
@@ -135,10 +135,8 @@ float LyXLex::getFloat() const
 	string str = subst(pimpl_->getString(), ",", ".");
 	if (isStrDbl(str))
 		return strToDbl(str);
-	else {
-		pimpl_->printError("Bad float `$$Token'");
-		return -1;
-	}
+	pimpl_->printError("Bad float `$$Token'");
+	return -1;
 }
 
 
@@ -149,7 +147,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
+// here, but it is not possible because Buffer::readBody uses
 // explicit tokens (JMarc)
 string const LyXLex::getLongString(string const & endtoken)
 {
@@ -166,9 +164,8 @@ string const LyXLex::getLongString(string const & endtoken)
 		lyxerr[Debug::PARSER] << "LongString: `"
 				      << getString() << '\'' << endl;
 
-		// We do a case independent comparison, like search_kw
-		// does.
-		if (compare_ascii_no_case(token, endtoken) == 0)	
+		// We do a case independent comparison, like search_kw does.
+		if (compare_ascii_no_case(token, endtoken) == 0)
 			break;
 
 		string tmpstr = getString();
@@ -183,13 +180,13 @@ string const LyXLex::getLongString(string const & endtoken)
 
 		// further lines in long strings may have the same
 		// whitespace prefix as the first line. Remove it.
-		if (prefixIs(tmpstr, prefix)) {
+		if (prefix.length() && prefixIs(tmpstr, prefix)) {
 			tmpstr.erase(0, prefix.length() - 1);
 		}
- 
+
 		str += ltrim(tmpstr, "\t") + '\n';
 	}
- 
+
 	if (!isOK()) {
 		printError("Long string not ended by `" + endtoken + '\'');
 	}
@@ -200,10 +197,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;
 }
@@ -242,8 +240,10 @@ int LyXLex::findToken(char const * str[])
 
 	int i = 0;
 
-	if (compare(pimpl_->buff, "default")) {
-		while (str[i][0] && compare(str[i], pimpl_->buff)) {
+	string const search_token = pimpl_->getString();
+
+	if (search_token != "default") {
+		while (str[i][0] && str[i] != search_token) {
 			++i;
 		}
 		if (!str[i][0]) {
@@ -254,3 +254,70 @@ int LyXLex::findToken(char const * str[])
 
 	return i;
 }
+
+
+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;
+}
+
+
+LyXLex & LyXLex::operator>>(float & 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;
+}
+