Skip to content
This repository was archived by the owner on Feb 24, 2024. It is now read-only.

Put system pragmas at the top of the output file #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/parse/CppFileMerger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ export default class CppFileMerger {
.sort((a, b) => a.localeCompare(b))
.map(file => `#include <${file}>`)
.join(EOL);
const systemPragmas = Array.from(this.parser.getSystemPragmas())
.sort((a, b) => a.localeCompare(b))
.map(setting => `#pragma ${setting}`)
.join(EOL);

const finalContent = [
systemPragmas,
systemIncludesContent,
content,
sourceFilesContent
Expand Down
12 changes: 12 additions & 0 deletions src/parse/CppFileParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ export default class CppFileParser {
private static readonly localIncludeRegExp = /^#include "([^"]+)"/;
private static readonly systemIncludeRegExp = /^#include <([^>]+)>/;
private static readonly pragmaOnceRegExp = /^#pragma once/;
private static readonly pragmaRegExp = /^#pragma (.+)/;
private systemPragmas = new Set<string>();

public getSystemPragmas(): Set<string> {
return this.systemPragmas;
}

public parse(fileContent: string): ParseResult {
const fileLines = fileContent.split(EOL);
Expand All @@ -26,6 +32,12 @@ export default class CppFileParser {
continue;
}

const systemPragma = CppFileParser.pragmaRegExp.exec(line)?.[1];
if (systemPragma) {
this.systemPragmas.add(systemPragma);
continue;
}

const systemInclude = CppFileParser.systemIncludeRegExp.exec(line)?.[1];
if (systemInclude) {
systemIncludes.add(systemInclude);
Expand Down