Support for PLAIN BB-Code and CODE=rich

app/CodeFormatterApp.php

@@ -3,9 +3,10 @@
 namespace DevCommunityDE\CodeFormatter;
 
 use DevCommunityDE\CodeFormatter\CodeFormatter\CodeFormatter;
+use DevCommunityDE\CodeFormatter\Parser\ElemNode;
+use DevCommunityDE\CodeFormatter\Parser\Node;
 use DevCommunityDE\CodeFormatter\Parser\Parser;
-use DevCommunityDE\CodeFormatter\Parser\PregParser;
-use DevCommunityDE\CodeFormatter\Parser\Token;
+use DevCommunityDE\CodeFormatter\Parser\TextNode;
 
 /**
  * Class CodeFormatterApp.
@@ -22,7 +23,7 @@ class CodeFormatterApp
      */
     public function __construct(Parser $parser = null)
     {
-        $this->parser = $parser ?? new PregParser();
+        $this->parser = $parser ?? new Parser();
     }
 
     /**
@@ -32,17 +33,17 @@ public function __construct(Parser $parser = null)
      */
     public function run()
     {
-        $tokens = $this->parseInput();
+        $nodes = $this->parseInput();
 
-        foreach ($tokens as $token) {
-            echo $this->formatToken($token);
+        foreach ($nodes as $node) {
+            echo $this->formatNode($node);
         }
     }
 
     /**
      * parses the code from stdin.
      *
-     * @return iterable<Token>
+     * @return iterable<Node>
      */
     private function parseInput(): iterable
     {
@@ -52,39 +53,64 @@ private function parseInput(): iterable
     /**
      * formats a token based on its type and language.
      *
-     * @param Token $token
+     * @param Node $node
      *
      * @return string
      */
-    private function formatToken(Token $token): string
+    private function formatNode(Node $node): string
     {
-        if ($token->isText()) {
-            return $token->getBody();
+        if ($node instanceof TextNode) {
+            return $node->getBody();
         }
 
-        $language = $token->getAttribute('lang');
-        \assert(null !== $language);
+        \assert($node instanceof ElemNode);
 
+        if (!$node->isCode()) {
+            // export node as-is (PLAIN bbcode)
+            return $this->exportNode($node, null);
+        }
+
+        $language = $this->detectLang($node);
         $formatter = CodeFormatter::create($language);
         if (null === $formatter) {
-            // no formatter found, return token as is
-            return $this->exportToken($token, null);
+            // no formatter found, return node as is
+            return $this->exportNode($node, null);
+        }
+
+        $result = $formatter->exec($node->getBody());
+        return $this->exportNode($node, $result);
+    }
+
+    /**
+     * detect a code-language form the given node.
+     *
+     * @param ElemNode $node
+     *
+     * @return string
+     */
+    private function detectLang(ElemNode $node): string
+    {
+        $value = $node->getAttr('lang');
+
+        if (empty($value)) {
+            // check if a immediate value is set
+            // (this is the [code=lang] notation)
+            $value = $node->getAttr('@value');
         }
 
-        $result = $formatter->exec($token->getBody());
-        return $this->exportToken($token, $result);
+        return $value ?: 'text';
     }
 
     /**
-     * exports a token.
+     * exports a node.
      *
-     * @param Token       $token
+     * @param Node        $node
      * @param string|null $body
      *
      * @return string
      */
-    private function exportToken(Token $token, ?string $body): string
+    private function exportNode(Node $node, ?string $body): string
     {
-        return $this->parser->exportToken($token, $body);
+        return $this->parser->exportNode($node, $body);
     }
 }

app/Parser/ElemAttrs.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+namespace DevCommunityDE\CodeFormatter\Parser;
+
+/**
+ * this class represents element attributes in a
+ * raw (match) and a tokenized (pairs) form.
+ *
+ * @internal
+ */
+final class ElemAttrs
+{
+    /** @var string */
+    private $match;
+
+    /** @var array */
+    private $pairs;
+
+    /**
+     * constructor.
+     *
+     * @param string               $match
+     * @param array<string,string> $pairs
+     */
+    public function __construct(string $match, array $pairs)
+    {
+        $this->match = $match;
+        $this->pairs = $pairs;
+    }
+
+    /**
+     * returns a value.
+     *
+     * @param string $name
+     *
+     * @return string|null
+     */
+    public function getValue(string $name): ?string
+    {
+        return $this->pairs[$name] ?? null;
+    }
+
+    /**
+     * returns the matched attribute string.
+     *
+     * @return string
+     */
+    public function getMatch(): string
+    {
+        return $this->match;
+    }
+
+    /**
+     * checks if some attributes are set.
+     *
+     * @return bool
+     */
+    public function hasMatch(): bool
+    {
+        return !empty($this->match);
+    }
+
+    /**
+     * returns the matched attributes as string.
+     *
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->match;
+    }
+}

app/Parser/ElemNode.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+namespace DevCommunityDE\CodeFormatter\Parser;
+
+/**
+ * this class represents a bbcode.
+ */
+final class ElemNode extends Node
+{
+    /** @var string */
+    private $name;
+
+    /** @var ElemAttrs */
+    private $attrs;
+
+    /**
+     * constructs a new code-token.
+     *
+     * @param string    $name
+     * @param ElemAttrs $attrs
+     * @param string    $body
+     */
+    public function __construct(string $name, ElemAttrs $attrs, string $body)
+    {
+        parent::__construct(Node::KIND_ELEM, $body);
+        $this->name = $name;
+        $this->attrs = $attrs;
+    }
+
+    /**
+     * checks if this node represents a [CODE] bbcode.
+     *
+     * @return bool
+     */
+    public function isCode(): bool
+    {
+        return !strcasecmp($this->name, 'code');
+    }
+
+    /**
+     * returns the element name.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * returns the node attributes.
+     *
+     * @return ElemAttrs
+     */
+    public function getAttrs(): ElemAttrs
+    {
+        return $this->attrs;
+    }
+
+    /**
+     * returns a single node attribute.
+     *
+     * @param string $name
+     *
+     * @return string|null
+     */
+    public function getAttr(string $name): ?string
+    {
+        return $this->attrs->getValue($name);
+    }
+}

app/Parser/Node.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DevCommunityDE\CodeFormatter\Parser;
+
+abstract class Node
+{
+    /** text node */
+    public const KIND_TEXT = 1;
+
+    /** element node (bbcode) */
+    public const KIND_ELEM = 2;
+
+    /** @var int */
+    private $kind;
+
+    /** @var string */
+    private $body;
+
+    /**
+     * constructs a new token.
+     *
+     * @param int    $kind
+     * @param string $body
+     */
+    public function __construct(int $kind, string $body)
+    {
+        $this->kind = $kind;
+        $this->body = $body;
+    }
+
+    /**
+     * @see Token::getKind()
+     *
+     * @return int
+     */
+    public function getKind(): int
+    {
+        return $this->kind;
+    }
+
+    /**
+     * @see Token::getBody()
+     *
+     * @return string
+     */
+    public function getBody(): string
+    {
+        return $this->body;
+    }
+}