if (!more) {
if (!(n < argc-1))
error("Missing path name for the -I option.");
- pp.includes += Preprocessor::IncludePath(argv[++n]);
+ pp.includes += IncludePath(argv[++n]);
} else {
- pp.includes += Preprocessor::IncludePath(opt.mid(1));
+ pp.includes += IncludePath(opt.mid(1));
}
break;
case 'D': // define macro
fi.setFile(QFileInfo(QString::fromLocal8Bit(filename.constData())).dir(), QString::fromLocal8Bit(include.constData()));
for (int j = 0; j < Preprocessor::includes.size() && !fi.exists(); ++j) {
const IncludePath &p = Preprocessor::includes.at(j);
- fi.setFile(QString::fromLocal8Bit(p.path.constData()), QString::fromLocal8Bit(include.constData()));
+ fi.setFile(QString::fromLocal8Bit(p.constData()), QString::fromLocal8Bit(include.constData()));
// try again, maybe there's a file later in the include paths with the same name
// (186067)
if (fi.isDir()) {
typedef QHash<MacroName, Macro> Macros;
typedef QVector<MacroName> MacroSafeSet;
+typedef QByteArray IncludePath;
class Preprocessor : public Parser
{
public:
Preprocessor(){}
static bool preprocessOnly;
- struct IncludePath
- {
- inline explicit IncludePath(const QByteArray &_path)
- : path(_path) {}
- QByteArray path;
- };
QList<IncludePath> includes;
- QList<QByteArray> frameworks;
QSet<QByteArray> preprocessedIncludes;
Macros macros;
Symbols preprocessed(const QByteArray &filename, FILE *file);
struct Symbol
{
-
#ifdef USE_LEXEM_STORE
typedef QHash<SubArray, QHashDummyValue> LexemStore;
static LexemStore lexemStore;