30a6f276fd
Remove the dependency on Action and Service from what should be a generic Parser class. Make ActionParser, ImportParser, and ServiceParser take a pointer to their associated classes instead of accessing them through a singleton. Misc fixes to SectionParser Interface: 1) Make SectionParser::ParseLineSection() non-const as it always should have been. 2) Use Rvalue references where appropriate 3) Remove extra std::string& filename in SectionParser::EndFile() 4) Only have SectionParser::ParseSection() as pure virtual Document SectionParser. Make ImportParser report the filename and line number of failed imports. Make ServiceParser report the filename and line number of duplicated services. Test: Boot bullhead Change-Id: I86568a5b375fb4f27f4cb235ed1e37635f01d630
40 lines
1.2 KiB
C++
40 lines
1.2 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _INIT_IMPORT_PARSER_H
|
|
#define _INIT_IMPORT_PARSER_H
|
|
|
|
#include "init_parser.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
class ImportParser : public SectionParser {
|
|
public:
|
|
ImportParser(Parser* parser) : parser_(parser) {}
|
|
bool ParseSection(std::vector<std::string>&& args, const std::string& filename, int line,
|
|
std::string* err) override;
|
|
void EndFile() override;
|
|
|
|
private:
|
|
Parser* parser_;
|
|
// Store filename for later error reporting.
|
|
std::string filename_;
|
|
// Vector of imports and their line numbers for later error reporting.
|
|
std::vector<std::pair<std::string, int>> imports_;
|
|
};
|
|
|
|
#endif
|