// (C) 1996 Lyx Team.
#include <config.h>
-//#include "definitions.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
#ifdef __GNUG__
#pragma implementation "lyxlex.h"
#endif
#include "lyxlex.h"
-#include "error.h"
-#include "filetools.h"
+#include "debug.h"
+#include "support/filetools.h"
-// $Id: lyxlex.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $
-
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: lyxlex.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $";
-#endif /* lint */
-
-
-LyXLex::LyXLex(keyword_item* tab, int num)
+LyXLex::LyXLex(keyword_item * tab, int num)
: table(tab), no_items(num)
{
- file = NULL;
+ file = 0;
owns_file = false;
status = 0;
- pushed = NULL;
+ pushed = 0;
}
-void LyXLex::pushTable(keyword_item* tab, int num)
+void LyXLex::pushTable(keyword_item * tab, int num)
{
- pushed_table *tmppu = new pushed_table;
+ pushed_table * tmppu = new pushed_table;
tmppu->next = pushed;
tmppu->table_elem = table;
tmppu->table_siz = no_items;
void LyXLex::popTable()
{
- if (pushed == NULL)
- lyxerr.print("LyXLex error: nothing to pop!");
+ if (pushed == 0)
+ lyxerr << "LyXLex error: nothing to pop!" << endl;
- pushed_table *tmp;
+ pushed_table * tmp;
tmp = pushed;
table = tmp->table_elem;
no_items = tmp->table_siz;
- tmp->table_elem = NULL;
+ tmp->table_elem = 0;
pushed = tmp->next;
delete tmp;
}
void LyXLex::printTable()
{
- lyxerr.print(LString("\nNumber of tags: ")+no_items);
+ lyxerr << "\nNumber of tags: " << no_items << endl;
for(int i=0; i<no_items; i++)
- lyxerr.print(LString("table[")+i+
- "]: tag: `"+table[i].tag+
- "' code:"+(long)table[i].code);
- lyxerr.print(LString());
+ lyxerr << "table[" << i
+ << "]: tag: `" << table[i].tag
+ << "' code:" << table[i].code << endl;
+ lyxerr << endl;
}
-void LyXLex::printError(LString const & message)
+void LyXLex::printError(string const & message)
{
- LString tmpmsg = message;
- tmpmsg.subst("$$Token",GetString());
- lyxerr.print("LyX: "+tmpmsg+" [around line "+lineno+" of file "
- +MakeDisplayPath(name)+']');
+ string tmpmsg = subst(message, "$$Token", GetString());
+ lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
+ << " of file " << MakeDisplayPath(name) << ']' << endl;
}
-bool LyXLex::setFile(LString const & filename)
+bool LyXLex::setFile(string const & filename)
{
if (file)
- lyxerr.print("Error in LyXLex::setFile: file already set.");
+ lyxerr << "Error in LyXLex::setFile: file already set." <<endl;
file = fopen(filename.c_str(), "r");
name = filename;
owns_file = true;
}
-void LyXLex::setFile(FILE *f)
+void LyXLex::setFile(FILE * f)
{
if (file)
- lyxerr.print("Error in LyXLex::setFile: file already set.");
+ lyxerr << "Error in LyXLex::setFile: file already set." << endl;
file = f;
owns_file = false;
lineno = 0; // this is bogus if the file already has been read from
float LyXLex::GetFloat()
{
if (buff[0]>' ')
- return (float)strtod(buff, (char**)NULL);
+ return (float)strtod(buff, (char**)0);
else {
printError("Bad float `$$Token'");
return -1;
}
-LString LyXLex::GetString() const
+string LyXLex::GetString() const
{
- return LString(buff);
+ return string(buff);
}
// 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)
-LString LyXLex::getLongString(LString const &endtoken)
+string LyXLex::getLongString(string const & endtoken)
{
- LString str, prefix;
+ string str, prefix;
bool firstline = true;
while (IsOK()) {
// blank line in the file being read
continue;
- LString const token = GetString().strip().frontStrip();
+ string const token = frontStrip(strip(GetString()), " \t");
- lyxerr.debug("LongString: `"+GetString()+'\'', Error::LEX_PARSER);
+ lyxerr[Debug::PARSER] << "LongString: `"
+ << GetString() << '\'' << endl;
// We do a case independent comparison, like search_kw
// does.
- if (strcasecmp(token.c_str(), endtoken.c_str()) != 0) {
- LString tmpstr = GetString();
+ if (compare_no_case(token, endtoken) != 0) {
+ string tmpstr = GetString();
if (firstline) {
- int i = 0;
+ unsigned int i = 0;
while(i < tmpstr.length()
&& tmpstr[i] == ' ') {
- i++;
+ ++i;
prefix += ' ';
}
firstline = false;
- lyxerr.debug("Prefix = `"+prefix+'\'',
- Error::LEX_PARSER);
+ lyxerr[Debug::PARSER] << "Prefix = `" << prefix
+ << '\'' << endl;
}
if (!prefix.empty()
- && tmpstr.prefixIs(prefix.c_str())) {
- tmpstr.substring(prefix.length(),
- tmpstr.length()-1);
+ && prefixIs(tmpstr, prefix.c_str())) {
+ tmpstr.erase(0, prefix.length() - 1);
}
str += tmpstr + '\n';
}
bool LyXLex::GetBool()
{
- if (strcmp(buff, "true") == 0)
+ if (compare(buff, "true") == 0)
return true;
- else if (strcmp(buff, "false") != 0)
+ else if (compare(buff, "false") != 0)
printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
return false;
}
if (i==(LEX_MAX_BUFF-1) && c !='\n') {
printError("Line too long");
c = '\n'; // Pretend we had an end of line
- lineno--; // but don't increase line counter (netto effect)
- i++; // and preserve last character read.
+ --lineno; // but don't increase line counter (netto effect)
+ ++i; // and preserve last character read.
}
if (c=='\n') {
- lineno++;
+ ++lineno;
buff[--i] = '\0'; // i can never be 0 here, so no danger
status = LEX_DATA;
return true;
while (l < r) {
m = (l+r)/2;
- if (lyxerr.debugging(Error::LEX_PARSER)) {
- LString my_l;
- my_l+="LyXLex::search_kw: elem " ;
- my_l+= m;
- my_l+=" tag ";
- my_l+=table[m].tag;
- my_l+=" search tag ";
- my_l+= tag;
- lyxerr.print(my_l);
+ if (lyxerr.debugging(Debug::PARSER)) {
+ lyxerr << "LyXLex::search_kw: elem " << m
+ << " tag " << table[m].tag
+ << " search tag " << tag
+ << endl;
}
if (table[m].tag)
- k = strcasecmp(table[m].tag, tag);
+ k = compare_no_case(table[m].tag, tag);
if (k==0)
return table[m].code;
else
if (!esc) {
int c; // getc() returns an int
- int i;
+ //int i;
status = 0;
if (c=='#') {
// Read rest of line (fast :-)
fgets(buff, sizeof(buff), file);
- lineno++;
+ ++lineno;
continue;
}
if (c=='\"') {
- i = -1;
+ int i = -1;
do {
c = getc(file);
if (c != '\r')
if (i==(LEX_MAX_BUFF-2)) {
printError("Line too long");
c = '\"'; // Pretend we got a "
- i++;
+ ++i;
}
if (c!='\"') {
printError("Missing quote");
if (c=='\n')
- lineno++;
+ ++lineno;
}
buff[i] = '\0';
continue; /* Skip ','s */
if (c > ' ' && !feof(file)) {
- i = 0;
+ int i = 0;
do {
buff[i++] = c;
c = getc(file);
status = LEX_TOKEN;
}
- if (c=='\r' && !feof(file)) {
+ if (c== '\r' && !feof(file)) {
// The Windows support has lead to the
// possibility of "\r\n" at the end of
// a line. This will stop LyX choking
}
if (c=='\n')
- lineno++;
+ ++lineno;
}
if (status) return true;
return false;
} else {
int c; // getc() returns an int
- int i;
+ //int i;
status = 0;
if (c=='\\') {
// escape
- i = 0;
+ int i = 0;
do {
if (c == '\\') {
// escape the next char
if (c=='#') {
// Read rest of line (fast :-)
fgets(buff, sizeof(buff), file);
- lineno++;
+ ++lineno;
continue;
}
// string
if (c=='\"') {
- i = -1;
+ int i = -1;
bool escaped = false;
do {
escaped = false;
if (i==(LEX_MAX_BUFF-2)) {
printError("Line too long");
c = '\"'; // Pretend we got a "
- i++;
+ ++i;
}
if (c!='\"') {
printError("Missing quote");
if (c=='\n')
- lineno++;
+ ++lineno;
}
buff[i] = '\0';
}
if (c > ' ' && !feof(file)) {
- i = 0;
+ int i = 0;
do {
if (c == '\\') {
// escape the next char
// new line
if (c=='\n')
- lineno++;
+ ++lineno;
}
if (status) return true;
}
if (c=='\n')
- lineno++;
+ ++lineno;
}
if (status) return true;
}
-int LyXLex::FindToken(char const* string[])
+int LyXLex::FindToken(char const * str[])
{
int i = -1;
if (next()) {
- if (strcmp(buff, "default")) {
- for (i=0; string[i][0] && strcmp(string[i], buff); i++);
- if (!string[i][0]) {
+ if (compare(buff, "default")) {
+ for (i = 0; str[i][0] && compare(str[i], buff); ++i);
+ if (!str[i][0]) {
printError("Unknown argument `$$Token'");
i = -1;
}
}
-int LyXLex::CheckToken(char const* string[], int print_error)
+int LyXLex::CheckToken(char const * str[], int print_error)
{
int i = -1;
- if (strcmp(buff, "default")) {
- for (i=0; string[i][0] && strcmp(string[i], buff); i++);
- if (!string[i][0]) {
+ if (compare(buff, "default")) {
+ for (i = 0; str[i][0] && compare(str[i], buff); i++);
+ if (!str[i][0]) {
if (print_error)
printError("Unknown argument `$$Token'");
i = -1;
projects / lyx.git / blobdiff