#include "Encoding.h"
#include "Parser.h"
-#include "support/foreach.h"
#include "support/lstrings.h"
#include "support/textutils.h"
// Wrapper
//
+void iparserdocstream::setEncoding(std::string const & e)
+{
+ is_ << lyx::setEncoding(e);
+}
+
+
void iparserdocstream::putback(char_type c)
{
- s_ += c;
+ s_ = c + s_;
}
-void iparserdocstream::put_almost_back(docstring s)
+void iparserdocstream::putback(docstring s)
{
s_ = s + s_;
}
if (s_.empty())
is_.get(c);
else {
+ //cerr << "unparsed: " << to_utf8(s_) <<endl;
c = s_[0];
s_.erase(0,1);
}
//
-Parser::Parser(idocstream & is)
- : lineno_(0), pos_(0), iss_(0), is_(is), encoding_iconv_("UTF-8"),
- theCatcodesType_(NORMAL_CATCODES), curr_cat_(UNDECIDED_CATCODES)
+Parser::Parser(idocstream & is, std::string const & fixedenc)
+ : lineno_(0), pos_(0), iss_(0), is_(is),
+ encoding_iconv_(fixedenc.empty() ? "UTF-8" : fixedenc),
+ theCatcodesType_(NORMAL_CATCODES), curr_cat_(UNDECIDED_CATCODES),
+ fixed_enc_(!fixedenc.empty())
{
+ if (fixed_enc_)
+ is_.setEncoding(fixedenc);
+ catInit();
}
: lineno_(0), pos_(0),
iss_(new idocstringstream(from_utf8(s))), is_(*iss_),
encoding_iconv_("UTF-8"),
- theCatcodesType_(NORMAL_CATCODES), curr_cat_(UNDECIDED_CATCODES)
+ theCatcodesType_(NORMAL_CATCODES), curr_cat_(UNDECIDED_CATCODES),
+ // An idocstringstream can not change the encoding
+ fixed_enc_(true)
{
+ catInit();
}
for(size_type i = pos_ ; i < tokens_.size() ; ++i) {
s += tokens_[i].asInput();
}
- is_.put_almost_back(from_utf8(s));
+ is_.putback(from_utf8(s));
tokens_.erase(tokens_.begin() + pos_, tokens_.end());
// make sure that next token is read
tokenize_one();
}
-void Parser::setEncoding(std::string const & e, int const & p)
+bool Parser::setEncoding(std::string const & e, int const & p)
{
// We may (and need to) use unsafe encodings here: Since the text is
// converted to unicode while reading from is_, we never see text in
Encoding const * const enc = encodings.fromLaTeXName(e, p, true);
if (!enc) {
cerr << "Unknown encoding " << e << ". Ignoring." << std::endl;
- return;
+ return false;
}
- setEncoding(enc->iconvName());
+ return setEncoding(enc->iconvName());
}
}
-void Parser::setEncoding(std::string const & e)
+bool Parser::setEncoding(std::string const & e)
{
//cerr << "setting encoding to " << e << std::endl;
- is_.docstream() << lyx::setEncoding(e);
encoding_iconv_ = e;
+ // If the encoding is fixed, we must not change the stream encoding
+ // (because the whole input uses that encoding, e.g. if it comes from
+ // the clipboard). We still need to track the original encoding in
+ // encoding_iconv_, so that the generated output is correct.
+ if (!fixed_enc_)
+ is_.setEncoding(e);
+ return true;
}
Token const Parser::next_token()
{
static const Token dummy;
- return good() ? tokens_[pos_] : dummy;
+ if (!good())
+ return dummy;
+ if (pos_ >= tokens_.size())
+ tokenize_one();
+ return pos_ < tokens_.size() ? tokens_[pos_] : dummy;
}
Token const Parser::next_next_token()
{
static const Token dummy;
- // If good() has not been called after the last get_token() we need
- // to tokenize two more tokens.
- if (pos_ + 1 >= tokens_.size()) {
+ if (!good())
+ return dummy;
+ // If tokenize_one() has not been called after the last get_token() we
+ // need to tokenize two more tokens.
+ if (pos_ >= tokens_.size())
tokenize_one();
+ if (pos_ + 1 >= tokens_.size())
tokenize_one();
- }
return pos_ + 1 < tokens_.size() ? tokens_[pos_ + 1] : dummy;
}
Token const Parser::get_token()
{
static const Token dummy;
- // if (good())
- // cerr << "looking at token " << tokens_[pos_]
- // << " pos: " << pos_ << '\n';
- return good() ? tokens_[pos_++] : dummy;
+ if (!good())
+ return dummy;
+ if (pos_ >= tokens_.size()) {
+ tokenize_one();
+ if (pos_ >= tokens_.size())
+ return dummy;
+ }
+ // cerr << "looking at token " << tokens_[pos_]
+ // << " pos: " << pos_ << '\n';
+ return tokens_[pos_++];
}
{
pos_ = positions_.back();
positions_.pop_back();
+ deparse();
+}
+
+
+void Parser::dropPosition()
+{
+ positions_.pop_back();
}
{
if (pos_ < tokens_.size())
return true;
- tokenize_one();
- return pos_ < tokens_.size();
+ if (!is_.good())
+ return false;
+ return is_.peek() != idocstream::traits_type::eof();
}
}
-string const Parser::verbatimStuff(string const & end_string)
+Parser::Arg Parser::verbatimStuff(string const & end_string, bool const allow_linebreak)
{
if (!good())
- return string();
+ return Arg(false, string());
+ pushPosition();
ostringstream oss;
size_t match_index = 0;
setCatcodes(VERBATIM_CATCODES);
match_index += t.asInput().length();
if (match_index >= end_string.length())
break;
- } else if (match_index) {
- oss << end_string.substr(0, match_index) << t.asInput();
- match_index = 0;
- } else
- oss << t.asInput();
+ } else {
+ if (!allow_linebreak && t.asInput() == "\n") {
+ cerr << "unexpected end of input" << endl;
+ popPosition();
+ setCatcodes(NORMAL_CATCODES);
+ return Arg(false, string());
+ }
+ if (match_index) {
+ oss << end_string.substr(0, match_index)
+ << t.asInput();
+ match_index = 0;
+ } else
+ oss << t.asInput();
+ }
}
- setCatcodes(NORMAL_CATCODES);
- if (!good())
+
+ if (!good()) {
cerr << "unexpected end of input" << endl;
- return oss.str();
+ popPosition();
+ setCatcodes(NORMAL_CATCODES);
+ return Arg(false, string());
+ }
+ setCatcodes(NORMAL_CATCODES);
+ dropPosition();
+ return Arg(true, oss.str());
}
string const Parser::verbatimEnvironment(string const & name)
{
- string s = verbatimStuff("\\end{" + name + "}");
+ //FIXME: do something if endstring is not found
+ string s = verbatimStuff("\\end{" + name + "}").second;
// ignore one newline at beginning or end of string
if (prefixIs(s, "\n"))
s.erase(0,1);
putback();
res += '{' + verbatim_item() + '}';
} else
- res += t.cs();
+ res += t.asInput();
}
}
return res;
projects / lyx.git / blobdiff