From f8407303f34c453cd0a879c93c120e8afd22c9d2 Mon Sep 17 00:00:00 2001 From: eas4ai Date: Mon, 19 Oct 2026 20:14:15 -0400 Subject: [PATCH 1/2] Add C and C++ syntax highlighting --- src/Highlighter.php | 4 + src/Languages/C/CLanguage.php | 44 ++++++ src/Languages/C/Patterns/CKeywordPattern.php | 24 ++++ src/Languages/C/Patterns/CLiteralPattern.php | 24 ++++ src/Languages/C/Patterns/CNumberPattern.php | 24 ++++ src/Languages/C/Patterns/CStringPattern.php | 24 ++++ src/Languages/C/Patterns/CTypePattern.php | 24 ++++ .../CLike/Patterns/CLikeCommentPattern.php | 24 ++++ .../CLike/Patterns/CLikeFunctionPattern.php | 24 ++++ .../CLike/Patterns/CLikeIncludePattern.php | 24 ++++ .../CLike/Patterns/CLikeOperatorPattern.php | 24 ++++ .../CLikePreprocessorKeywordPattern.php | 24 ++++ src/Languages/Cpp/CppLanguage.php | 50 +++++++ .../Cpp/Patterns/CppKeywordPattern.php | 24 ++++ .../Cpp/Patterns/CppLiteralPattern.php | 24 ++++ .../Cpp/Patterns/CppNumberPattern.php | 24 ++++ .../Cpp/Patterns/CppStringPattern.php | 24 ++++ src/Languages/Cpp/Patterns/CppTypePattern.php | 24 ++++ tests/Bench/Fixtures/c.txt | 25 ++++ tests/Bench/Fixtures/cpp.txt | 33 +++++ tests/Bench/HighlighterBench.php | 2 + tests/Languages/C/CLanguageTest.php | 113 ++++++++++++++++ tests/Languages/Cpp/CppLanguageTest.php | 125 ++++++++++++++++++ 23 files changed, 756 insertions(+) create mode 100644 src/Languages/C/CLanguage.php create mode 100644 src/Languages/C/Patterns/CKeywordPattern.php create mode 100644 src/Languages/C/Patterns/CLiteralPattern.php create mode 100644 src/Languages/C/Patterns/CNumberPattern.php create mode 100644 src/Languages/C/Patterns/CStringPattern.php create mode 100644 src/Languages/C/Patterns/CTypePattern.php create mode 100644 src/Languages/CLike/Patterns/CLikeCommentPattern.php create mode 100644 src/Languages/CLike/Patterns/CLikeFunctionPattern.php create mode 100644 src/Languages/CLike/Patterns/CLikeIncludePattern.php create mode 100644 src/Languages/CLike/Patterns/CLikeOperatorPattern.php create mode 100644 src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php create mode 100644 src/Languages/Cpp/CppLanguage.php create mode 100644 src/Languages/Cpp/Patterns/CppKeywordPattern.php create mode 100644 src/Languages/Cpp/Patterns/CppLiteralPattern.php create mode 100644 src/Languages/Cpp/Patterns/CppNumberPattern.php create mode 100644 src/Languages/Cpp/Patterns/CppStringPattern.php create mode 100644 src/Languages/Cpp/Patterns/CppTypePattern.php create mode 100644 tests/Bench/Fixtures/c.txt create mode 100644 tests/Bench/Fixtures/cpp.txt create mode 100644 tests/Languages/C/CLanguageTest.php create mode 100644 tests/Languages/Cpp/CppLanguageTest.php diff --git a/src/Highlighter.php b/src/Highlighter.php index 843cf5b6..8e5bfe74 100644 --- a/src/Highlighter.php +++ b/src/Highlighter.php @@ -10,6 +10,8 @@ use Tempest\Highlight\Languages\Bash\BashLanguage; use Tempest\Highlight\Languages\BBCode\BBCodeLanguage; use Tempest\Highlight\Languages\Blade\BladeLanguage; +use Tempest\Highlight\Languages\C\CLanguage; +use Tempest\Highlight\Languages\Cpp\CppLanguage; use Tempest\Highlight\Languages\Css\CssLanguage; use Tempest\Highlight\Languages\Diff\DiffLanguage; use Tempest\Highlight\Languages\DocComment\DocCommentLanguage; @@ -72,6 +74,8 @@ public function __construct( ->addLanguage(new BashLanguage()) ->addLanguage(new BBCodeLanguage()) ->addLanguage(new BladeLanguage()) + ->addLanguage(new CLanguage()) + ->addLanguage(new CppLanguage()) ->addLanguage(new CssLanguage()) ->addLanguage(new DiffLanguage()) ->addLanguage(new DocCommentLanguage()) diff --git a/src/Languages/C/CLanguage.php b/src/Languages/C/CLanguage.php new file mode 100644 index 00000000..b51426ab --- /dev/null +++ b/src/Languages/C/CLanguage.php @@ -0,0 +1,44 @@ +_Alignas|_Alignof|_Atomic|_Generic|_Noreturn|_Static_assert|_Thread_local|alignas|alignof|auto|break|case|const|continue|default|do|else|enum|extern|for|goto|if|inline|register|restrict|return|sizeof|static|static_assert|struct|switch|thread_local|typedef|typeof|typeof_unqual|union|volatile|while)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/C/Patterns/CLiteralPattern.php b/src/Languages/C/Patterns/CLiteralPattern.php new file mode 100644 index 00000000..179181b9 --- /dev/null +++ b/src/Languages/C/Patterns/CLiteralPattern.php @@ -0,0 +1,24 @@ +NULL|false|true)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::LITERAL; + } +} diff --git a/src/Languages/C/Patterns/CNumberPattern.php b/src/Languages/C/Patterns/CNumberPattern.php new file mode 100644 index 00000000..2b358fd1 --- /dev/null +++ b/src/Languages/C/Patterns/CNumberPattern.php @@ -0,0 +1,24 @@ +(?:0[xX][\dA-Fa-f]+(?:\.[\dA-Fa-f]*)?(?:[pP][+-]?\d+)?|0[bB][01]+|(?:\d+\.\d*|\.\d+|\d+)(?:[eE][+-]?\d+)?)(?:[uU](?:ll|LL|l|L)?|(?:ll|LL|l|L)[uU]?|[fFlL])?)(?![\w.])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::NUMBER; + } +} diff --git a/src/Languages/C/Patterns/CStringPattern.php b/src/Languages/C/Patterns/CStringPattern.php new file mode 100644 index 00000000..d211cf30 --- /dev/null +++ b/src/Languages/C/Patterns/CStringPattern.php @@ -0,0 +1,24 @@ +(?:u8|u|U|L)?"(?:\\\\.|[^"\\\\\r\n]++)*"|(?:u|U|L)?\'(?:\\\\.|[^\'\\\\\r\n]++)+\')/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/C/Patterns/CTypePattern.php b/src/Languages/C/Patterns/CTypePattern.php new file mode 100644 index 00000000..5a01f09f --- /dev/null +++ b/src/Languages/C/Patterns/CTypePattern.php @@ -0,0 +1,24 @@ +(?<=\bstruct\s)[A-Za-z_]\w*|(?<=\bunion\s)[A-Za-z_]\w*|(?<=\benum\s)[A-Za-z_]\w*|\b[A-Z](?=[A-Za-z0-9_]*[a-z])[A-Za-z0-9_]*\b|\b[A-Za-z_]\w*\b(?=\s+(?:\*+\s*)?[A-Za-z_]\w*\s*(?:\(|\[|=|,|;))|\b(?:_Bool|_Complex|_Decimal32|_Decimal64|_Decimal128|char|double|float|int|long|short|signed|unsigned|void)\b)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::TYPE; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeCommentPattern.php b/src/Languages/CLike/Patterns/CLikeCommentPattern.php new file mode 100644 index 00000000..c243b3cb --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeCommentPattern.php @@ -0,0 +1,24 @@ +\/\/[^\r\n]*|\/\*(?:[^*]++|\*(?!\/))*+\*\/)/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::COMMENT; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeFunctionPattern.php b/src/Languages/CLike/Patterns/CLikeFunctionPattern.php new file mode 100644 index 00000000..4fabe703 --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeFunctionPattern.php @@ -0,0 +1,24 @@ +[A-Za-z_]\w*)(?=\s*\()'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::PROPERTY; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeIncludePattern.php b/src/Languages/CLike/Patterns/CLikeIncludePattern.php new file mode 100644 index 00000000..c7c53a6b --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeIncludePattern.php @@ -0,0 +1,24 @@ +<[^>\r\n]++>|"(?:\\\\.|[^"\\\\\r\n]++)*")/m'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeOperatorPattern.php b/src/Languages/CLike/Patterns/CLikeOperatorPattern.php new file mode 100644 index 00000000..950fd843 --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeOperatorPattern.php @@ -0,0 +1,24 @@ +<=>|->\*|<<=?|>>=?|\+\+|--|&&|\|\||==|!=|<=|>=|->|::|\.\*|\.\.\.|[-+*\/%&|^~!<>=]=?|[?:;,.{}()\[\]])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::OPERATOR; + } +} diff --git a/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php b/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php new file mode 100644 index 00000000..69b64fbd --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php @@ -0,0 +1,24 @@ +include_next|include|define|undef|ifdef|ifndef|if|elif|else|endif|line|error|warning|pragma)\b/m'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/Cpp/CppLanguage.php b/src/Languages/Cpp/CppLanguage.php new file mode 100644 index 00000000..71120104 --- /dev/null +++ b/src/Languages/Cpp/CppLanguage.php @@ -0,0 +1,50 @@ +alignas|alignof|asm|auto|break|case|catch|class|concept|const|consteval|constexpr|constinit|const_cast|continue|co_await|co_return|co_yield|decltype|default|delete|do|dynamic_cast|else|enum|explicit|export|extern|for|friend|goto|if|inline|mutable|namespace|new|noexcept|operator|private|protected|public|register|reinterpret_cast|requires|return|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|using|virtual|volatile|while)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/Cpp/Patterns/CppLiteralPattern.php b/src/Languages/Cpp/Patterns/CppLiteralPattern.php new file mode 100644 index 00000000..e722aa56 --- /dev/null +++ b/src/Languages/Cpp/Patterns/CppLiteralPattern.php @@ -0,0 +1,24 @@ +NULL|false|nullptr|true)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::LITERAL; + } +} diff --git a/src/Languages/Cpp/Patterns/CppNumberPattern.php b/src/Languages/Cpp/Patterns/CppNumberPattern.php new file mode 100644 index 00000000..7d0b8362 --- /dev/null +++ b/src/Languages/Cpp/Patterns/CppNumberPattern.php @@ -0,0 +1,24 @@ +(?:0[xX][\dA-Fa-f](?:\'?[\dA-Fa-f])*(?:\.[\dA-Fa-f](?:\'?[\dA-Fa-f])*)?(?:[pP][+-]?\d(?:\'?\d)*)?|0[bB][01](?:\'?[01])*|(?:\d(?:\'?\d)*(?:\.\d(?:\'?\d)*)?|\.\d(?:\'?\d)*)(?:[eE][+-]?\d(?:\'?\d)*)?)(?:[uU](?:ll|LL|l|L)?|(?:ll|LL|l|L)[uU]?|[fFlLzZ])?)(?![\w.])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::NUMBER; + } +} diff --git a/src/Languages/Cpp/Patterns/CppStringPattern.php b/src/Languages/Cpp/Patterns/CppStringPattern.php new file mode 100644 index 00000000..b987a229 --- /dev/null +++ b/src/Languages/Cpp/Patterns/CppStringPattern.php @@ -0,0 +1,24 @@ +(?:u8|u|U|L)?R"(?[^ ()\\\\\t\r\n]{0,16})\([\s\S]*?\)\k"|(?:u8|u|U|L)?"(?:\\\\.|[^"\\\\\r\n]++)*"|(?:u8|u|U|L)?\'(?:\\\\.|[^\'\\\\\r\n]++)+\')/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/Cpp/Patterns/CppTypePattern.php b/src/Languages/Cpp/Patterns/CppTypePattern.php new file mode 100644 index 00000000..0070540d --- /dev/null +++ b/src/Languages/Cpp/Patterns/CppTypePattern.php @@ -0,0 +1,24 @@ +(?<=\bclass\s)[A-Za-z_]\w*|(?<=\bstruct\s)[A-Za-z_]\w*|(?<=\bunion\s)[A-Za-z_]\w*|(?<=\benum\s)[A-Za-z_]\w*|(?<=\bnamespace\s)[A-Za-z_]\w*|(?<=\btypename\s)[A-Za-z_]\w*|\b[A-Za-z_]\w*\b(?=\s*::)|\b[A-Za-z_]\w*\b(?=\s*(?:[*&]+\s*)+[A-Za-z_]\w*\b|\s+[A-Za-z_]\w*\s*(?:\(|\[|\{|=|,|;|$))|\b(?:bool|char|char8_t|char16_t|char32_t|double|float|int|long|short|signed|unsigned|void|wchar_t)\b)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::TYPE; + } +} diff --git a/tests/Bench/Fixtures/c.txt b/tests/Bench/Fixtures/c.txt new file mode 100644 index 00000000..755a5924 --- /dev/null +++ b/tests/Bench/Fixtures/c.txt @@ -0,0 +1,25 @@ +#include +#include + +typedef struct Result { + const char *label; + unsigned long value; +} Result; + +static Result make_result(const char *label, unsigned long value) +{ + return (Result) { + .label = label, + .value = value, + }; +} + +int main(void) +{ + const Result result = make_result("answer", 42ULL); + + // C strings, types, declarations, and member access. + printf("%s: %lu\n", result.label, result.value); + + return result.value == 42ULL ? 0 : 1; +} diff --git a/tests/Bench/Fixtures/cpp.txt b/tests/Bench/Fixtures/cpp.txt new file mode 100644 index 00000000..d77ff338 --- /dev/null +++ b/tests/Bench/Fixtures/cpp.txt @@ -0,0 +1,33 @@ +#include +#include +#include + +namespace demo { + +template +concept Printable = requires(const T& value) { + value.render(); +}; + +class Result final { +public: + constexpr Result(std::string label, unsigned long value) + : label_(std::move(label)), value_(value) {} + + [[nodiscard]] std::string render() const { + return label_ + ": " + std::to_string(value_); + } + +private: + std::string label_; + unsigned long value_; +}; + +} // namespace demo + +int main() +{ + constexpr auto value = 1'000ULL; + const demo::Result result{R"(answer)", value}; + return result.render().empty() ? 1 : 0; +} diff --git a/tests/Bench/HighlighterBench.php b/tests/Bench/HighlighterBench.php index 154b03c3..6b8d9366 100644 --- a/tests/Bench/HighlighterBench.php +++ b/tests/Bench/HighlighterBench.php @@ -21,6 +21,8 @@ final class HighlighterBench 'bash' => 'bash.txt', 'bbcode' => 'bbcode.txt', 'blade' => 'blade.txt', + 'c' => 'c.txt', + 'cpp' => 'cpp.txt', 'css' => 'css.txt', 'diff' => 'diff.txt', 'dockerfile' => 'dockerfile.txt', diff --git a/tests/Languages/C/CLanguageTest.php b/tests/Languages/C/CLanguageTest.php new file mode 100644 index 00000000..53faead7 --- /dev/null +++ b/tests/Languages/C/CLanguageTest.php @@ -0,0 +1,113 @@ +assertContains('c', $highlighter->getSupportedLanguageNames()); + + $highlighter->parse('', 'c'); + + $this->assertInstanceOf(CLanguage::class, $highlighter->getCurrentLanguage()); + } + + #[Test] + #[DataProvider('provide_it_highlights_representative_syntax_cases')] + public function it_highlights_representative_syntax(string $source, string $expected): void + { + $highlighted = (new Highlighter())->parse($source, 'c'); + + $this->assertStringContainsString($expected, $highlighted); + } + + public static function provide_it_highlights_representative_syntax_cases(): iterable + { + yield 'line comment' => ['// note', '// note']; + yield 'block comment' => ['/* note */', '/* note */']; + yield 'preprocessor directive' => ['#include ', 'include']; + yield 'include path' => ['#include ', '<stdio.h>']; + yield 'string' => ['"hello\\n"', '"hello\\n"']; + yield 'character' => ["'x'", '\'x\'']; + yield 'number' => ['42ULL', '42ULL']; + yield 'keyword' => ['return', 'return']; + yield 'storage qualifier' => ['static', 'static']; + yield 'built-in type' => ['int', 'int']; + yield 'declared type' => ['struct Packet { int id; };', 'Packet']; + yield 'typedef alias' => ['typedef unsigned long Result;', 'Result']; + yield 'typedef use' => ['Result make_result(void);', 'Result']; + yield 'typedef cast' => ['return (Result) value;', 'Result']; + yield 'literal' => ['NULL', 'NULL']; + yield 'function' => ['render();', 'render']; + yield 'operator' => ['node->next', '->']; + yield 'punctuation' => ['return 0;', ';']; + } + + #[Test] + public function it_highlights_declared_types_in_the_benchmark_fixture(): void + { + $source = (string) file_get_contents(__DIR__ . '/../../Bench/Fixtures/c.txt'); + $highlighted = (new Highlighter())->parse($source, 'c'); + + $this->assertSame(5, substr_count($highlighted, 'Result')); + } + + #[Test] + public function it_escapes_html_and_strips_reserved_markers(): void + { + $source = "#include \r\n" + . "const char *markup = \"<©> ❷img src=x onerror=alert(1)❸ ❶❹❿\";\r" + . "const char *script = \"\";\r\n"; + + $highlighted = (new Highlighter())->parse($source, 'c'); + $renderedSource = html_entity_decode(strip_tags($highlighted), ENT_QUOTES | ENT_HTML5); + + $expectedSource = str_replace(["\r\n", "\r"], "\n", str_replace(['❶', '❷', '❸', '❹', '❿'], '', $source)); + + $this->assertSame($expectedSource, $renderedSource); + $this->assertStringNotContainsString('\";\r\n"; + + $highlighted = (new Highlighter())->parse($source, 'cpp'); + $renderedSource = html_entity_decode(strip_tags($highlighted), ENT_QUOTES | ENT_HTML5); + + $expectedSource = str_replace(["\r\n", "\r"], "\n", str_replace(['❶', '❷', '❸', '❹', '❿'], '', $source)); + + $this->assertSame($expectedSource, $renderedSource); + $this->assertStringNotContainsString('