pradosoft / prado

framework/3rdParty/SafeHtml/TSafeHtmlParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
     /**
      * Closing tag handler - called from HTMLSax
      *
-     * @param object $parsers HTML parser
+     * @param object $parser HTML parser
      * @param string $name    tag name
      * @return boolean
      * @access private

Indentation +614 added lines, -614 removed lines

@@ -57,622 +57,622 @@
  */
 class TSafeHtmlParser
 {
-    /**
-     * Storage for resulting HTML output
-     *
-     * @var string
-     * @access private
-     */
-    private $_xhtml = '';
-
-    /**
-     * Array of counters for each tag
-     *
-     * @var array
-     * @access private
-     */
-    private $_counter = array();
-
-    /**
-     * Stack of unclosed tags
-     *
-     * @var array
-     * @access private
-     */
-    private $_stack = array();
-
-    /**
-     * Array of counters for tags that must be deleted with all content
-     *
-     * @var array
-     * @access private
-     */
-    private $_dcCounter = array();
-
-    /**
-     * Stack of unclosed tags that must be deleted with all content
-     *
-     * @var array
-     * @access private
-     */
-    private $_dcStack = array();
-
-    /**
-     * Stores level of list (ol/ul) nesting
-     *
-     * @var int
-     * @access private
-     */
-    private $_listScope = 0;
-
-    /**
-     * Stack of unclosed list tags
-     *
-     * @var array
-     * @access private
-     */
-    private $_liStack = array();
-
-    /**
-     * Array of prepared regular expressions for protocols (schemas) matching
-     *
-     * @var array
-     * @access private
-     */
-    private $_protoRegexps = array();
-
-    /**
-     * Array of prepared regular expressions for CSS matching
-     *
-     * @var array
-     * @access private
-     */
-    private $_cssRegexps = array();
-
-    /**
-     * List of single tags ("<tag />")
-     *
-     * @var array
-     * @access public
-     */
-    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
-
-    /**
-     * List of dangerous tags (such tags will be deleted)
-     *
-     * @var array
-     * @access public
-     */
-    public $deleteTags = array(
-        'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
-        'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
-        'iframe', 'layer',  'link',     'meta',    'object', 'style',
-        'title',  'script',
-        );
-
-    /**
-     * List of dangerous tags (such tags will be deleted, and all content
-     * inside this tags will be also removed)
-     *
-     * @var array
-     * @access public
-     */
-    public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
-
-    /**
-     * Type of protocols filtering ('white' or 'black')
-     *
-     * @var string
-     * @access public
-     */
-    public $protocolFiltering = 'white';
-
-    /**
-     * List of "dangerous" protocols (used for blacklist-filtering)
-     *
-     * @var array
-     * @access public
-     */
-    public $blackProtocols = array(
-        'about',   'chrome',     'data',       'disk',     'hcp',
-        'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
-        'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
-        'res',     'resource',   'shell',      'vbscript', 'view-source',
-        'vnd.ms.radio',          'wysiwyg',
-        );
-
-    /**
-     * List of "safe" protocols (used for whitelist-filtering)
-     *
-     * @var array
-     * @access public
-     */
-    public $whiteProtocols = array(
-        'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
-        'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
-        'xmpp',   'callto',
-        );
-
-    /**
-     * List of attributes that can contain protocols
-     *
-     * @var array
-     * @access public
-     */
-    public $protocolAttributes = array(
-        'action', 'background', 'codebase', 'dynsrc', 'href', 'lowsrc', 'src',
-        );
-
-    /**
-     * List of dangerous CSS keywords
-     *
-     * Whole style="" attribute will be removed, if parser will find one of
-     * these keywords
-     *
-     * @var array
-     * @access public
-     */
-    public $cssKeywords = array(
-        'absolute', 'behavior',       'behaviour',   'content', 'expression',
-        'fixed',    'include-source', 'moz-binding',
-        );
-
-    /**
-     * List of tags that can have no "closing tag"
-     *
-     * @var array
-     * @access public
-     * @deprecated XHTML does not allow such tags
-     */
-    public $noClose = array();
-
-    /**
-     * List of block-level tags that terminates paragraph
-     *
-     * Paragraph will be closed when this tags opened
-     *
-     * @var array
-     * @access public
-     */
-    public $closeParagraph = array(
-        'address', 'blockquote', 'center', 'dd',      'dir',       'div',
-        'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
-        'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
-        'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
-        'table',   'ul',         'xmp',
-        );
-
-    /**
-     * List of table tags, all table tags outside a table will be removed
-     *
-     * @var array
-     * @access public
-     */
-    public $tableTags = array(
-        'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead',   'tr',
-        );
-
-    /**
-     * List of list tags
-     *
-     * @var array
-     * @access public
-     */
-    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
-
-    /**
-     * List of dangerous attributes
-     *
-     * @var array
-     * @access public
-     */
-    public $attributes = array('dynsrc');
-    //public $attributes = array('dynsrc', 'id', 'name', ); //id and name are dangerous?
-
-    /**
-     * List of allowed "namespaced" attributes
-     *
-     * @var array
-     * @access public
-     */
-    public $attributesNS = array('xml:lang', );
-
-    /**
-     * Constructs class
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        //making regular expressions based on Proto & CSS arrays
-        foreach ($this->blackProtocols as $proto) {
-            $preg = "/[\s\x01-\x1F]*";
-            for ($i=0; $i<strlen($proto); $i++) {
-                $preg .= $proto{$i} . "[\s\x01-\x1F]*";
-            }
-            $preg .= ":/i";
-            $this->_protoRegexps[] = $preg;
-        }
-
-        foreach ($this->cssKeywords as $css) {
-            $this->_cssRegexps[] = '/' . $css . '/i';
-        }
-        return true;
-    }
-
-    /**
-     * Handles the writing of attributes - called from $this->_openHandler()
-     *
-     * @param array $attrs array of attributes $name => $value
-     * @return boolean
-     * @access private
-     */
-    private function _writeAttrs ($attrs)
-    {
-        if (is_array($attrs)) {
-            foreach ($attrs as $name => $value) {
-
-                $name = strtolower($name);
-
-                if (strpos($name, 'on') === 0) {
-                    continue;
-                }
-                if (strpos($name, 'data') === 0) {
-                    continue;
-                }
-                if (in_array($name, $this->attributes)) {
-                    continue;
-                }
-                if (!preg_match("/^[a-z0-9]+$/i", $name)) {
-                    if (!in_array($name, $this->attributesNS))
-                    {
-                        continue;
-                    }
-                }
-
-                if (($value === TRUE) || (is_null($value))) {
-                    $value = $name;
-                }
-
-                if ($name == 'style') {
-
-                   // removes insignificant backslahes
-                   $value = str_replace("\\", '', $value);
-
-                   // removes CSS comments
-                   while (1)
-                   {
-                     $_value = preg_replace("!/\*.*?\*/!s", '', $value);
-                     if ($_value == $value) break;
-                     $value = $_value;
-                   }
-
-                   // replace all & to &amp;
-                   $value = str_replace('&amp;', '&', $value);
-                   $value = str_replace('&', '&amp;', $value);
-
-                   foreach ($this->_cssRegexps as $css) {
-                       if (preg_match($css, $value)) {
-                           continue 2;
-                       }
-                   }
-                   foreach ($this->_protoRegexps as $proto) {
-                       if (preg_match($proto, $value)) {
-                           continue 2;
-                       }
-                   }
-                }
-
-                $tempval = preg_replace_callback(
-                        '/&#(\d+);?/m',
-                        function ($matches) {
-                            return chr($matches[0]);
-                        },
-                        $value
-                    ); //"'
-
-                $tempval = preg_replace_callback(
-                        '/&#x([0-9a-f]+);?/mi',
-                        function ($matches) {
-                            return chr(hexdec($matches[0]));
-                        },
-                        $tempval
-                    );
-
-                if ((in_array($name, $this->protocolAttributes)) &&
-                    (strpos($tempval, ':') !== false))
-                {
-                    if ($this->protocolFiltering == 'black') {
-                        foreach ($this->_protoRegexps as $proto) {
-                            if (preg_match($proto, $tempval)) continue 2;
-                        }
-                    } else {
-                        $_tempval = explode(':', $tempval);
-                        $proto = $_tempval[0];
-                        if (!in_array($proto, $this->whiteProtocols)) {
-                            continue;
-                        }
-                    }
-                }
-
-                $value = str_replace("\"", "&quot;", $value);
-                $this->_xhtml .= ' ' . $name . '="' . $value . '"';
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Opening tag handler - called from HTMLSax
-     *
-     * @param object $parser HTML Parser
-     * @param string $name   tag name
-     * @param array  $attrs  tag attributes
-     * @return boolean
-     * @access private
-     */
-    public function _openHandler(&$parser, $name, $attrs)
-    {
-        $name = strtolower($name);
-
-        if (in_array($name, $this->deleteTagsContent)) {
-            array_push($this->_dcStack, $name);
-            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
-        }
-        if (count($this->_dcStack) != 0) {
-            return true;
-        }
-
-        if (in_array($name, $this->deleteTags)) {
-            return true;
-        }
-
-        if (!preg_match("/^[a-z0-9]+$/i", $name)) {
-            if (preg_match("!(?:\@|://)!i", $name)) {
-                $this->_xhtml .= '&lt;' . $name . '&gt;';
-            }
-            return true;
-        }
-
-        if (in_array($name, $this->singleTags)) {
-            $this->_xhtml .= '<' . $name;
-            $this->_writeAttrs($attrs);
-            $this->_xhtml .= ' />';
-            return true;
-        }
-
-        // TABLES: cannot open table elements when we are not inside table
-        if ((isset($this->_counter['table'])) && ($this->_counter['table'] <= 0)
-            && (in_array($name, $this->tableTags)))
-        {
-            return true;
-        }
-
-        // PARAGRAPHS: close paragraph when closeParagraph tags opening
-        if ((in_array($name, $this->closeParagraph)) && (in_array('p', $this->_stack))) {
-            $this->_closeHandler($parser, 'p');
-        }
-
-        // LISTS: we should close <li> if <li> of the same level opening
-        if ($name == 'li' && count($this->_liStack) &&
-            $this->_listScope == $this->_liStack[count($this->_liStack)-1])
-        {
-            $this->_closeHandler($parser, 'li');
-        }
-
-        // LISTS: we want to know on what nesting level of lists we are
-        if (in_array($name, $this->listTags)) {
-            $this->_listScope++;
-        }
-        if ($name == 'li') {
-            array_push($this->_liStack, $this->_listScope);
-        }
-
-        $this->_xhtml .= '<' . $name;
-        $this->_writeAttrs($attrs);
-        $this->_xhtml .= '>';
-        array_push($this->_stack,$name);
-        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
-        return true;
-    }
-
-    /**
-     * Closing tag handler - called from HTMLSax
-     *
-     * @param object $parsers HTML parser
-     * @param string $name    tag name
-     * @return boolean
-     * @access private
-     */
-    public function _closeHandler(&$parser, $name)
-    {
-
-        $name = strtolower($name);
-
-        if (isset($this->_dcCounter[$name]) && ($this->_dcCounter[$name] > 0) &&
-            (in_array($name, $this->deleteTagsContent)))
-        {
-           while ($name != ($tag = array_pop($this->_dcStack))) {
-            $this->_dcCounter[$tag]--;
-           }
-
-           $this->_dcCounter[$name]--;
-        }
-
-        if (count($this->_dcStack) != 0) {
-            return true;
-        }
-
-        if ((isset($this->_counter[$name])) && ($this->_counter[$name] > 0)) {
-           while ($name != ($tag = array_pop($this->_stack))) {
-               $this->_closeTag($tag);
-           }
-
-           $this->_closeTag($name);
-        }
-        return true;
-    }
-
-    /**
-     * Closes tag
-     *
-     * @param string $tag tag name
-     * @return boolean
-     * @access private
-     */
-    public function _closeTag($tag)
-    {
-        if (!in_array($tag, $this->noClose)) {
-            $this->_xhtml .= '</' . $tag . '>';
-        }
-
-        $this->_counter[$tag]--;
-
-        if (in_array($tag, $this->listTags)) {
-            $this->_listScope--;
-        }
-
-        if ($tag == 'li') {
-            array_pop($this->_liStack);
-        }
-        return true;
-    }
-
-    /**
-     * Character data handler - called from HTMLSax
-     *
-     * @param object $parser HTML parser
-     * @param string $data   textual data
-     * @return boolean
-     * @access private
-     */
-    public function _dataHandler(&$parser, $data)
-    {
-        if (count($this->_dcStack) == 0) {
-            $this->_xhtml .= $data;
-        }
-        return true;
-    }
-
-    /**
-     * Escape handler - called from HTMLSax
-     *
-     * @param object $parser HTML parser
-     * @param string $data   comments or other type of data
-     * @return boolean
-     * @access private
-     */
-    public function _escapeHandler(&$parser, $data)
-    {
-        return true;
-    }
-
-    /**
-     * Returns the XHTML document
-     *
-     * @return string Processed (X)HTML document
-     * @access public
-     */
-    public function getXHTML ()
-    {
-        while ($tag = array_pop($this->_stack)) {
-            $this->_closeTag($tag);
-        }
-
-        return $this->_xhtml;
-    }
-
-    /**
-     * Clears current document data
-     *
-     * @return boolean
-     * @access public
-     */
-    public function clear()
-    {
-        $this->_xhtml = '';
-        return true;
-    }
-
-    /**
-     * Main parsing fuction
-     *
-     * @param string $doc HTML document for processing
-     * @return string Processed (X)HTML document
-     * @access public
-     */
-    public function parse($doc, $isUTF7=false)
-    {
+	/**
+	 * Storage for resulting HTML output
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_xhtml = '';
+
+	/**
+	 * Array of counters for each tag
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_counter = array();
+
+	/**
+	 * Stack of unclosed tags
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_stack = array();
+
+	/**
+	 * Array of counters for tags that must be deleted with all content
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_dcCounter = array();
+
+	/**
+	 * Stack of unclosed tags that must be deleted with all content
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_dcStack = array();
+
+	/**
+	 * Stores level of list (ol/ul) nesting
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_listScope = 0;
+
+	/**
+	 * Stack of unclosed list tags
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_liStack = array();
+
+	/**
+	 * Array of prepared regular expressions for protocols (schemas) matching
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_protoRegexps = array();
+
+	/**
+	 * Array of prepared regular expressions for CSS matching
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_cssRegexps = array();
+
+	/**
+	 * List of single tags ("<tag />")
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
+
+	/**
+	 * List of dangerous tags (such tags will be deleted)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $deleteTags = array(
+		'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
+		'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
+		'iframe', 'layer',  'link',     'meta',    'object', 'style',
+		'title',  'script',
+		);
+
+	/**
+	 * List of dangerous tags (such tags will be deleted, and all content
+	 * inside this tags will be also removed)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
+
+	/**
+	 * Type of protocols filtering ('white' or 'black')
+	 *
+	 * @var string
+	 * @access public
+	 */
+	public $protocolFiltering = 'white';
+
+	/**
+	 * List of "dangerous" protocols (used for blacklist-filtering)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $blackProtocols = array(
+		'about',   'chrome',     'data',       'disk',     'hcp',
+		'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
+		'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
+		'res',     'resource',   'shell',      'vbscript', 'view-source',
+		'vnd.ms.radio',          'wysiwyg',
+		);
+
+	/**
+	 * List of "safe" protocols (used for whitelist-filtering)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $whiteProtocols = array(
+		'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
+		'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
+		'xmpp',   'callto',
+		);
+
+	/**
+	 * List of attributes that can contain protocols
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $protocolAttributes = array(
+		'action', 'background', 'codebase', 'dynsrc', 'href', 'lowsrc', 'src',
+		);
+
+	/**
+	 * List of dangerous CSS keywords
+	 *
+	 * Whole style="" attribute will be removed, if parser will find one of
+	 * these keywords
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $cssKeywords = array(
+		'absolute', 'behavior',       'behaviour',   'content', 'expression',
+		'fixed',    'include-source', 'moz-binding',
+		);
+
+	/**
+	 * List of tags that can have no "closing tag"
+	 *
+	 * @var array
+	 * @access public
+	 * @deprecated XHTML does not allow such tags
+	 */
+	public $noClose = array();
+
+	/**
+	 * List of block-level tags that terminates paragraph
+	 *
+	 * Paragraph will be closed when this tags opened
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $closeParagraph = array(
+		'address', 'blockquote', 'center', 'dd',      'dir',       'div',
+		'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
+		'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
+		'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
+		'table',   'ul',         'xmp',
+		);
+
+	/**
+	 * List of table tags, all table tags outside a table will be removed
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $tableTags = array(
+		'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+		'thead',   'tr',
+		);
+
+	/**
+	 * List of list tags
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
+
+	/**
+	 * List of dangerous attributes
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $attributes = array('dynsrc');
+	//public $attributes = array('dynsrc', 'id', 'name', ); //id and name are dangerous?
+
+	/**
+	 * List of allowed "namespaced" attributes
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $attributesNS = array('xml:lang', );
+
+	/**
+	 * Constructs class
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		//making regular expressions based on Proto & CSS arrays
+		foreach ($this->blackProtocols as $proto) {
+			$preg = "/[\s\x01-\x1F]*";
+			for ($i=0; $i<strlen($proto); $i++) {
+				$preg .= $proto{$i} . "[\s\x01-\x1F]*";
+			}
+			$preg .= ":/i";
+			$this->_protoRegexps[] = $preg;
+		}
+
+		foreach ($this->cssKeywords as $css) {
+			$this->_cssRegexps[] = '/' . $css . '/i';
+		}
+		return true;
+	}
+
+	/**
+	 * Handles the writing of attributes - called from $this->_openHandler()
+	 *
+	 * @param array $attrs array of attributes $name => $value
+	 * @return boolean
+	 * @access private
+	 */
+	private function _writeAttrs ($attrs)
+	{
+		if (is_array($attrs)) {
+			foreach ($attrs as $name => $value) {
+
+				$name = strtolower($name);
+
+				if (strpos($name, 'on') === 0) {
+					continue;
+				}
+				if (strpos($name, 'data') === 0) {
+					continue;
+				}
+				if (in_array($name, $this->attributes)) {
+					continue;
+				}
+				if (!preg_match("/^[a-z0-9]+$/i", $name)) {
+					if (!in_array($name, $this->attributesNS))
+					{
+						continue;
+					}
+				}
+
+				if (($value === TRUE) || (is_null($value))) {
+					$value = $name;
+				}
+
+				if ($name == 'style') {
+
+				   // removes insignificant backslahes
+				   $value = str_replace("\\", '', $value);
+
+				   // removes CSS comments
+				   while (1)
+				   {
+					 $_value = preg_replace("!/\*.*?\*/!s", '', $value);
+					 if ($_value == $value) break;
+					 $value = $_value;
+				   }
+
+				   // replace all & to &amp;
+				   $value = str_replace('&amp;', '&', $value);
+				   $value = str_replace('&', '&amp;', $value);
+
+				   foreach ($this->_cssRegexps as $css) {
+					   if (preg_match($css, $value)) {
+						   continue 2;
+					   }
+				   }
+				   foreach ($this->_protoRegexps as $proto) {
+					   if (preg_match($proto, $value)) {
+						   continue 2;
+					   }
+				   }
+				}
+
+				$tempval = preg_replace_callback(
+						'/&#(\d+);?/m',
+						function ($matches) {
+							return chr($matches[0]);
+						},
+						$value
+					); //"'
+
+				$tempval = preg_replace_callback(
+						'/&#x([0-9a-f]+);?/mi',
+						function ($matches) {
+							return chr(hexdec($matches[0]));
+						},
+						$tempval
+					);
+
+				if ((in_array($name, $this->protocolAttributes)) &&
+					(strpos($tempval, ':') !== false))
+				{
+					if ($this->protocolFiltering == 'black') {
+						foreach ($this->_protoRegexps as $proto) {
+							if (preg_match($proto, $tempval)) continue 2;
+						}
+					} else {
+						$_tempval = explode(':', $tempval);
+						$proto = $_tempval[0];
+						if (!in_array($proto, $this->whiteProtocols)) {
+							continue;
+						}
+					}
+				}
+
+				$value = str_replace("\"", "&quot;", $value);
+				$this->_xhtml .= ' ' . $name . '="' . $value . '"';
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Opening tag handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML Parser
+	 * @param string $name   tag name
+	 * @param array  $attrs  tag attributes
+	 * @return boolean
+	 * @access private
+	 */
+	public function _openHandler(&$parser, $name, $attrs)
+	{
+		$name = strtolower($name);
+
+		if (in_array($name, $this->deleteTagsContent)) {
+			array_push($this->_dcStack, $name);
+			$this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
+		}
+		if (count($this->_dcStack) != 0) {
+			return true;
+		}
+
+		if (in_array($name, $this->deleteTags)) {
+			return true;
+		}
+
+		if (!preg_match("/^[a-z0-9]+$/i", $name)) {
+			if (preg_match("!(?:\@|://)!i", $name)) {
+				$this->_xhtml .= '&lt;' . $name . '&gt;';
+			}
+			return true;
+		}
+
+		if (in_array($name, $this->singleTags)) {
+			$this->_xhtml .= '<' . $name;
+			$this->_writeAttrs($attrs);
+			$this->_xhtml .= ' />';
+			return true;
+		}
+
+		// TABLES: cannot open table elements when we are not inside table
+		if ((isset($this->_counter['table'])) && ($this->_counter['table'] <= 0)
+			&& (in_array($name, $this->tableTags)))
+		{
+			return true;
+		}
+
+		// PARAGRAPHS: close paragraph when closeParagraph tags opening
+		if ((in_array($name, $this->closeParagraph)) && (in_array('p', $this->_stack))) {
+			$this->_closeHandler($parser, 'p');
+		}
+
+		// LISTS: we should close <li> if <li> of the same level opening
+		if ($name == 'li' && count($this->_liStack) &&
+			$this->_listScope == $this->_liStack[count($this->_liStack)-1])
+		{
+			$this->_closeHandler($parser, 'li');
+		}
+
+		// LISTS: we want to know on what nesting level of lists we are
+		if (in_array($name, $this->listTags)) {
+			$this->_listScope++;
+		}
+		if ($name == 'li') {
+			array_push($this->_liStack, $this->_listScope);
+		}
+
+		$this->_xhtml .= '<' . $name;
+		$this->_writeAttrs($attrs);
+		$this->_xhtml .= '>';
+		array_push($this->_stack,$name);
+		$this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
+		return true;
+	}
+
+	/**
+	 * Closing tag handler - called from HTMLSax
+	 *
+	 * @param object $parsers HTML parser
+	 * @param string $name    tag name
+	 * @return boolean
+	 * @access private
+	 */
+	public function _closeHandler(&$parser, $name)
+	{
+
+		$name = strtolower($name);
+
+		if (isset($this->_dcCounter[$name]) && ($this->_dcCounter[$name] > 0) &&
+			(in_array($name, $this->deleteTagsContent)))
+		{
+		   while ($name != ($tag = array_pop($this->_dcStack))) {
+			$this->_dcCounter[$tag]--;
+		   }
+
+		   $this->_dcCounter[$name]--;
+		}
+
+		if (count($this->_dcStack) != 0) {
+			return true;
+		}
+
+		if ((isset($this->_counter[$name])) && ($this->_counter[$name] > 0)) {
+		   while ($name != ($tag = array_pop($this->_stack))) {
+			   $this->_closeTag($tag);
+		   }
+
+		   $this->_closeTag($name);
+		}
+		return true;
+	}
+
+	/**
+	 * Closes tag
+	 *
+	 * @param string $tag tag name
+	 * @return boolean
+	 * @access private
+	 */
+	public function _closeTag($tag)
+	{
+		if (!in_array($tag, $this->noClose)) {
+			$this->_xhtml .= '</' . $tag . '>';
+		}
+
+		$this->_counter[$tag]--;
+
+		if (in_array($tag, $this->listTags)) {
+			$this->_listScope--;
+		}
+
+		if ($tag == 'li') {
+			array_pop($this->_liStack);
+		}
+		return true;
+	}
+
+	/**
+	 * Character data handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML parser
+	 * @param string $data   textual data
+	 * @return boolean
+	 * @access private
+	 */
+	public function _dataHandler(&$parser, $data)
+	{
+		if (count($this->_dcStack) == 0) {
+			$this->_xhtml .= $data;
+		}
+		return true;
+	}
+
+	/**
+	 * Escape handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML parser
+	 * @param string $data   comments or other type of data
+	 * @return boolean
+	 * @access private
+	 */
+	public function _escapeHandler(&$parser, $data)
+	{
+		return true;
+	}
+
+	/**
+	 * Returns the XHTML document
+	 *
+	 * @return string Processed (X)HTML document
+	 * @access public
+	 */
+	public function getXHTML ()
+	{
+		while ($tag = array_pop($this->_stack)) {
+			$this->_closeTag($tag);
+		}
+
+		return $this->_xhtml;
+	}
+
+	/**
+	 * Clears current document data
+	 *
+	 * @return boolean
+	 * @access public
+	 */
+	public function clear()
+	{
+		$this->_xhtml = '';
+		return true;
+	}
+
+	/**
+	 * Main parsing fuction
+	 *
+	 * @param string $doc HTML document for processing
+	 * @return string Processed (X)HTML document
+	 * @access public
+	 */
+	public function parse($doc, $isUTF7=false)
+	{
 	   $this->clear();
 
-       // Save all '<' symbols
-       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
-
-       // Web documents shouldn't contains \x00 symbol
-       $doc = str_replace("\x00", '', $doc);
-
-       // Opera6 bug workaround
-       $doc = str_replace("\xC0\xBC", '&lt;', $doc);
-
-       // UTF-7 encoding ASCII decode
-       if($isUTF7)
-            $doc = $this->repackUTF7($doc);
-
-       // Instantiate the parser
-       $parser= new TSax3();
-
-       // Set up the parser
-       $parser->set_object($this);
-
-       $parser->set_element_handler('_openHandler','_closeHandler');
-       $parser->set_data_handler('_dataHandler');
-       $parser->set_escape_handler('_escapeHandler');
-
-       $parser->parse($doc);
-
-       return $this->getXHTML();
-
-    }
-
-
-    /**
-     * UTF-7 decoding fuction
-     *
-     * @param string $str HTML document for recode ASCII part of UTF-7 back to ASCII
-     * @return string Decoded document
-     * @access private
-     */
-    private function repackUTF7($str)
-    {
-       return preg_replace_callback('!\+([0-9a-zA-Z/]+)\-!', array($this, 'repackUTF7Callback'), $str);
-    }
-
-    /**
-     * Additional UTF-7 decoding fuction
-     *
-     * @param string $str String for recode ASCII part of UTF-7 back to ASCII
-     * @return string Recoded string
-     * @access private
-     */
-    private function repackUTF7Callback($str)
-    {
-       $str = base64_decode($str[1]);
-       $str = preg_replace_callback('/^((?:\x00.)*)((?:[^\x00].)+)/', array($this, 'repackUTF7Back'), $str);
-       return preg_replace('/\x00(.)/', '$1', $str);
-    }
-
-    /**
-     * Additional UTF-7 encoding fuction
-     *
-     * @param string $str String for recode ASCII part of UTF-7 back to ASCII
-     * @return string Recoded string
-     * @access private
-     */
-    private function repackUTF7Back($str)
-    {
-       return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
-    }
+	   // Save all '<' symbols
+	   $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
+
+	   // Web documents shouldn't contains \x00 symbol
+	   $doc = str_replace("\x00", '', $doc);
+
+	   // Opera6 bug workaround
+	   $doc = str_replace("\xC0\xBC", '&lt;', $doc);
+
+	   // UTF-7 encoding ASCII decode
+	   if($isUTF7)
+			$doc = $this->repackUTF7($doc);
+
+	   // Instantiate the parser
+	   $parser= new TSax3();
+
+	   // Set up the parser
+	   $parser->set_object($this);
+
+	   $parser->set_element_handler('_openHandler','_closeHandler');
+	   $parser->set_data_handler('_dataHandler');
+	   $parser->set_escape_handler('_escapeHandler');
+
+	   $parser->parse($doc);
+
+	   return $this->getXHTML();
+
+	}
+
+
+	/**
+	 * UTF-7 decoding fuction
+	 *
+	 * @param string $str HTML document for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Decoded document
+	 * @access private
+	 */
+	private function repackUTF7($str)
+	{
+	   return preg_replace_callback('!\+([0-9a-zA-Z/]+)\-!', array($this, 'repackUTF7Callback'), $str);
+	}
+
+	/**
+	 * Additional UTF-7 decoding fuction
+	 *
+	 * @param string $str String for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Recoded string
+	 * @access private
+	 */
+	private function repackUTF7Callback($str)
+	{
+	   $str = base64_decode($str[1]);
+	   $str = preg_replace_callback('/^((?:\x00.)*)((?:[^\x00].)+)/', array($this, 'repackUTF7Back'), $str);
+	   return preg_replace('/\x00(.)/', '$1', $str);
+	}
+
+	/**
+	 * Additional UTF-7 encoding fuction
+	 *
+	 * @param string $str String for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Recoded string
+	 * @access private
+	 */
+	private function repackUTF7Back($str)
+	{
+	   return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
+	}
 }
 
 /*

Spacing +39 added lines, -39 removed lines

@@ -135,7 +135,7 @@ 
      * @var array
      * @access public
      */
-    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
+    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr',);
 
     /**
      * List of dangerous tags (such tags will be deleted)
@@ -144,10 +144,10 @@ 
      * @access public
      */
     public $deleteTags = array(
-        'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
-        'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
-        'iframe', 'layer',  'link',     'meta',    'object', 'style',
-        'title',  'script',
+        'applet', 'base', 'basefont', 'bgsound', 'blink', 'body',
+        'embed', 'frame', 'frameset', 'head', 'html', 'ilayer',
+        'iframe', 'layer', 'link', 'meta', 'object', 'style',
+        'title', 'script',
         );
 
     /**
@@ -157,7 +157,7 @@ 
      * @var array
      * @access public
      */
-    public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
+    public $deleteTagsContent = array('script', 'style', 'title', 'xml',);
 
     /**
      * Type of protocols filtering ('white' or 'black')
@@ -174,11 +174,11 @@ 
      * @access public
      */
     public $blackProtocols = array(
-        'about',   'chrome',     'data',       'disk',     'hcp',
-        'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
-        'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
-        'res',     'resource',   'shell',      'vbscript', 'view-source',
-        'vnd.ms.radio',          'wysiwyg',
+        'about', 'chrome', 'data', 'disk', 'hcp',
+        'help', 'javascript', 'livescript', 'lynxcgi', 'lynxexec',
+        'ms-help', 'ms-its', 'mhtml', 'mocha', 'opera',
+        'res', 'resource', 'shell', 'vbscript', 'view-source',
+        'vnd.ms.radio', 'wysiwyg',
         );
 
     /**
@@ -188,9 +188,9 @@ 
      * @access public
      */
     public $whiteProtocols = array(
-        'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
-        'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
-        'xmpp',   'callto',
+        'ed2k', 'file', 'ftp', 'gopher', 'http', 'https',
+        'irc', 'mailto', 'news', 'nntp', 'telnet', 'webcal',
+        'xmpp', 'callto',
         );
 
     /**
@@ -213,8 +213,8 @@ 
      * @access public
      */
     public $cssKeywords = array(
-        'absolute', 'behavior',       'behaviour',   'content', 'expression',
-        'fixed',    'include-source', 'moz-binding',
+        'absolute', 'behavior', 'behaviour', 'content', 'expression',
+        'fixed', 'include-source', 'moz-binding',
         );
 
     /**
@@ -235,11 +235,11 @@ 
      * @access public
      */
     public $closeParagraph = array(
-        'address', 'blockquote', 'center', 'dd',      'dir',       'div',
-        'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
-        'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
-        'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
-        'table',   'ul',         'xmp',
+        'address', 'blockquote', 'center', 'dd', 'dir', 'div',
+        'dl', 'dt', 'h1', 'h2', 'h3', 'h4',
+        'h5', 'h6', 'hr', 'isindex', 'listing', 'marquee',
+        'menu', 'multicol', 'ol', 'p', 'plaintext', 'pre',
+        'table', 'ul', 'xmp',
         );
 
     /**
@@ -250,7 +250,7 @@ 
      */
     public $tableTags = array(
         'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead',   'tr',
+        'thead', 'tr',
         );
 
     /**
@@ -259,7 +259,7 @@ 
      * @var array
      * @access public
      */
-    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
+    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl',);
 
     /**
      * List of dangerous attributes
@@ -276,7 +276,7 @@ 
      * @var array
      * @access public
      */
-    public $attributesNS = array('xml:lang', );
+    public $attributesNS = array('xml:lang',);
 
     /**
      * Constructs class
@@ -288,7 +288,7 @@ 
         //making regular expressions based on Proto & CSS arrays
         foreach ($this->blackProtocols as $proto) {
             $preg = "/[\s\x01-\x1F]*";
-            for ($i=0; $i<strlen($proto); $i++) {
+            for ($i = 0; $i < strlen($proto); $i++) {
                 $preg .= $proto{$i} . "[\s\x01-\x1F]*";
             }
             $preg .= ":/i";
@@ -308,7 +308,7 @@ 
      * @return boolean
      * @access private
      */
-    private function _writeAttrs ($attrs)
+    private function _writeAttrs($attrs)
     {
         if (is_array($attrs)) {
             foreach ($attrs as $name => $value) {
@@ -366,7 +366,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#(\d+);?/m',
-                        function ($matches) {
+                        function($matches) {
                             return chr($matches[0]);
                         },
                         $value
@@ -374,7 +374,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#x([0-9a-f]+);?/mi',
-                        function ($matches) {
+                        function($matches) {
                             return chr(hexdec($matches[0]));
                         },
                         $tempval
@@ -418,7 +418,7 @@ 
 
         if (in_array($name, $this->deleteTagsContent)) {
             array_push($this->_dcStack, $name);
-            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
+            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name] + 1 : 1;
         }
         if (count($this->_dcStack) != 0) {
             return true;
@@ -456,7 +456,7 @@ 
 
         // LISTS: we should close <li> if <li> of the same level opening
         if ($name == 'li' && count($this->_liStack) &&
-            $this->_listScope == $this->_liStack[count($this->_liStack)-1])
+            $this->_listScope == $this->_liStack[count($this->_liStack) - 1])
         {
             $this->_closeHandler($parser, 'li');
         }
@@ -472,8 +472,8 @@ 
         $this->_xhtml .= '<' . $name;
         $this->_writeAttrs($attrs);
         $this->_xhtml .= '>';
-        array_push($this->_stack,$name);
-        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
+        array_push($this->_stack, $name);
+        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name] + 1 : 1;
         return true;
     }
 
@@ -574,7 +574,7 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function getXHTML ()
+    public function getXHTML()
     {
         while ($tag = array_pop($this->_stack)) {
             $this->_closeTag($tag);
@@ -602,12 +602,12 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function parse($doc, $isUTF7=false)
+    public function parse($doc, $isUTF7 = false)
     {
 	   $this->clear();
 
        // Save all '<' symbols
-       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
+       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string) $doc);
 
        // Web documents shouldn't contains \x00 symbol
        $doc = str_replace("\x00", '', $doc);
@@ -616,16 +616,16 @@ 
        $doc = str_replace("\xC0\xBC", '&lt;', $doc);
 
        // UTF-7 encoding ASCII decode
-       if($isUTF7)
+       if ($isUTF7)
             $doc = $this->repackUTF7($doc);
 
        // Instantiate the parser
-       $parser= new TSax3();
+       $parser = new TSax3();
 
        // Set up the parser
        $parser->set_object($this);
 
-       $parser->set_element_handler('_openHandler','_closeHandler');
+       $parser->set_element_handler('_openHandler', '_closeHandler');
        $parser->set_data_handler('_dataHandler');
        $parser->set_escape_handler('_escapeHandler');
 
@@ -671,7 +671,7 @@ 
      */
     private function repackUTF7Back($str)
     {
-       return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
+       return $str[1] . '+' . rtrim(base64_encode($str[2]), '=') . '-';
     }
 }
 

Braces +9 added lines, -4 removed lines

@@ -344,7 +344,9 @@ 
                    while (1)
                    {
                      $_value = preg_replace("!/\*.*?\*/!s", '', $value);
-                     if ($_value == $value) break;
+                     if ($_value == $value) {
+                     	break;
+                     }
                      $value = $_value;
                    }
 
@@ -385,7 +387,9 @@ 
                 {
                     if ($this->protocolFiltering == 'black') {
                         foreach ($this->_protoRegexps as $proto) {
-                            if (preg_match($proto, $tempval)) continue 2;
+                            if (preg_match($proto, $tempval)) {
+                            	continue 2;
+                            }
                         }
                     } else {
                         $_tempval = explode(':', $tempval);
@@ -616,8 +620,9 @@ 
        $doc = str_replace("\xC0\xBC", '<', $doc);
 
        // UTF-7 encoding ASCII decode
-       if($isUTF7)
-            $doc = $this->repackUTF7($doc);
+       if($isUTF7) {
+                   $doc = $this->repackUTF7($doc);
+       }
 
        // Instantiate the parser
        $parser= new TSax3();

framework/3rdParty/TextHighlighter/Text/Highlighter.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,6 @@ 
      * Called by subclssses' constructors to enable/disable
      * optional highlighter rules
      *
-     * @param array $defines  Conditional defines
      *
      * @access protected
      */
@@ -232,6 +231,7 @@ 
      * Helper function to find matching brackets
      *
      * @access private
+     * @param string $str
      */
     function _matchingBrackets($str)
     {

Spacing +20 added lines, -20 removed lines

@@ -32,12 +32,12 @@ 
     /**
      * use numbered list
      */
-    define ('HL_NUMBERS_LI'    ,    1);
+    define('HL_NUMBERS_LI', 1);
     /**
      * Use 2-column table with line numbers in left column and code in  right column.
      * Forces $options['tag'] = HL_TAG_PRE
      */
-    define ('HL_NUMBERS_TABLE'    , 2);
+    define('HL_NUMBERS_TABLE', 2);
     /**#@-*/
 }
 
@@ -46,7 +46,7 @@ 
 /**
  * for our purpose, it is infinity
  */
-define ('HL_INFINITY',      1000000000);
+define('HL_INFINITY', 1000000000);
 
 // }}}
 
@@ -163,7 +163,7 @@ 
             $defines = array();
         }
         foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
+            foreach ($actions as $action) {
                 $present = in_array($name, $defines);
                 if (!$action[1]) {
                     $present = !$present;
@@ -197,7 +197,7 @@ 
     public static function factory($lang, $options = array())
     {
         $lang = strtoupper($lang);
-        $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
+        $langFile = dirname(__FILE__) . "/Highlighter/$lang.php";
         if (is_file($langFile))
         	include_once $langFile;
         else
@@ -256,7 +256,7 @@ 
         } else {
             $endpos = -1;
         }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+        preg_match($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
         $n = 1;
 
 
@@ -264,7 +264,7 @@ 
             if (!isset($m[$n])) {
                 break;
             }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+            if ($m[$n][1] > -1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
                 if ($this->_states[$this->_state][$i] != -1) {
                     $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
                 } else {
@@ -272,17 +272,17 @@ 
                     if (isset($this->_parts[$this->_state][$i])) {
                         $parts = array();
                         $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
+                        for ($j = 1; $j <= $count; $j++) {
+                            if ($m[$j + $n][1] < 0) {
                                 continue;
                             }
                             if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+                                if ($m[$j + $n][1] > $partpos) {
+                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j + $n][1] - $partpos)));
                                 }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j + $n][0]));
                             }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+                            $partpos = $m[$j + $n][1] + strlen($m[$j + $n][0]);
                         }
                         if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
                             array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
@@ -302,7 +302,7 @@ 
                     }
                 }
                 if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1] - $this->_pos));
                 }
                 $this->_pos = $m[$n][1] + strlen($m[$n][0]);
                 if ($this->_states[$this->_state][$i] != -1) {
@@ -313,13 +313,13 @@ 
                     $this->_state = $this->_states[$this->_state][$i];
                     $this->_endpattern = $this->_end[$this->_state];
                     if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
+                        for ($k = 0; $k <= $this->_counts[$l][$i]; $k++) {
+                            if (!isset($m[$i + $k])) {
                                 break;
                             }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+                            $quoted = preg_quote($m[$n + $k][0], '/');
+                            $this->_endpattern = str_replace('%' . $k . '%', $quoted, $this->_endpattern);
+                            $this->_endpattern = str_replace('%b' . $k . '%', $this->_matchingBrackets($quoted), $this->_endpattern);
                         }
                     }
                 }
@@ -331,7 +331,7 @@ 
         if ($endpos > -1) {
             $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
             if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos - $this->_pos));
             }
             list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
             $this->_pos = $endpos + strlen($endmatch);

Braces +8 added lines, -6 removed lines

@@ -198,15 +198,17 @@
     {
         $lang = strtoupper($lang);
         $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
-        if (is_file($langFile))
-        	include_once $langFile;
-        else
-        	return false;
+        if (is_file($langFile)) {
+                	include_once $langFile;
+        } else {
+                	return false;
+        }
 
         $classname = 'Text_Highlighter_' . $lang;
 
-        if (!class_exists($classname))
-        	return false;
+        if (!class_exists($classname)) {
+                	return false;
+        }
 
 		return new $classname($options);
     }

Indentation +298 added lines, -298 removed lines

@@ -25,20 +25,20 @@ 
 // BC trick : define constants related to default
 // renderer if needed
 if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
+	/**#@+
      * Constant for use with $options['numbers']
      * @see Text_Highlighter_Renderer_Html::_init()
      */
-    /**
-     * use numbered list
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     * Forces $options['tag'] = HL_TAG_PRE
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
+	/**
+	 * use numbered list
+	 */
+	define ('HL_NUMBERS_LI'    ,    1);
+	/**
+	 * Use 2-column table with line numbers in left column and code in  right column.
+	 * Forces $options['tag'] = HL_TAG_PRE
+	 */
+	define ('HL_NUMBERS_TABLE'    , 2);
+	/**#@-*/
 }
 
 // }}}
@@ -92,295 +92,295 @@ 
 
 class Text_Highlighter
 {
-    // {{{ members
-
-    /**
-     * Syntax highlighting rules.
-     * Auto-generated classes set this var
-     *
-     * @access protected
-     * @see _init
-     * @var array
-     */
-    var $_syntax;
-
-    /**
-     * Renderer object.
-     *
-     * @access private
-     * @var array
-     */
-    var $_renderer;
-
-    /**
-     * Options. Keeped for BC
-     *
-     * @access protected
-     * @var array
-     */
-    var $_options = array();
-
-    /**
-     * Conditionds
-     *
-     * @access protected
-     * @var array
-     */
-    var $_conditions = array();
-
-    /**
-     * Disabled keywords
-     *
-     * @access protected
-     * @var array
-     */
-    var $_disabled = array();
-
-    /**
-     * Language
-     *
-     * @access protected
-     * @var string
-     */
-    var $_language = '';
-
-    // }}}
-    // {{{ _checkDefines
-
-    /**
-     * Called by subclssses' constructors to enable/disable
-     * optional highlighter rules
-     *
-     * @param array $defines  Conditional defines
-     *
-     * @access protected
-     */
-    function _checkDefines()
-    {
-        if (isset($this->_options['defines'])) {
-            $defines = $this->_options['defines'];
-        } else {
-            $defines = array();
-        }
-        foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
-                $present = in_array($name, $defines);
-                if (!$action[1]) {
-                    $present = !$present;
-                }
-                if ($present) {
-                    unset($this->_disabled[$action[0]]);
-                } else {
-                    $this->_disabled[$action[0]] = true;
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ factory
-
-    /**
-     * Create a new Highlighter object for specified language
-     *
-     * @param string $lang    language, for example "SQL"
-     * @param array  $options Rendering options. This
-     * parameter is only keeped for BC reasons, use
-     * {@link Text_Highlighter::setRenderer()} instead
-     *
-     * @return mixed a newly created Highlighter object, or
-     * a PEAR error object on error
-     *
-     * @static
-     * @access public
-     */
-    public static function factory($lang, $options = array())
-    {
-        $lang = strtoupper($lang);
-        $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
-        if (is_file($langFile))
-        	include_once $langFile;
-        else
-        	return false;
-
-        $classname = 'Text_Highlighter_' . $lang;
-
-        if (!class_exists($classname))
-        	return false;
+	// {{{ members
+
+	/**
+	 * Syntax highlighting rules.
+	 * Auto-generated classes set this var
+	 *
+	 * @access protected
+	 * @see _init
+	 * @var array
+	 */
+	var $_syntax;
+
+	/**
+	 * Renderer object.
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $_renderer;
+
+	/**
+	 * Options. Keeped for BC
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_options = array();
+
+	/**
+	 * Conditionds
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_conditions = array();
+
+	/**
+	 * Disabled keywords
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_disabled = array();
+
+	/**
+	 * Language
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $_language = '';
+
+	// }}}
+	// {{{ _checkDefines
+
+	/**
+	 * Called by subclssses' constructors to enable/disable
+	 * optional highlighter rules
+	 *
+	 * @param array $defines  Conditional defines
+	 *
+	 * @access protected
+	 */
+	function _checkDefines()
+	{
+		if (isset($this->_options['defines'])) {
+			$defines = $this->_options['defines'];
+		} else {
+			$defines = array();
+		}
+		foreach ($this->_conditions as $name => $actions) {
+			foreach($actions as $action) {
+				$present = in_array($name, $defines);
+				if (!$action[1]) {
+					$present = !$present;
+				}
+				if ($present) {
+					unset($this->_disabled[$action[0]]);
+				} else {
+					$this->_disabled[$action[0]] = true;
+				}
+			}
+		}
+	}
+
+	// }}}
+	// {{{ factory
+
+	/**
+	 * Create a new Highlighter object for specified language
+	 *
+	 * @param string $lang    language, for example "SQL"
+	 * @param array  $options Rendering options. This
+	 * parameter is only keeped for BC reasons, use
+	 * {@link Text_Highlighter::setRenderer()} instead
+	 *
+	 * @return mixed a newly created Highlighter object, or
+	 * a PEAR error object on error
+	 *
+	 * @static
+	 * @access public
+	 */
+	public static function factory($lang, $options = array())
+	{
+		$lang = strtoupper($lang);
+		$langFile = dirname(__FILE__)."/Highlighter/$lang.php";
+		if (is_file($langFile))
+			include_once $langFile;
+		else
+			return false;
+
+		$classname = 'Text_Highlighter_' . $lang;
+
+		if (!class_exists($classname))
+			return false;
 
 		return new $classname($options);
-    }
-
-    // }}}
-    // {{{ setRenderer
-
-    /**
-     * Set renderer object
-     *
-     * @param object $renderer  Text_Highlighter_Renderer
-     *
-     * @access public
-     */
-    function setRenderer($renderer)
-    {
-        $this->_renderer = $renderer;
-    }
-
-    // }}}
-
-    /**
-     * Helper function to find matching brackets
-     *
-     * @access private
-     */
-    function _matchingBrackets($str)
-    {
-        return strtr($str, '()<>[]{}', ')(><][}{');
-    }
-
-
-
-
-    function _getToken()
-    {
-        if (!empty($this->_tokenStack)) {
-            return array_pop($this->_tokenStack);
-        }
-        if ($this->_pos >= $this->_len) {
-            return NULL;
-        }
-
-        if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
-            $endpos = $m[0][1];
-            $endmatch = $m[0][0];
-        } else {
-            $endpos = -1;
-        }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
-        $n = 1;
-
-
-         foreach ($this->_counts[$this->_state] as $i=>$count) {
-            if (!isset($m[$n])) {
-                break;
-            }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
-                } else {
-                    $inner = $this->_inner[$this->_state][$i];
-                    if (isset($this->_parts[$this->_state][$i])) {
-                        $parts = array();
-                        $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
-                                continue;
-                            }
-                            if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
-                                }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
-                            }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
-                        }
-                        if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
-                            array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
-                        }
-                        $this->_tokenStack = array_merge($this->_tokenStack, $parts);
-                    } else {
-                        foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
-                            if (isset($this->_disabled[$g])) {
-                                continue;
-                            }
-                            if (preg_match($re, $m[$n][0])) {
-                                $inner = $this->_kwmap[$g];
-                                break;
-                            }
-                        }
-                        $this->_tokenStack[] = array($inner, $m[$n][0]);
-                    }
-                }
-                if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
-                }
-                $this->_pos = $m[$n][1] + strlen($m[$n][0]);
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
-                    $this->_lastinner = $this->_inner[$this->_state][$i];
-                    $this->_lastdelim = $this->_delim[$this->_state][$i];
-                    $l = $this->_state;
-                    $this->_state = $this->_states[$this->_state][$i];
-                    $this->_endpattern = $this->_end[$this->_state];
-                    if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
-                                break;
-                            }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
-                        }
-                    }
-                }
-                return array_pop($this->_tokenStack);
-            }
-            $n += $count + 1;
-        }
-
-        if ($endpos > -1) {
-            $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
-            if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
-            }
-            list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
-            $this->_pos = $endpos + strlen($endmatch);
-            return array_pop($this->_tokenStack);
-        }
-        $p = $this->_pos;
-        $this->_pos = HL_INFINITY;
-        return array($this->_lastinner, substr($this->_str, $p));
-    }
-
-
-
-
-    // {{{ highlight
-
-    /**
-     * Highlights code
-     *
-     * @param  string $str      Code to highlight
-     * @access public
-     * @return string Highlighted text
-     *
-     */
-
-    function highlight($str)
-    {
-        if (!($this->_renderer)) {
-            include_once('Text/Highlighter/Renderer/Html.php');
-            $this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
-        }
-        $this->_state = -1;
-        $this->_pos = 0;
-        $this->_stack = array();
-        $this->_tokenStack = array();
-        $this->_lastinner = $this->_defClass;
-        $this->_lastdelim = $this->_defClass;
-        $this->_endpattern = '';
-        $this->_renderer->reset();
-        $this->_renderer->setCurrentLanguage($this->_language);
-        $this->_str = $this->_renderer->preprocess($str);
-        $this->_len = strlen($this->_str);
-        while ($token = $this->_getToken()) {
-            $this->_renderer->acceptToken($token[0], $token[1]);
-        }
-        $this->_renderer->finalize();
-        return $this->_renderer->getOutput();
-    }
-
-    // }}}
+	}
+
+	// }}}
+	// {{{ setRenderer
+
+	/**
+	 * Set renderer object
+	 *
+	 * @param object $renderer  Text_Highlighter_Renderer
+	 *
+	 * @access public
+	 */
+	function setRenderer($renderer)
+	{
+		$this->_renderer = $renderer;
+	}
+
+	// }}}
+
+	/**
+	 * Helper function to find matching brackets
+	 *
+	 * @access private
+	 */
+	function _matchingBrackets($str)
+	{
+		return strtr($str, '()<>[]{}', ')(><][}{');
+	}
+
+
+
+
+	function _getToken()
+	{
+		if (!empty($this->_tokenStack)) {
+			return array_pop($this->_tokenStack);
+		}
+		if ($this->_pos >= $this->_len) {
+			return NULL;
+		}
+
+		if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
+			$endpos = $m[0][1];
+			$endmatch = $m[0][0];
+		} else {
+			$endpos = -1;
+		}
+		preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+		$n = 1;
+
+
+		 foreach ($this->_counts[$this->_state] as $i=>$count) {
+			if (!isset($m[$n])) {
+				break;
+			}
+			if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+				if ($this->_states[$this->_state][$i] != -1) {
+					$this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
+				} else {
+					$inner = $this->_inner[$this->_state][$i];
+					if (isset($this->_parts[$this->_state][$i])) {
+						$parts = array();
+						$partpos = $m[$n][1];
+						for ($j=1; $j<=$count; $j++) {
+							if ($m[$j+$n][1] < 0) {
+								continue;
+							}
+							if (isset($this->_parts[$this->_state][$i][$j])) {
+								if ($m[$j+$n][1] > $partpos) {
+									array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+								}
+								array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+							}
+							$partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+						}
+						if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
+							array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
+						}
+						$this->_tokenStack = array_merge($this->_tokenStack, $parts);
+					} else {
+						foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
+							if (isset($this->_disabled[$g])) {
+								continue;
+							}
+							if (preg_match($re, $m[$n][0])) {
+								$inner = $this->_kwmap[$g];
+								break;
+							}
+						}
+						$this->_tokenStack[] = array($inner, $m[$n][0]);
+					}
+				}
+				if ($m[$n][1] > $this->_pos) {
+					$this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+				}
+				$this->_pos = $m[$n][1] + strlen($m[$n][0]);
+				if ($this->_states[$this->_state][$i] != -1) {
+					$this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
+					$this->_lastinner = $this->_inner[$this->_state][$i];
+					$this->_lastdelim = $this->_delim[$this->_state][$i];
+					$l = $this->_state;
+					$this->_state = $this->_states[$this->_state][$i];
+					$this->_endpattern = $this->_end[$this->_state];
+					if ($this->_subst[$l][$i]) {
+						for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
+							if (!isset($m[$i+$k])) {
+								break;
+							}
+							$quoted = preg_quote($m[$n+$k][0], '/');
+							$this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
+							$this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+						}
+					}
+				}
+				return array_pop($this->_tokenStack);
+			}
+			$n += $count + 1;
+		}
+
+		if ($endpos > -1) {
+			$this->_tokenStack[] = array($this->_lastdelim, $endmatch);
+			if ($endpos > $this->_pos) {
+				$this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+			}
+			list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
+			$this->_pos = $endpos + strlen($endmatch);
+			return array_pop($this->_tokenStack);
+		}
+		$p = $this->_pos;
+		$this->_pos = HL_INFINITY;
+		return array($this->_lastinner, substr($this->_str, $p));
+	}
+
+
+
+
+	// {{{ highlight
+
+	/**
+	 * Highlights code
+	 *
+	 * @param  string $str      Code to highlight
+	 * @access public
+	 * @return string Highlighted text
+	 *
+	 */
+
+	function highlight($str)
+	{
+		if (!($this->_renderer)) {
+			include_once('Text/Highlighter/Renderer/Html.php');
+			$this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
+		}
+		$this->_state = -1;
+		$this->_pos = 0;
+		$this->_stack = array();
+		$this->_tokenStack = array();
+		$this->_lastinner = $this->_defClass;
+		$this->_lastdelim = $this->_defClass;
+		$this->_endpattern = '';
+		$this->_renderer->reset();
+		$this->_renderer->setCurrentLanguage($this->_language);
+		$this->_str = $this->_renderer->preprocess($str);
+		$this->_len = strlen($this->_str);
+		while ($token = $this->_getToken()) {
+			$this->_renderer->acceptToken($token[0], $token[1]);
+		}
+		$this->_renderer->finalize();
+		return $this->_renderer->getOutput();
+	}
+
+	// }}}
 
 }
 

framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php

Doc Comments +1 added lines, -1 removed lines

@@ -262,6 +262,7 @@ 
     * Sets the input xml file to be parsed
     *
     * @param    string      Filename (full path)
+    * @param string $file
     * @return   boolean
     * @access   public
     */
@@ -768,7 +769,6 @@ 
     * Add an error message
     *
     * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
     * @param integer $lineNo Source code line number
     * @access private
     */

Indentation +1092 added lines, -1092 removed lines

@@ -67,949 +67,949 @@ 
 
 class Text_Highlighter_Generator extends  XML_Parser
 {
-    // {{{ properties
-    /**
-    * Whether to do case folding.
-    * We have to declare it here, because XML_Parser
-    * sets case folding in constructor
-    *
-    * @var  boolean
-    */
-    var $folding = false;
-
-    /**
-    * Holds name of file with highlighting rules
-    *
-    * @var string
-    * @access private
-    */
-    var $_syntaxFile;
-
-    /**
-    * Current element being processed
-    *
-    * @var array
-    * @access private
-    */
-    var $_element;
-
-    /**
-    * List of regions
-    *
-    * @var array
-    * @access private
-    */
-    var $_regions = array();
-
-    /**
-    * List of blocks
-    *
-    * @var array
-    * @access private
-    */
-    var $_blocks = array();
-
-    /**
-    * List of keyword groups
-    *
-    * @var array
-    * @access private
-    */
-    var $_keywords = array();
-
-    /**
-    * List of authors
-    *
-    * @var array
-    * @access private
-    */
-    var $_authors = array();
-
-    /**
-    * Name of language
-    *
-    * @var string
-    * @access public
-    */
-    var $language = '';
-
-    /**
-    * Generated code
-    *
-    * @var string
-    * @access private
-    */
-    var $_code = '';
-
-    /**
-    * Default class
-    *
-    * @var string
-    * @access private
-    */
-    var $_defClass = 'default';
-
-    /**
-    * Comment
-    *
-    * @var string
-    * @access private
-    */
-    var $_comment = '';
-
-    /**
-    * Flag for comment processing
-    *
-    * @var boolean
-    * @access private
-    */
-    var $_inComment = false;
-
-    /**
-    * Sorting order of current block/region
-    *
-    * @var integer
-    * @access private
-    */
-    var $_blockOrder = 0;
-
-    /**
-    * Generation errors
-    *
-    * @var array
-    * @access private
-    */
-    var $_errors;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-    * Constructor
-    *
-    * @param string $syntaxFile Name of XML file
-    * with syntax highlighting rules
-    *
-    * @access public
-    */
-
-    function __construct($syntaxFile = '')
-    {
-        XML_Parser::XML_Parser(null, 'func');
-        $this->_errors = array();
-        $this->_declareErrorMessages();
-        if ($syntaxFile) {
-            $this->setInputFile($syntaxFile);
-        }
-    }
-
-    // }}}
-    // {{{ _formatError
-
-    /**
-    * Format error message
-    *
-    * @param int $code error code
-    * @param string $params parameters
-    * @param string $fileName file name
-    * @param int $lineNo line number
-    * @return  array
-    * @access  public
-    */
-    function _formatError($code, $params, $fileName, $lineNo)
-    {
-        $template = $this->_templates[$code];
-        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
-        if ($fileName) {
-            $ret = '[' . $fileName . '] ' . $ret;
-        }
-        if ($lineNo) {
-            $ret .= ' (line ' . $lineNo . ')';
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ declareErrorMessages
-
-    /**
-    * Set up error message templates
-    *
-    * @access  private
-    */
-    function _declareErrorMessages()
-    {
-        $this->_templates = array (
-        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
-        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
-        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
-        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
-        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
-        TEXT_HIGHLIGHTER_PARSE => '%s',
-        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
-        TEXT_HIGHLIGHTER_FILE_READ => '%s'
-        );
-    }
-
-    // }}}
-    // {{{ setInputFile
-
-    /**
-    * Sets the input xml file to be parsed
-    *
-    * @param    string      Filename (full path)
-    * @return   boolean
-    * @access   public
-    */
-    function setInputFile($file)
-    {
-        $this->_syntaxFile = $file;
-        $ret = parent::setInputFile($file);
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ generate
-
-    /**
-    * Generates class code
-    *
-    * @access public
-    */
-
-    function generate()
-    {
-        $this->_regions    = array();
-        $this->_blocks     = array();
-        $this->_keywords   = array();
-        $this->language    = '';
-        $this->_code       = '';
-        $this->_defClass   = 'default';
-        $this->_comment    = '';
-        $this->_inComment  = false;
-        $this->_authors    = array();
-        $this->_blockOrder = 0;
-        $this->_errors   = array();
-
-        $ret = $this->parse();
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getCode
-
-    /**
-    * Returns generated code as a string.
-    *
-    * @return string Generated code
-    * @access public
-    */
-
-    function getCode()
-    {
-        return $this->_code;
-    }
-
-    // }}}
-    // {{{ saveCode
-
-    /**
-    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
-    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
-    * is located in Text/Highlighter
-    *
-    * @param string $filename Name of file to write the code to
-    * @return boolean true on success, false on failure
-    * @access public
-    */
-
-    function saveCode($filename)
-    {
-        $f = @fopen($filename, 'wb');
-        if (!$f) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
-            return false;
-        }
-        fwrite ($f, $this->_code);
-        fclose($f);
-        return true;
-    }
-
-    // }}}
-    // {{{ hasErrors
-
-    /**
-    * Reports if there were errors
-    *
-    * @return boolean
-    * @access public
-    */
-
-    function hasErrors()
-    {
-        return count($this->_errors) > 0;
-    }
-
-    // }}}
-    // {{{ getErrors
-
-    /**
-    * Returns errors
-    *
-    * @return array
-    * @access public
-    */
-
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    // }}}
-    // {{{ _sortBlocks
-
-    /**
-    * Sorts blocks
-    *
-    * @access private
-    */
-
-    function _sortBlocks($b1, $b2) {
-        return $b1['order'] - $b2['order'];
-    }
-
-    // }}}
-    // {{{ _sortLookFor
-    /**
-    * Sort 'look for' list
-    * @return int
-    * @param string $b1
-    * @param string $b2
-    */
-    function _sortLookFor($b1, $b2) {
-        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
-        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
-        return $o1 - $o2;
-    }
-
-    // }}}
-    // {{{ _makeRE
-
-    /**
-    * Adds delimiters and modifiers to regular expression if necessary
-    *
-    * @param string $text Original RE
-    * @return string Final RE
-    * @access private
-    */
-    function _makeRE($text, $case = false)
-    {
-        if (!strlen($text)) {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
-        }
-        if (!strlen($text) || $text{0} != '/') {
-            $text = '/' . $text . '/';
-        }
-        if (!$case) {
-            $text .= 'i';
-        }
-        $php_errormsg = '';
-        @preg_match($text, '');
-        if ($php_errormsg) {
-            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
-        }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
-        if (@$m[2]) {
-            $text = '(?' . $m[2] . ')' . $m[1];
-        } else {
-            $text = $m[1];
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ _exportArray
-
-    /**
-    * Exports array as PHP code
-    *
-    * @param array $array
-    * @return string Code
-    * @access private
-    */
-    function _exportArray($array)
-    {
-        $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-    }
-
-    // }}}
-    // {{{ _countSubpatterns
-    /**
-    * Find number of capturing suppaterns in regular expression
-    * @return int
-    * @param string $re Regular expression (without delimiters)
-    */
-    function _countSubpatterns($re)
-    {
-        preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
-    }
-
-    // }}}
-
-    /**#@+
+	// {{{ properties
+	/**
+	 * Whether to do case folding.
+	 * We have to declare it here, because XML_Parser
+	 * sets case folding in constructor
+	 *
+	 * @var  boolean
+	 */
+	var $folding = false;
+
+	/**
+	 * Holds name of file with highlighting rules
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_syntaxFile;
+
+	/**
+	 * Current element being processed
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_element;
+
+	/**
+	 * List of regions
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_regions = array();
+
+	/**
+	 * List of blocks
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_blocks = array();
+
+	/**
+	 * List of keyword groups
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_keywords = array();
+
+	/**
+	 * List of authors
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_authors = array();
+
+	/**
+	 * Name of language
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $language = '';
+
+	/**
+	 * Generated code
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_code = '';
+
+	/**
+	 * Default class
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_defClass = 'default';
+
+	/**
+	 * Comment
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_comment = '';
+
+	/**
+	 * Flag for comment processing
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_inComment = false;
+
+	/**
+	 * Sorting order of current block/region
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	var $_blockOrder = 0;
+
+	/**
+	 * Generation errors
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_errors;
+
+	// }}}
+	// {{{ constructor
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $syntaxFile Name of XML file
+	 * with syntax highlighting rules
+	 *
+	 * @access public
+	 */
+
+	function __construct($syntaxFile = '')
+	{
+		XML_Parser::XML_Parser(null, 'func');
+		$this->_errors = array();
+		$this->_declareErrorMessages();
+		if ($syntaxFile) {
+			$this->setInputFile($syntaxFile);
+		}
+	}
+
+	// }}}
+	// {{{ _formatError
+
+	/**
+	 * Format error message
+	 *
+	 * @param int $code error code
+	 * @param string $params parameters
+	 * @param string $fileName file name
+	 * @param int $lineNo line number
+	 * @return  array
+	 * @access  public
+	 */
+	function _formatError($code, $params, $fileName, $lineNo)
+	{
+		$template = $this->_templates[$code];
+		$ret = call_user_func_array('sprintf', array_merge(array($template), $params));
+		if ($fileName) {
+			$ret = '[' . $fileName . '] ' . $ret;
+		}
+		if ($lineNo) {
+			$ret .= ' (line ' . $lineNo . ')';
+		}
+		return $ret;
+	}
+
+	// }}}
+	// {{{ declareErrorMessages
+
+	/**
+	 * Set up error message templates
+	 *
+	 * @access  private
+	 */
+	function _declareErrorMessages()
+	{
+		$this->_templates = array (
+		TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
+		TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
+		TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
+		TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
+		TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
+		TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
+		TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
+		TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
+		TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
+		TEXT_HIGHLIGHTER_PARSE => '%s',
+		TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
+		TEXT_HIGHLIGHTER_FILE_READ => '%s'
+		);
+	}
+
+	// }}}
+	// {{{ setInputFile
+
+	/**
+	 * Sets the input xml file to be parsed
+	 *
+	 * @param    string      Filename (full path)
+	 * @return   boolean
+	 * @access   public
+	 */
+	function setInputFile($file)
+	{
+		$this->_syntaxFile = $file;
+		$ret = parent::setInputFile($file);
+		if (PEAR::isError($ret)) {
+			$this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
+			return false;
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ generate
+
+	/**
+	 * Generates class code
+	 *
+	 * @access public
+	 */
+
+	function generate()
+	{
+		$this->_regions    = array();
+		$this->_blocks     = array();
+		$this->_keywords   = array();
+		$this->language    = '';
+		$this->_code       = '';
+		$this->_defClass   = 'default';
+		$this->_comment    = '';
+		$this->_inComment  = false;
+		$this->_authors    = array();
+		$this->_blockOrder = 0;
+		$this->_errors   = array();
+
+		$ret = $this->parse();
+		if (PEAR::isError($ret)) {
+			$this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
+			return false;
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ getCode
+
+	/**
+	 * Returns generated code as a string.
+	 *
+	 * @return string Generated code
+	 * @access public
+	 */
+
+	function getCode()
+	{
+		return $this->_code;
+	}
+
+	// }}}
+	// {{{ saveCode
+
+	/**
+	 * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
+	 * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
+	 * is located in Text/Highlighter
+	 *
+	 * @param string $filename Name of file to write the code to
+	 * @return boolean true on success, false on failure
+	 * @access public
+	 */
+
+	function saveCode($filename)
+	{
+		$f = @fopen($filename, 'wb');
+		if (!$f) {
+			$this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
+			return false;
+		}
+		fwrite ($f, $this->_code);
+		fclose($f);
+		return true;
+	}
+
+	// }}}
+	// {{{ hasErrors
+
+	/**
+	 * Reports if there were errors
+	 *
+	 * @return boolean
+	 * @access public
+	 */
+
+	function hasErrors()
+	{
+		return count($this->_errors) > 0;
+	}
+
+	// }}}
+	// {{{ getErrors
+
+	/**
+	 * Returns errors
+	 *
+	 * @return array
+	 * @access public
+	 */
+
+	function getErrors()
+	{
+		return $this->_errors;
+	}
+
+	// }}}
+	// {{{ _sortBlocks
+
+	/**
+	 * Sorts blocks
+	 *
+	 * @access private
+	 */
+
+	function _sortBlocks($b1, $b2) {
+		return $b1['order'] - $b2['order'];
+	}
+
+	// }}}
+	// {{{ _sortLookFor
+	/**
+	 * Sort 'look for' list
+	 * @return int
+	 * @param string $b1
+	 * @param string $b2
+	 */
+	function _sortLookFor($b1, $b2) {
+		$o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
+		$o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
+		return $o1 - $o2;
+	}
+
+	// }}}
+	// {{{ _makeRE
+
+	/**
+	 * Adds delimiters and modifiers to regular expression if necessary
+	 *
+	 * @param string $text Original RE
+	 * @return string Final RE
+	 * @access private
+	 */
+	function _makeRE($text, $case = false)
+	{
+		if (!strlen($text)) {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
+		}
+		if (!strlen($text) || $text{0} != '/') {
+			$text = '/' . $text . '/';
+		}
+		if (!$case) {
+			$text .= 'i';
+		}
+		$php_errormsg = '';
+		@preg_match($text, '');
+		if ($php_errormsg) {
+			$this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
+		}
+		preg_match ('#^/(.+)/(.*)$#', $text, $m);
+		if (@$m[2]) {
+			$text = '(?' . $m[2] . ')' . $m[1];
+		} else {
+			$text = $m[1];
+		}
+		return $text;
+	}
+
+	// }}}
+	// {{{ _exportArray
+
+	/**
+	 * Exports array as PHP code
+	 *
+	 * @param array $array
+	 * @return string Code
+	 * @access private
+	 */
+	function _exportArray($array)
+	{
+		$array = var_export($array, true);
+		return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+	}
+
+	// }}}
+	// {{{ _countSubpatterns
+	/**
+	 * Find number of capturing suppaterns in regular expression
+	 * @return int
+	 * @param string $re Regular expression (without delimiters)
+	 */
+	function _countSubpatterns($re)
+	{
+		preg_match_all('/' . $re . '/', '', $m);
+		return count($m)-1;
+	}
+
+	// }}}
+
+	/**#@+
     * @access private
     * @param resource $xp      XML parser resource
     * @param string   $elem    XML element name
     * @param array    $attribs XML element attributes
     */
 
-    // {{{ xmltag_Default
-
-    /**
-    * start handler for <default> element
-    */
-    function xmltag_Default($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_defClass = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_Region
-
-    /**
-    * start handler for <region> element
-    */
-    function xmltag_Region($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['innerGroup'] = $attribs['innerGroup'];
-        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
-        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
-        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
-        $this->_element['remember'] = @$attribs['remember'] == 'yes';
-        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
-            $this->_element['startBOL'] = true;
-        }
-        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
-            $this->_element['endBOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Block
-
-    /**
-    * start handler for <block> element
-    */
-    function xmltag_Block($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
-        }
-        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        if (isset($attribs['innerGroup'])) {
-            $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        }
-        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
-        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
-            $this->_element['BOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ cdataHandler
-
-    /**
-    * Character data handler. Used for comment
-    */
-    function cdataHandler($xp, $cdata)
-    {
-        if ($this->_inComment) {
-            $this->_comment .= $cdata;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Comment
-
-    /**
-    * start handler for <comment> element
-    */
-    function xmltag_Comment($xp, $elem, $attribs)
-    {
-        $this->_comment = '';
-        $this->_inComment = true;
-    }
-
-    // }}}
-    // {{{ xmltag_PartGroup
-
-    /**
-    * start handler for <partgroup> element
-    */
-    function xmltag_PartGroup($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_PartClass
-
-    /**
-    * start handler for <partclass> element
-    */
-    function xmltag_PartClass($xp, $elem, $attribs)
-    {
-        $this->xmltag_PartGroup($xp, $elem, $attribs);
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords
-
-    /**
-    * start handler for <keywords> element
-    */
-    function xmltag_Keywords($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
-        }
-        $this->_element = array('name'=>@$attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['inherits'] = @$attribs['inherits'];
-        if (isset($attribs['otherwise'])) {
-            $this->_element['otherwise'] = $attribs['otherwise'];
-        }
-        if (isset($attribs['ifdef'])) {
-            $this->_element['ifdef'] = $attribs['ifdef'];
-        }
-        if (isset($attribs['ifndef'])) {
-            $this->_element['ifndef'] = $attribs['ifndef'];
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Keyword
-
-    /**
-    * start handler for <keyword> element
-    */
-    function xmltag_Keyword($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['match']) || $attribs['match'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
-        }
-        $keyword = @$attribs['match'];
-        if (!$this->_element['case']) {
-            $keyword = strtolower($keyword);
-        }
-        $this->_element['match'][$keyword] = true;
-    }
-
-    // }}}
-    // {{{ xmltag_Contains
-
-    /**
-    * start handler for <contains> element
-    */
-    function xmltag_Contains($xp, $elem, $attribs)
-    {
-        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
-        if (isset($attribs['region'])) {
-            $this->_element['contains']['region'][$attribs['region']] =
-            xml_get_current_line_number($this->parser);
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['contains']['block'][$attribs['block']] =
-            xml_get_current_line_number($this->parser);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_But
-
-    /**
-    * start handler for <but> element
-    */
-    function xmltag_But($xp, $elem, $attribs)
-    {
-        if (isset($attribs['region'])) {
-            $this->_element['not-contains']['region'][$attribs['region']] = true;
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['not-contains']['block'][$attribs['block']] = true;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Onlyin
-
-    /**
-    * start handler for <onlyin> element
-    */
-    function xmltag_Onlyin($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['region']) || $attribs['region'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
-        }
-        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
-    }
-
-    // }}}
-    // {{{ xmltag_Author
-
-    /**
-    * start handler for <author> element
-    */
-    function xmltag_Author($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
-        }
-        $this->_authors[] = array(
-        'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
-        );
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight
-
-    /**
-    * start handler for <highlight> element
-    */
-    function xmltag_Highlight($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
-        }
-        $this->_code = '';
-        $this->language = strtoupper(@$attribs['lang']);
-        $this->_case = @$attribs['case'] == 'yes';
-    }
-
-    // }}}
-
-    /**#@-*/
-
-    // {{{ _error
-
-    /**
-    * Add an error message
-    *
-    * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
-    * @param integer $lineNo Source code line number
-    * @access private
-    */
-    function _error($code, $params = array(), $lineNo = 0)
-    {
-        if (!$lineNo && !empty($this->parser)) {
-            $lineNo = xml_get_current_line_number($this->parser);
-        }
-        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
-    }
-
-    // }}}
-    // {{{ _aliasAttributes
-
-    /**
-    * BC trick
-    *
-    * @param array $attrs attributes
-    */
-    function _aliasAttributes(&$attrs)
-    {
-        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
-            $attrs['innerGroup'] = $attrs['innerClass'];
-        }
-        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
-            $attrs['delimGroup'] = $attrs['delimClass'];
-        }
-        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
-            $attrs['partGroup'] = $attrs['partClass'];
-        }
-    }
-
-    // }}}
-
-    /**#@+
+	// {{{ xmltag_Default
+
+	/**
+	 * start handler for <default> element
+	 */
+	function xmltag_Default($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_defClass = @$attribs['innerGroup'];
+	}
+
+	// }}}
+	// {{{ xmltag_Region
+
+	/**
+	 * start handler for <region> element
+	 */
+	function xmltag_Region($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
+		}
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_element = array('name' => $attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		$this->_element['innerGroup'] = $attribs['innerGroup'];
+		$this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
+		$attribs['delimGroup'] :
+		$attribs['innerGroup'];
+		$this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
+		$this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
+		$this->_element['contained'] = @$attribs['contained'] == 'yes';
+		$this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
+		$this->_element['remember'] = @$attribs['remember'] == 'yes';
+		if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
+			$this->_element['startBOL'] = true;
+		}
+		if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
+			$this->_element['endBOL'] = true;
+		}
+		if (isset($attribs['neverAfter'])) {
+			$this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Block
+
+	/**
+	 * start handler for <block> element
+	 */
+	function xmltag_Block($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
+		}
+		if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
+		}
+		$this->_element = array('name' => $attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		if (isset($attribs['innerGroup'])) {
+			$this->_element['innerGroup'] = @$attribs['innerGroup'];
+		}
+		$this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
+		$this->_element['contained'] = @$attribs['contained'] == 'yes';
+		$this->_element['multiline'] = @$attribs['multiline'] == 'yes';
+		if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
+			$this->_element['BOL'] = true;
+		}
+		if (isset($attribs['neverAfter'])) {
+			$this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+		}
+	}
+
+	// }}}
+	// {{{ cdataHandler
+
+	/**
+	 * Character data handler. Used for comment
+	 */
+	function cdataHandler($xp, $cdata)
+	{
+		if ($this->_inComment) {
+			$this->_comment .= $cdata;
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Comment
+
+	/**
+	 * start handler for <comment> element
+	 */
+	function xmltag_Comment($xp, $elem, $attribs)
+	{
+		$this->_comment = '';
+		$this->_inComment = true;
+	}
+
+	// }}}
+	// {{{ xmltag_PartGroup
+
+	/**
+	 * start handler for <partgroup> element
+	 */
+	function xmltag_PartGroup($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
+	}
+
+	// }}}
+	// {{{ xmltag_PartClass
+
+	/**
+	 * start handler for <partclass> element
+	 */
+	function xmltag_PartClass($xp, $elem, $attribs)
+	{
+		$this->xmltag_PartGroup($xp, $elem, $attribs);
+	}
+
+	// }}}
+	// {{{ xmltag_Keywords
+
+	/**
+	 * start handler for <keywords> element
+	 */
+	function xmltag_Keywords($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
+		}
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
+		}
+		$this->_element = array('name'=>@$attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		$this->_element['innerGroup'] = @$attribs['innerGroup'];
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		$this->_element['inherits'] = @$attribs['inherits'];
+		if (isset($attribs['otherwise'])) {
+			$this->_element['otherwise'] = $attribs['otherwise'];
+		}
+		if (isset($attribs['ifdef'])) {
+			$this->_element['ifdef'] = $attribs['ifdef'];
+		}
+		if (isset($attribs['ifndef'])) {
+			$this->_element['ifndef'] = $attribs['ifndef'];
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Keyword
+
+	/**
+	 * start handler for <keyword> element
+	 */
+	function xmltag_Keyword($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['match']) || $attribs['match'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
+		}
+		$keyword = @$attribs['match'];
+		if (!$this->_element['case']) {
+			$keyword = strtolower($keyword);
+		}
+		$this->_element['match'][$keyword] = true;
+	}
+
+	// }}}
+	// {{{ xmltag_Contains
+
+	/**
+	 * start handler for <contains> element
+	 */
+	function xmltag_Contains($xp, $elem, $attribs)
+	{
+		$this->_element['contains-all'] = @$attribs['all'] == 'yes';
+		if (isset($attribs['region'])) {
+			$this->_element['contains']['region'][$attribs['region']] =
+			xml_get_current_line_number($this->parser);
+		}
+		if (isset($attribs['block'])) {
+			$this->_element['contains']['block'][$attribs['block']] =
+			xml_get_current_line_number($this->parser);
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_But
+
+	/**
+	 * start handler for <but> element
+	 */
+	function xmltag_But($xp, $elem, $attribs)
+	{
+		if (isset($attribs['region'])) {
+			$this->_element['not-contains']['region'][$attribs['region']] = true;
+		}
+		if (isset($attribs['block'])) {
+			$this->_element['not-contains']['block'][$attribs['block']] = true;
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Onlyin
+
+	/**
+	 * start handler for <onlyin> element
+	 */
+	function xmltag_Onlyin($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['region']) || $attribs['region'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
+		}
+		$this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
+	}
+
+	// }}}
+	// {{{ xmltag_Author
+
+	/**
+	 * start handler for <author> element
+	 */
+	function xmltag_Author($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
+		}
+		$this->_authors[] = array(
+		'name'  => @$attribs['name'],
+		'email' => (string)@$attribs['email']
+		);
+	}
+
+	// }}}
+	// {{{ xmltag_Highlight
+
+	/**
+	 * start handler for <highlight> element
+	 */
+	function xmltag_Highlight($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['lang']) || $attribs['lang'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
+		}
+		$this->_code = '';
+		$this->language = strtoupper(@$attribs['lang']);
+		$this->_case = @$attribs['case'] == 'yes';
+	}
+
+	// }}}
+
+	/**#@-*/
+
+	// {{{ _error
+
+	/**
+	 * Add an error message
+	 *
+	 * @param integer $code Error code
+	 * @param mixed   $message Error message or array with error message parameters
+	 * @param integer $lineNo Source code line number
+	 * @access private
+	 */
+	function _error($code, $params = array(), $lineNo = 0)
+	{
+		if (!$lineNo && !empty($this->parser)) {
+			$lineNo = xml_get_current_line_number($this->parser);
+		}
+		$this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
+	}
+
+	// }}}
+	// {{{ _aliasAttributes
+
+	/**
+	 * BC trick
+	 *
+	 * @param array $attrs attributes
+	 */
+	function _aliasAttributes(&$attrs)
+	{
+		if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
+			$attrs['innerGroup'] = $attrs['innerClass'];
+		}
+		if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
+			$attrs['delimGroup'] = $attrs['delimClass'];
+		}
+		if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
+			$attrs['partGroup'] = $attrs['partClass'];
+		}
+	}
+
+	// }}}
+
+	/**#@+
     * @access private
     * @param resource $xp      XML parser resource
     * @param string   $elem    XML element name
     */
 
-    // {{{ xmltag_Comment_
-
-    /**
-    * end handler for <comment> element
-    */
-    function xmltag_Comment_($xp, $elem)
-    {
-        $this->_inComment = false;
-    }
-
-    // }}}
-    // {{{ xmltag_Region_
-
-    /**
-    * end handler for <region> element
-    */
-    function xmltag_Region_($xp, $elem)
-    {
-        $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_regions[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords_
-
-    /**
-    * end handler for <keywords> element
-    */
-    function xmltag_Keywords_($xp, $elem)
-    {
-        $this->_keywords[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Block_
-
-    /**
-    * end handler for <block> element
-    */
-    function xmltag_Block_($xp, $elem)
-    {
-        $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_blocks[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight_
-
-    /**
-    * end handler for <highlight> element
-    */
-    function xmltag_Highlight_($xp, $elem)
-    {
-        $conditions = array();
-        $toplevel = array();
-        foreach ($this->_blocks as $i => $current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-        }
-        foreach ($this->_regions as $i=>$current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
-                if (!isset($this->_blocks[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ($this->_regions as $j => $region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['region'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['region'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-            foreach ($this->_blocks as $j=>$region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['block'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['block'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-        }
-        foreach ($this->_blocks as $i=>$current) {
-            unset ($this->_blocks[$i]['never-contained']);
-            unset ($this->_blocks[$i]['contained']);
-            unset ($this->_blocks[$i]['contains-all']);
-            unset ($this->_blocks[$i]['contains']);
-            unset ($this->_blocks[$i]['onlyin']);
-            unset ($this->_blocks[$i]['line']);
-        }
-
-        foreach ($this->_regions as $i=>$current) {
-            unset ($this->_regions[$i]['never-contained']);
-            unset ($this->_regions[$i]['contained']);
-            unset ($this->_regions[$i]['contains-all']);
-            unset ($this->_regions[$i]['contains']);
-            unset ($this->_regions[$i]['onlyin']);
-            unset ($this->_regions[$i]['line']);
-        }
-
-        foreach ($this->_keywords as $name => $keyword) {
-            if (isset($keyword['ifdef'])) {
-                $conditions[$keyword['ifdef']][] = array($name, true);
-            }
-            if (isset($keyword['ifndef'])) {
-                $conditions[$keyword['ifndef']][] = array($name, false);
-            }
-            unset($this->_keywords[$name]['line']);
-            if (!isset($this->_blocks[$keyword['inherits']])) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-        }
-
-        $syntax=array(
-        'keywords'   => $this->_keywords,
-        'blocks'     => array_merge($this->_blocks, $this->_regions),
-        'toplevel'   => $toplevel,
-        );
-        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'block') {
-                continue;
-            }
-            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
-                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
-            }
-        }
-        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
-        $syntax['case'] = $this->_case;
-        $this->_code = <<<CODE
+	// {{{ xmltag_Comment_
+
+	/**
+	 * end handler for <comment> element
+	 */
+	function xmltag_Comment_($xp, $elem)
+	{
+		$this->_inComment = false;
+	}
+
+	// }}}
+	// {{{ xmltag_Region_
+
+	/**
+	 * end handler for <region> element
+	 */
+	function xmltag_Region_($xp, $elem)
+	{
+		$this->_element['type'] = 'region';
+		$this->_element['order'] = $this->_blockOrder ++;
+		$this->_regions[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Keywords_
+
+	/**
+	 * end handler for <keywords> element
+	 */
+	function xmltag_Keywords_($xp, $elem)
+	{
+		$this->_keywords[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Block_
+
+	/**
+	 * end handler for <block> element
+	 */
+	function xmltag_Block_($xp, $elem)
+	{
+		$this->_element['type'] = 'block';
+		$this->_element['order'] = $this->_blockOrder ++;
+		$this->_blocks[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Highlight_
+
+	/**
+	 * end handler for <highlight> element
+	 */
+	function xmltag_Highlight_($xp, $elem)
+	{
+		$conditions = array();
+		$toplevel = array();
+		foreach ($this->_blocks as $i => $current) {
+			if (!$current['contained'] && !isset($current['onlyin'])) {
+				$toplevel[] = $i;
+			}
+			foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
+					array(
+					'block' => $current['name'],
+					'region' => $region
+					));
+				}
+			}
+		}
+		foreach ($this->_regions as $i=>$current) {
+			if (!$current['contained'] && !isset($current['onlyin'])) {
+				$toplevel[] = $i;
+			}
+			foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+					array(
+					'region1' => $current['name'],
+					'region2' => $region
+					));
+				}
+			}
+			foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+				if (!isset($this->_blocks[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
+					array(
+					'block' => $current['name'],
+					'region' => $region
+					));
+				}
+			}
+			foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+					array(
+					'region1' => $current['name'],
+					'region2' => $region
+					));
+				}
+			}
+			foreach ($this->_regions as $j => $region) {
+				if (isset($region['onlyin'])) {
+					$suits = isset($region['onlyin'][$current['name']]);
+				} elseif (isset($current['not-contains']['region'][$region['name']])) {
+					$suits = false;
+				} elseif (isset($current['contains']['region'][$region['name']])) {
+					$suits = true;
+				} else {
+					$suits = @$current['contains-all'] && @!$region['never-contained'];
+				}
+				if ($suits) {
+					$this->_regions[$i]['lookfor'][] = $j;
+				}
+			}
+			foreach ($this->_blocks as $j=>$region) {
+				if (isset($region['onlyin'])) {
+					$suits = isset($region['onlyin'][$current['name']]);
+				} elseif (isset($current['not-contains']['block'][$region['name']])) {
+					$suits = false;
+				} elseif (isset($current['contains']['block'][$region['name']])) {
+					$suits = true;
+				} else {
+					$suits = @$current['contains-all'] && @!$region['never-contained'];
+				}
+				if ($suits) {
+					$this->_regions[$i]['lookfor'][] = $j;
+				}
+			}
+		}
+		foreach ($this->_blocks as $i=>$current) {
+			unset ($this->_blocks[$i]['never-contained']);
+			unset ($this->_blocks[$i]['contained']);
+			unset ($this->_blocks[$i]['contains-all']);
+			unset ($this->_blocks[$i]['contains']);
+			unset ($this->_blocks[$i]['onlyin']);
+			unset ($this->_blocks[$i]['line']);
+		}
+
+		foreach ($this->_regions as $i=>$current) {
+			unset ($this->_regions[$i]['never-contained']);
+			unset ($this->_regions[$i]['contained']);
+			unset ($this->_regions[$i]['contains-all']);
+			unset ($this->_regions[$i]['contains']);
+			unset ($this->_regions[$i]['onlyin']);
+			unset ($this->_regions[$i]['line']);
+		}
+
+		foreach ($this->_keywords as $name => $keyword) {
+			if (isset($keyword['ifdef'])) {
+				$conditions[$keyword['ifdef']][] = array($name, true);
+			}
+			if (isset($keyword['ifndef'])) {
+				$conditions[$keyword['ifndef']][] = array($name, false);
+			}
+			unset($this->_keywords[$name]['line']);
+			if (!isset($this->_blocks[$keyword['inherits']])) {
+				$this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
+				array(
+				'keyword' => $keyword['name'],
+				'block' => $keyword['inherits']
+				));
+			}
+			if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+				$this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
+				array(
+				'keyword' => $keyword['name'],
+				'block' => $keyword['inherits']
+				));
+			}
+		}
+
+		$syntax=array(
+		'keywords'   => $this->_keywords,
+		'blocks'     => array_merge($this->_blocks, $this->_regions),
+		'toplevel'   => $toplevel,
+		);
+		uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
+		foreach ($syntax['blocks'] as $name => $block) {
+			if ($block['type'] == 'block') {
+				continue;
+			}
+			if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
+				usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
+			}
+		}
+		usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
+		$syntax['case'] = $this->_case;
+		$this->_code = <<<CODE
 <?php
 /**
  * Auto-generated class. {$this->language} syntax highlighting
 CODE;
 
-        if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
-            $this->_code .= "\n * \n" . $comment;
-        }
+		if ($this->_comment) {
+			$comment = preg_replace('~^~m',' * ',$this->_comment);
+			$this->_code .= "\n * \n" . $comment;
+		}
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
 
  *
  * PHP version 4 and 5
@@ -1029,15 +1029,15 @@ 
 
 CODE;
 
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email'] . '>';
-            }
-            $this->_code .= "\n";
-        }
+		foreach ($this->_authors as $author) {
+			$this->_code .= ' * @author ' . $author['name'];
+			if ($author['email']) {
+				$this->_code .= ' <' . $author['email'] . '>';
+			}
+			$this->_code .= "\n";
+		}
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
  *
  */
 
@@ -1046,16 +1046,16 @@ 
  *
 
 CODE;
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
-            }
-            $this->_code .= "\n";
-        }
+		foreach ($this->_authors as $author) {
+			$this->_code .= ' * @author ' . $author['name'];
+			if ($author['email']) {
+				$this->_code .= ' <' . $author['email']. '>';
+			}
+			$this->_code .= "\n";
+		}
 
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
  * @category   Text
  * @package    Text_Highlighter
  * @copyright  2004-2006 Andrey Demenev
@@ -1067,11 +1067,11 @@ 
 {
 
 CODE;
-        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
-        $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-        //        \$this->_syntax = $array;
-        $this->_code .= <<<CODE
+		$this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
+		$array = var_export($syntax, true);
+		$array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+		//        \$this->_syntax = $array;
+		$this->_code .= <<<CODE
 
     /**
      *  Constructor
@@ -1083,154 +1083,154 @@ 
     {
 
 CODE;
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
 
         \$this->_options = \$options;
 CODE;
-        $states = array();
-        $i = 0;
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'region') {
-                $states[$name] = $i++;
-            }
-        }
-        $regs = array();
-        $counts = array();
-        $delim = array();
-        $inner = array();
-        $end = array();
-        $stat = array();
-        $keywords = array();
-        $parts = array();
-        $kwmap = array();
-        $subst = array();
-        $re = array();
-        $ce = array();
-        $rd = array();
-        $in = array();
-        $st = array();
-        $kw = array();
-        $sb = array();
-        foreach ($syntax['toplevel'] as $name) {
-            $block = $syntax['blocks'][$name];
-            if ($block['type'] == 'block') {
-                $kwm = array();
-                $re[] = '(' . $block['match'] . ')';
-                $ce[] = $this->_countSubpatterns($block['match']);
-                $rd[] = '';
-                $sb[] = false;;
-                $st[] = -1;
-                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                    if ($kwgroup['inherits'] != $name) {
-                        continue;
-                    }
-                    $gre = implode('|', array_keys($kwgroup['match']));
-                    if (!$kwgroup['case']) {
-                        $gre = '(?i)' . $gre;
-                    }
-                    $kwm[$kwname][] =  $gre;
-                    $kwmap[$kwname] = $kwgroup['innerGroup'];
-                }
-                foreach ($kwm as $g => $ma) {
-                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                }
-                $kw[] = $kwm;
-            } else {
-                $kw[] = -1;
-                $re[] = '(' . $block['start'] . ')';
-                $ce[] = $this->_countSubpatterns($block['start']);
-                $rd[] = $block['delimGroup'];
-                $st[] = $states[$name];
-                $sb[] = $block['remember'];
-            }
-            $in[] = $block['innerGroup'];
-        }
-        $re = implode('|', $re);
-        $regs[-1] = '/' . $re . '/';
-        $counts[-1] = $ce;
-        $delim[-1] = $rd;
-        $inner[-1] = $in;
-        $stat[-1] = $st;
-        $keywords[-1] = $kw;
-        $subst[-1] = $sb;
-
-        foreach ($syntax['blocks'] as $ablock) {
-            if ($ablock['type'] != 'region') {
-                continue;
-            }
-            $end[] = '/' . $ablock['end'] . '/';
-            $re = array();
-            $ce = array();
-            $rd = array();
-            $in = array();
-            $st = array();
-            $kw = array();
-            $pc = array();
-            $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
-                $block = $syntax['blocks'][$name];
-                if (isset($block['partClass'])) {
-                    $pc[] = $block['partClass'];
-                } else {
-                    $pc[] = null;
-                }
-                if ($block['type'] == 'block') {
-                    $kwm = array();;
-                    $re[] = '(' . $block['match'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['match']);
-                    $rd[] = '';
-                    $sb[] = false;
-                    $st[] = -1;
-                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                        if ($kwgroup['inherits'] != $name) {
-                            continue;
-                        }
-                        $gre = implode('|', array_keys($kwgroup['match']));
-                        if (!$kwgroup['case']) {
-                            $gre = '(?i)' . $gre;
-                        }
-                        $kwm[$kwname][] =  $gre;
-                        $kwmap[$kwname] = $kwgroup['innerGroup'];
-                    }
-                    foreach ($kwm as $g => $ma) {
-                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                    }
-                    $kw[] = $kwm;
-                } else {
-                    $sb[] = $block['remember'];
-                    $kw[] = -1;
-                    $re[] = '(' . $block['start'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['start']);
-                    $rd[] = $block['delimGroup'];
-                    $st[] = $states[$name];
-                }
-                $in[] = $block['innerGroup'];
-            }
-            $re = implode('|', $re);
-            $regs[] = '/' . $re . '/';
-            $counts[] = $ce;
-            $delim[] = $rd;
-            $inner[] = $in;
-            $stat[] = $st;
-            $keywords[] = $kw;
-            $parts[] = $pc;
-            $subst[] = $sb;
-        }
-
-
-        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
-        $this->_code .= <<<CODE
+		$states = array();
+		$i = 0;
+		foreach ($syntax['blocks'] as $name => $block) {
+			if ($block['type'] == 'region') {
+				$states[$name] = $i++;
+			}
+		}
+		$regs = array();
+		$counts = array();
+		$delim = array();
+		$inner = array();
+		$end = array();
+		$stat = array();
+		$keywords = array();
+		$parts = array();
+		$kwmap = array();
+		$subst = array();
+		$re = array();
+		$ce = array();
+		$rd = array();
+		$in = array();
+		$st = array();
+		$kw = array();
+		$sb = array();
+		foreach ($syntax['toplevel'] as $name) {
+			$block = $syntax['blocks'][$name];
+			if ($block['type'] == 'block') {
+				$kwm = array();
+				$re[] = '(' . $block['match'] . ')';
+				$ce[] = $this->_countSubpatterns($block['match']);
+				$rd[] = '';
+				$sb[] = false;;
+				$st[] = -1;
+				foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+					if ($kwgroup['inherits'] != $name) {
+						continue;
+					}
+					$gre = implode('|', array_keys($kwgroup['match']));
+					if (!$kwgroup['case']) {
+						$gre = '(?i)' . $gre;
+					}
+					$kwm[$kwname][] =  $gre;
+					$kwmap[$kwname] = $kwgroup['innerGroup'];
+				}
+				foreach ($kwm as $g => $ma) {
+					$kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+				}
+				$kw[] = $kwm;
+			} else {
+				$kw[] = -1;
+				$re[] = '(' . $block['start'] . ')';
+				$ce[] = $this->_countSubpatterns($block['start']);
+				$rd[] = $block['delimGroup'];
+				$st[] = $states[$name];
+				$sb[] = $block['remember'];
+			}
+			$in[] = $block['innerGroup'];
+		}
+		$re = implode('|', $re);
+		$regs[-1] = '/' . $re . '/';
+		$counts[-1] = $ce;
+		$delim[-1] = $rd;
+		$inner[-1] = $in;
+		$stat[-1] = $st;
+		$keywords[-1] = $kw;
+		$subst[-1] = $sb;
+
+		foreach ($syntax['blocks'] as $ablock) {
+			if ($ablock['type'] != 'region') {
+				continue;
+			}
+			$end[] = '/' . $ablock['end'] . '/';
+			$re = array();
+			$ce = array();
+			$rd = array();
+			$in = array();
+			$st = array();
+			$kw = array();
+			$pc = array();
+			$sb = array();
+			foreach ((array)@$ablock['lookfor'] as $name) {
+				$block = $syntax['blocks'][$name];
+				if (isset($block['partClass'])) {
+					$pc[] = $block['partClass'];
+				} else {
+					$pc[] = null;
+				}
+				if ($block['type'] == 'block') {
+					$kwm = array();;
+					$re[] = '(' . $block['match'] . ')';
+					$ce[] = $this->_countSubpatterns($block['match']);
+					$rd[] = '';
+					$sb[] = false;
+					$st[] = -1;
+					foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+						if ($kwgroup['inherits'] != $name) {
+							continue;
+						}
+						$gre = implode('|', array_keys($kwgroup['match']));
+						if (!$kwgroup['case']) {
+							$gre = '(?i)' . $gre;
+						}
+						$kwm[$kwname][] =  $gre;
+						$kwmap[$kwname] = $kwgroup['innerGroup'];
+					}
+					foreach ($kwm as $g => $ma) {
+						$kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+					}
+					$kw[] = $kwm;
+				} else {
+					$sb[] = $block['remember'];
+					$kw[] = -1;
+					$re[] = '(' . $block['start'] . ')';
+					$ce[] = $this->_countSubpatterns($block['start']);
+					$rd[] = $block['delimGroup'];
+					$st[] = $states[$name];
+				}
+				$in[] = $block['innerGroup'];
+			}
+			$re = implode('|', $re);
+			$regs[] = '/' . $re . '/';
+			$counts[] = $ce;
+			$delim[] = $rd;
+			$inner[] = $in;
+			$stat[] = $st;
+			$keywords[] = $kw;
+			$parts[] = $pc;
+			$subst[] = $sb;
+		}
+
+
+		$this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
+		$this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
+		$this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
+		$this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
+		$this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
+		$this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
+		$this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
+		$this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
+		$this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
+		$this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
+		$this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
+		$this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+		$this->_code .= <<<CODE
 ;
         \$this->_checkDefines();
     }

Spacing +47 added lines, -48 removed lines

@@ -27,18 +27,18 @@ 
 
 // {{{ error codes
 
-define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
-define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
-define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
-define ('TEXT_HIGHLIGHTER_EMPTY',             4);
-define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
-define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
-define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
-define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
-define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
-define ('TEXT_HIGHLIGHTER_PARSE',            10);
-define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
-define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
+define('TEXT_HIGHLIGHTER_EMPTY_RE', 1);
+define('TEXT_HIGHLIGHTER_INVALID_RE', 2);
+define('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING', 3);
+define('TEXT_HIGHLIGHTER_EMPTY', 4);
+define('TEXT_HIGHLIGHTER_REGION_REGION', 5);
+define('TEXT_HIGHLIGHTER_REGION_BLOCK', 6);
+define('TEXT_HIGHLIGHTER_BLOCK_REGION', 7);
+define('TEXT_HIGHLIGHTER_KEYWORD_BLOCK', 8);
+define('TEXT_HIGHLIGHTER_KEYWORD_INHERITS', 9);
+define('TEXT_HIGHLIGHTER_PARSE', 10);
+define('TEXT_HIGHLIGHTER_FILE_WRITE', 11);
+define('TEXT_HIGHLIGHTER_FILE_READ', 12);
 // }}}
 
 /**
@@ -239,7 +239,7 @@ 
     */
     function _declareErrorMessages()
     {
-        $this->_templates = array (
+        $this->_templates = array(
         TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
         TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
         TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
@@ -297,7 +297,7 @@ 
         $this->_inComment  = false;
         $this->_authors    = array();
         $this->_blockOrder = 0;
-        $this->_errors   = array();
+        $this->_errors = array();
 
         $ret = $this->parse();
         if (PEAR::isError($ret)) {
@@ -342,7 +342,7 @@ 
             $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
             return false;
         }
-        fwrite ($f, $this->_code);
+        fwrite($f, $this->_code);
         fclose($f);
         return true;
     }
@@ -430,7 +430,7 @@ 
         if ($php_errormsg) {
             $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
         }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
+        preg_match('#^/(.+)/(.*)$#', $text, $m);
         if (@$m[2]) {
             $text = '(?' . $m[2] . ')' . $m[1];
         } else {
@@ -452,7 +452,7 @@ 
     function _exportArray($array)
     {
         $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        return trim(preg_replace('~^(\s*)~m', '        \1\1', $array));
     }
 
     // }}}
@@ -465,7 +465,7 @@ 
     function _countSubpatterns($re)
     {
         preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
+        return count($m) - 1;
     }
 
     // }}}
@@ -515,8 +515,7 @@ 
         }
         $this->_element['innerGroup'] = $attribs['innerGroup'];
         $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
+        $attribs['delimGroup'] : $attribs['innerGroup'];
         $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
         $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
         $this->_element['contained'] = @$attribs['contained'] == 'yes';
@@ -738,7 +737,7 @@ 
         }
         $this->_authors[] = array(
         'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
+        'email' => (string) @$attribs['email']
         );
     }
 
@@ -828,7 +827,7 @@ 
     function xmltag_Region_($xp, $elem)
     {
         $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_element['order'] = $this->_blockOrder++;
         $this->_regions[$this->_element['name']] = $this->_element;
     }
 
@@ -852,7 +851,7 @@ 
     function xmltag_Block_($xp, $elem)
     {
         $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_element['order'] = $this->_blockOrder++;
         $this->_blocks[$this->_element['name']] = $this->_element;
     }
 
@@ -870,7 +869,7 @@ 
             if (!$current['contained'] && !isset($current['onlyin'])) {
                 $toplevel[] = $i;
             }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+            foreach ((array) @$current['onlyin'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
                     array(
@@ -884,7 +883,7 @@ 
             if (!$current['contained'] && !isset($current['onlyin'])) {
                 $toplevel[] = $i;
             }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+            foreach ((array) @$current['contains']['region'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
                     array(
@@ -893,7 +892,7 @@ 
                     ));
                 }
             }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+            foreach ((array) @$current['contains']['block'] as $region => $lineNo) {
                 if (!isset($this->_blocks[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
                     array(
@@ -902,7 +901,7 @@ 
                     ));
                 }
             }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+            foreach ((array) @$current['onlyin'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
                     array(
@@ -973,7 +972,7 @@ 
                 'block' => $keyword['inherits']
                 ));
             }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']])) {
                 $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
                 array(
                 'keyword' => $keyword['name'],
@@ -982,7 +981,7 @@ 
             }
         }
 
-        $syntax=array(
+        $syntax = array(
         'keywords'   => $this->_keywords,
         'blocks'     => array_merge($this->_blocks, $this->_regions),
         'toplevel'   => $toplevel,
@@ -1005,7 +1004,7 @@ 
 CODE;
 
         if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
+            $comment = preg_replace('~^~m', ' * ', $this->_comment);
             $this->_code .= "\n * \n" . $comment;
         }
 
@@ -1049,7 +1048,7 @@ 
         foreach ($this->_authors as $author) {
             $this->_code .= ' * @author ' . $author['name'];
             if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
+                $this->_code .= ' <' . $author['email'] . '>';
             }
             $this->_code .= "\n";
         }
@@ -1069,7 +1068,7 @@ 
 CODE;
         $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
         $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        $array = trim(preg_replace('~^(\s*)~m', '        \1\1', $array));
         //        \$this->_syntax = $array;
         $this->_code .= <<<CODE
 
@@ -1118,7 +1117,7 @@ 
                 $re[] = '(' . $block['match'] . ')';
                 $ce[] = $this->_countSubpatterns($block['match']);
                 $rd[] = '';
-                $sb[] = false;;
+                $sb[] = false; ;
                 $st[] = -1;
                 foreach ($syntax['keywords'] as $kwname => $kwgroup) {
                     if ($kwgroup['inherits'] != $name) {
@@ -1128,7 +1127,7 @@ 
                     if (!$kwgroup['case']) {
                         $gre = '(?i)' . $gre;
                     }
-                    $kwm[$kwname][] =  $gre;
+                    $kwm[$kwname][] = $gre;
                     $kwmap[$kwname] = $kwgroup['innerGroup'];
                 }
                 foreach ($kwm as $g => $ma) {
@@ -1167,7 +1166,7 @@ 
             $kw = array();
             $pc = array();
             $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
+            foreach ((array) @$ablock['lookfor'] as $name) {
                 $block = $syntax['blocks'][$name];
                 if (isset($block['partClass'])) {
                     $pc[] = $block['partClass'];
@@ -1175,7 +1174,7 @@ 
                     $pc[] = null;
                 }
                 if ($block['type'] == 'block') {
-                    $kwm = array();;
+                    $kwm = array(); ;
                     $re[] = '(' . $block['match'] . ')';
                     $ce[] = $this->_countSubpatterns($block['match']);
                     $rd[] = '';
@@ -1189,7 +1188,7 @@ 
                         if (!$kwgroup['case']) {
                             $gre = '(?i)' . $gre;
                         }
-                        $kwm[$kwname][] =  $gre;
+                        $kwm[$kwname][] = $gre;
                         $kwmap[$kwname] = $kwgroup['innerGroup'];
                     }
                     foreach ($kwm as $g => $ma) {
@@ -1219,17 +1218,17 @@ 
 
 
         $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+        $this->_code .= ";\n        \$this->_counts = " . $this->_exportArray($counts);
+        $this->_code .= ";\n        \$this->_delim = " . $this->_exportArray($delim);
+        $this->_code .= ";\n        \$this->_inner = " . $this->_exportArray($inner);
+        $this->_code .= ";\n        \$this->_end = " . $this->_exportArray($end);
+        $this->_code .= ";\n        \$this->_states = " . $this->_exportArray($stat);
+        $this->_code .= ";\n        \$this->_keywords = " . $this->_exportArray($keywords);
+        $this->_code .= ";\n        \$this->_parts = " . $this->_exportArray($parts);
+        $this->_code .= ";\n        \$this->_subst = " . $this->_exportArray($subst);
+        $this->_code .= ";\n        \$this->_conditions = " . $this->_exportArray($conditions);
+        $this->_code .= ";\n        \$this->_kwmap = " . $this->_exportArray($kwmap);
+        $this->_code .= ";\n        \$this->_defClass = '" . $this->_defClass . '\'';
         $this->_code .= <<<CODE
 ;
         \$this->_checkDefines();

framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,6 @@ 
      *
      * @access public
      *
-     * @param  array $options  Rendering options. Renderer-specific.
      */
     function reset()
     {
@@ -130,6 +129,7 @@ 
      * Set current language
      *
      * @abstract
+     * @param string $lang
      * @return void
      * @access public
      *

Indentation +95 added lines, -95 removed lines

@@ -35,109 +35,109 @@
 
 class Text_Highlighter_Renderer
 {
-    /**
-     * Renderer options
-     *
-     * @var array
-     * @access protected
-     */
-    public $_options = array();
+	/**
+	 * Renderer options
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	public $_options = array();
 
-    /**
-     * Current language
-     *
-     * @var string
-     * @access protected
-     */
-    public $_language = '';
+	/**
+	 * Current language
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	public $_language = '';
 
-    /**
-     * Constructor
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function __construct($options = array())
-    {
-        $this->_options = $options;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 *
+	 * @param  array $options  Rendering options. Renderer-specific.
+	 */
+	function __construct($options = array())
+	{
+		$this->_options = $options;
+	}
 
-    /**
-     * Resets renderer state
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function reset()
-    {
-        return;
-    }
+	/**
+	 * Resets renderer state
+	 *
+	 * @access public
+	 *
+	 * @param  array $options  Rendering options. Renderer-specific.
+	 */
+	function reset()
+	{
+		return;
+	}
 
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        return $str;
-    }
+	/**
+	 * Preprocesses code
+	 *
+	 * @access public
+	 *
+	 * @param  string $str Code to preprocess
+	 * @return string Preprocessed code
+	 */
+	function preprocess($str)
+	{
+		return $str;
+	}
 
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        return;
-    }
+	/**
+	 * Accepts next token
+	 *
+	 * @abstract
+	 * @access public
+	 *
+	 * @param  string $class   Token class
+	 * @param  string $content Token content
+	 */
+	function acceptToken($class, $content)
+	{
+		return;
+	}
 
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        return;
-    }
+	/**
+	 * Signals that no more tokens are available
+	 *
+	 * @access public
+	 *
+	 */
+	function finalize()
+	{
+		return;
+	}
 
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return mixed Renderer-specific
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return;
-    }
+	/**
+	 * Get generated output
+	 *
+	 * @abstract
+	 * @return mixed Renderer-specific
+	 * @access public
+	 *
+	 */
+	function getOutput()
+	{
+		return;
+	}
 
-    /**
-     * Set current language
-     *
-     * @abstract
-     * @return void
-     * @access public
-     *
-     */
-    function setCurrentLanguage($lang)
-    {
-        $this->_language = $lang;
-    }
+	/**
+	 * Set current language
+	 *
+	 * @abstract
+	 * @return void
+	 * @access public
+	 *
+	 */
+	function setCurrentLanguage($lang)
+	{
+		$this->_language = $lang;
+	}
 
 }
 

framework/3rdParty/WsdlGen/WsdlMessage.php

Doc Comments -1 removed lines

@@ -59,7 +59,6 @@
 
 	/**
 	 * Return the message as a DOM element
-	 * @param 		DOMDocument		$wsdl		The wsdl document the messages will be children of
 	 */
 	public function getMessageElement(DOMDocument $dom)
 	{

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * WsdlMessage file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
- *
- * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
- * This file is part of the PRADO framework from {@link http://www.xisc.com}
- *
- * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.Web.Services.SOAP
- */
+	 * WsdlMessage file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
+	 * This file is part of the PRADO framework from {@link http://www.xisc.com}
+	 *
+	 * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @package System.Web.Services.SOAP
+	 */
 
 /**
  * Represents a WSDL message. This is bound to the portTypes

framework/Caching/TCache.php

Doc Comments +16 added lines, -1 removed lines

@@ -98,6 +98,7 @@ 
 
 	/**
 	 * @param string a unique prefix for the keys of cached values
+	 * @param string $value
 	 */
 	public function setKeyPrefix($value)
 	{
@@ -106,7 +107,7 @@ 
 
 	/**
 	 * @param string a key identifying a value to be cached
-	 * @return sring a key generated from the provided key which ensures the uniqueness across applications
+	 * @return string a key generated from the provided key which ensures the uniqueness across applications
 	 */
 	protected function generateUniqueKey($key)
 	{
@@ -160,6 +161,8 @@ 
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
+	 * @param string $id
+	 * @param string $value
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function add($id,$value,$expire=0,$dependency=null)
@@ -198,6 +201,7 @@ 
 	 * in {@link get()} already. So only the implementation of data retrieval
 	 * is needed.
 	 * @param string a unique key identifying the cached value
+	 * @param string $key
 	 * @return string the value stored in cache, false if the value is not in the cache or expired.
 	 */
 	abstract protected function getValue($key);
@@ -212,6 +216,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function setValue($key,$value,$expire);
@@ -226,6 +232,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function addValue($key,$value,$expire);
@@ -234,6 +242,7 @@ 
 	 * Deletes a value with the specified key from cache
 	 * This method should be implemented by child classes to delete the data from actual cache storage.
 	 * @param string the key of the value to be deleted
+	 * @param string $key
 	 * @return boolean if no error happens during deletion
 	 */
 	abstract protected function deleteValue($key);
@@ -409,6 +418,7 @@ 
 	/**
 	 * Constructor.
 	 * @param string the directory to be checked
+	 * @param string $directory
 	 */
 	public function __construct($directory)
 	{
@@ -446,6 +456,7 @@ 
 
 	/**
 	 * @param boolean whether the subdirectories of the directory will also be checked.
+	 * @param boolean $value
 	 */
 	public function setRecursiveCheck($value)
 	{
@@ -468,6 +479,7 @@ 
 	 * @param int the depth of the subdirectories to be checked.
 	 * If the value is less than 0, it means unlimited depth.
 	 * If the value is 0, it means checking the files directly under the specified directory.
+	 * @param integer $value
 	 */
 	public function setRecursiveLevel($value)
 	{
@@ -490,6 +502,7 @@ 
 	 * By default, it always returns true, meaning the file should be checked.
 	 * You may override this method to check only certain files.
 	 * @param string the name of the file that may be checked for dependency.
+	 * @param string $fileName
 	 * @return boolean whether this file should be checked.
 	 */
 	protected function validateFile($fileName)
@@ -503,6 +516,7 @@ 
 	 * By default, it always returns true, meaning the subdirectory should be checked.
 	 * You may override this method to check only certain subdirectories.
 	 * @param string the name of the subdirectory that may be checked for dependency.
+	 * @param string $directory
 	 * @return boolean whether this subdirectory should be checked.
 	 */
 	protected function validateDirectory($directory)
@@ -516,6 +530,7 @@ 
 	 * {@link setRecursiveCheck RecursiveCheck} is set true.
 	 * @param string the directory name
 	 * @param int level of the recursion
+	 * @param string $directory
 	 * @return array list of file modification time indexed by the file path
 	 */
 	protected function generateTimestamps($directory,$level=0)

Spacing +60 added lines, -60 removed lines

@@ -46,8 +46,8 @@ 
  */
 abstract class TCache extends TModule implements ICache, ArrayAccess
 {
-	private $_prefix=null;
-	private $_primary=true;
+	private $_prefix = null;
+	private $_primary = true;
 
 	/**
 	 * Initializes the cache module.
@@ -57,14 +57,14 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix===null)
-			$this->_prefix=$this->getApplication()->getUniqueID();
-		if($this->_primary)
+		if ($this->_prefix === null)
+			$this->_prefix = $this->getApplication()->getUniqueID();
+		if ($this->_primary)
 		{
-			if($this->getApplication()->getCache()===null)
+			if ($this->getApplication()->getCache() === null)
 				$this->getApplication()->setCache($this);
 			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
 		}
 	}
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function setPrimaryCache($value)
 	{
-		$this->_primary=TPropertyValue::ensureBoolean($value);
+		$this->_primary = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setKeyPrefix($value)
 	{
-		$this->_prefix=$value;
+		$this->_prefix = $value;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix.$key);
+		return md5($this->_prefix . $key);
 	}
 
 	/**
@@ -120,11 +120,11 @@ 
 	 */
 	public function get($id)
 	{
-		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
+		if (($data = $this->getValue($this->generateUniqueKey($id))) !== false)
 		{
-			if(!is_array($data))
+			if (!is_array($data))
 				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
+			if (!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
 				return $data[0];
 		}
 		return false;
@@ -142,14 +142,14 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null)
+	public function set($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			$this->delete($id);
 		else
 		{
-			$data=array($value,$dependency);
-			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
+			$data = array($value, $dependency);
+			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
 
@@ -162,12 +162,12 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			return false;
-		$data=array($value,$dependency);
-		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
+		$data = array($value, $dependency);
+		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function setValue($key,$value,$expire);
+	abstract protected function setValue($key, $value, $expire);
 
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
@@ -228,7 +228,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function addValue($key,$value,$expire);
+	abstract protected function addValue($key, $value, $expire);
 
 	/**
 	 * Deletes a value with the specified key from cache
@@ -358,8 +358,8 @@ 
 	 */
 	public function setFileName($value)
 	{
-		$this->_fileName=$value;
-		$this->_timestamp=@filemtime($value);
+		$this->_fileName = $value;
+		$this->_timestamp = @filemtime($value);
 	}
 
 	/**
@@ -377,7 +377,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return @filemtime($this->_fileName)!==$this->_timestamp;
+		return @filemtime($this->_fileName) !== $this->_timestamp;
 	}
 }
 
@@ -401,8 +401,8 @@ 
  */
 class TDirectoryCacheDependency extends TCacheDependency
 {
-	private $_recursiveCheck=true;
-	private $_recursiveLevel=-1;
+	private $_recursiveCheck = true;
+	private $_recursiveLevel = -1;
 	private $_timestamps;
 	private $_directory;
 
@@ -429,10 +429,10 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
-		$this->_directory=$path;
-		$this->_timestamps=$this->generateTimestamps($path);
+		if (($path = realpath($directory)) === false || !is_dir($path))
+			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
+		$this->_directory = $path;
+		$this->_timestamps = $this->generateTimestamps($path);
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 */
 	public function setRecursiveCheck($value)
 	{
-		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
+		$this->_recursiveCheck = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	public function setRecursiveLevel($value)
 	{
-		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
+		$this->_recursiveLevel = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
+		return $this->generateTimestamps($this->_directory) != $this->_timestamps;
 	}
 
 	/**
@@ -518,23 +518,23 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory,$level=0)
+	protected function generateTimestamps($directory, $level = 0)
 	{
-		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
-		$timestamps=array();
-		while(($file=readdir($dir))!==false)
+		if (($dir = opendir($directory)) === false)
+			throw new TIOException('directorycachedependency_directory_invalid', $directory);
+		$timestamps = array();
+		while (($file = readdir($dir)) !== false)
 		{
-			$path=$directory.DIRECTORY_SEPARATOR.$file;
-			if($file==='.' || $file==='..')
+			$path = $directory . DIRECTORY_SEPARATOR . $file;
+			if ($file === '.' || $file === '..')
 				continue;
-			else if(is_dir($path))
+			else if (is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if (($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
+					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
 			}
-			else if($this->validateFile($path))
-				$timestamps[$path]=filemtime($path);
+			else if ($this->validateFile($path))
+				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;
@@ -582,8 +582,8 @@ 
 	 */
 	public function setStateName($value)
 	{
-		$this->_stateName=$value;
-		$this->_stateValue=Prado::getApplication()->getGlobalState($value);
+		$this->_stateName = $value;
+		$this->_stateValue = Prado::getApplication()->getGlobalState($value);
 	}
 
 	/**
@@ -593,7 +593,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->_stateValue!==Prado::getApplication()->getGlobalState($this->_stateName);
+		return $this->_stateValue !== Prado::getApplication()->getGlobalState($this->_stateName);
 	}
 }
 
@@ -616,15 +616,15 @@ 
  */
 class TChainedCacheDependency extends TCacheDependency
 {
-	private $_dependencies=null;
+	private $_dependencies = null;
 
 	/**
 	 * @return TCacheDependencyList list of dependency objects
 	 */
 	public function getDependencies()
 	{
-		if($this->_dependencies===null)
-			$this->_dependencies=new TCacheDependencyList;
+		if ($this->_dependencies === null)
+			$this->_dependencies = new TCacheDependencyList;
 		return $this->_dependencies;
 	}
 
@@ -636,10 +636,10 @@ 
 	 */
 	public function getHasChanged()
 	{
-		if($this->_dependencies!==null)
+		if ($this->_dependencies !== null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach ($this->_dependencies as $dependency)
+				if ($dependency->getHasChanged())
 					return true;
 		}
 		return false;
@@ -672,7 +672,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return Prado::getApplication()->getMode()!==TApplicationMode::Performance;
+		return Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 	}
 }
 
@@ -699,10 +699,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a dependency instance
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
+		if ($item instanceof ICacheDependency)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
 	}

Braces +45 added lines, -34 removed lines

@@ -57,14 +57,16 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix===null)
-			$this->_prefix=$this->getApplication()->getUniqueID();
+		if($this->_prefix===null) {
+					$this->_prefix=$this->getApplication()->getUniqueID();
+		}
 		if($this->_primary)
 		{
-			if($this->getApplication()->getCache()===null)
-				$this->getApplication()->setCache($this);
-			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+			if($this->getApplication()->getCache()===null) {
+							$this->getApplication()->setCache($this);
+			} else {
+							throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+			}
 		}
 	}
 
@@ -122,10 +124,12 @@ 
 	{
 		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
 		{
-			if(!is_array($data))
-				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
-				return $data[0];
+			if(!is_array($data)) {
+							return false;
+			}
+			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged()) {
+							return $data[0];
+			}
 		}
 		return false;
 	}
@@ -144,9 +148,9 @@ 
 	 */
 	public function set($id,$value,$expire=0,$dependency=null)
 	{
-		if(empty($value) && $expire === 0)
-			$this->delete($id);
-		else
+		if(empty($value) && $expire === 0) {
+					$this->delete($id);
+		} else
 		{
 			$data=array($value,$dependency);
 			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
@@ -164,8 +168,9 @@ 
 	 */
 	public function add($id,$value,$expire=0,$dependency=null)
 	{
-		if(empty($value) && $expire === 0)
-			return false;
+		if(empty($value) && $expire === 0) {
+					return false;
+		}
 		$data=array($value,$dependency);
 		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
 	}
@@ -429,8 +434,9 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+		if(($path=realpath($directory))===false || !is_dir($path)) {
+					throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+		}
 		$this->_directory=$path;
 		$this->_timestamps=$this->generateTimestamps($path);
 	}
@@ -520,21 +526,23 @@ 
 	 */
 	protected function generateTimestamps($directory,$level=0)
 	{
-		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
+		if(($dir=opendir($directory))===false) {
+					throw new TIOException('directorycachedependency_directory_invalid',$directory);
+		}
 		$timestamps=array();
 		while(($file=readdir($dir))!==false)
 		{
 			$path=$directory.DIRECTORY_SEPARATOR.$file;
-			if($file==='.' || $file==='..')
-				continue;
-			else if(is_dir($path))
+			if($file==='.' || $file==='..') {
+							continue;
+			} else if(is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path)) {
+									$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				}
+			} else if($this->validateFile($path)) {
+							$timestamps[$path]=filemtime($path);
 			}
-			else if($this->validateFile($path))
-				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;
@@ -623,8 +631,9 @@ 
 	 */
 	public function getDependencies()
 	{
-		if($this->_dependencies===null)
-			$this->_dependencies=new TCacheDependencyList;
+		if($this->_dependencies===null) {
+					$this->_dependencies=new TCacheDependencyList;
+		}
 		return $this->_dependencies;
 	}
 
@@ -638,9 +647,10 @@ 
 	{
 		if($this->_dependencies!==null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach($this->_dependencies as $dependency) {
+							if($dependency->getHasChanged())
 					return true;
+			}
 		}
 		return false;
 	}
@@ -701,10 +711,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
+		if($item instanceof ICacheDependency) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
+		}
 	}
 }
 

framework/Collections/TAttributeCollection.php

Doc Comments +5 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param boolean whether the keys are case-sensitive.
+	 * @param boolean $value
 	 */
 	public function setCaseSensitive($value)
 	{
@@ -126,6 +127,7 @@ 
 	 * Removes an item from the map by its key.
 	 * This overrides the parent implementation by converting the key to lower case first if CaseSensitive is false.
 	 * @param mixed the key of the item to be removed
+	 * @param string $key
 	 * @return mixed the removed value, null if no such key exists.
 	 */
 	public function remove($key)
@@ -149,6 +151,7 @@ 
 	 * This method overrides parent implementation by returning true
 	 * if the collection contains the named key.
 	 * @param string the property name
+	 * @param string $name
 	 * @return boolean whether the property is defined
 	 */
 	public function hasProperty($name)
@@ -161,6 +164,7 @@ 
 	 * This method overrides parent implementation by returning true
 	 * if the collection contains the named key.
 	 * @param string the property name
+	 * @param string $name
 	 * @return boolean whether the property can be read
 	 */
 	public function canGetProperty($name)
@@ -173,6 +177,7 @@ 
 	 * This method overrides parent implementation by always returning true
 	 * because you can always add a new value to the collection.
 	 * @param string the property name
+	 * @param string $name
 	 * @return boolean true
 	 */
 	public function canSetProperty($name)

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
  */
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive=false;
+	private $_caseSensitive = false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -53,7 +53,7 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
+		if ($this->_caseSensitive === false)
 			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
 	}
 
@@ -67,7 +67,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -117,9 +117,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -53,8 +53,9 @@
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
-			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		if ($this->_caseSensitive===false) {
+					$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		}
 	}
 
 	/**

framework/Collections/TDummyDataSource.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Constructor.
 	 * @param integer number of (virtual) items in the data source.
+	 * @param integer $count
 	 */
 	public function __construct($count)
 	{

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct($count)
 	{
-		$this->_count=$count;
+		$this->_count = $count;
 	}
 
 	/**
@@ -88,8 +88,8 @@ 
 	 */
 	public function __construct($count)
 	{
-		$this->_count=$count;
-		$this->_index=0;
+		$this->_count = $count;
+		$this->_index = 0;
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_index=0;
+		$this->_index = 0;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 

framework/Collections/TList.php

Doc Comments +5 added lines, -1 removed lines

@@ -75,6 +75,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -277,7 +278,7 @@ 
 	 * Finds the base item.  If found, the item is inserted after it.
 	 * @param mixed the base item which comes before the second parameter when added to the list
 	 * @param mixed the item
-	 * @return int the index where the item is inserted
+	 * @return double the index where the item is inserted
 	 * @throws TInvalidDataValueException if the base item is not within this list
 	 * @throws TInvalidOperationException if the list is read-only
 	 * @since 3.2a
@@ -369,6 +370,8 @@ 
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to set item
 	 * @param mixed the item value
+	 * @param null|integer $offset
+	 * @param integer $item
 	 */
 	public function offsetSet($offset,$item)
 	{
@@ -385,6 +388,7 @@ 
 	 * Unsets the item at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to unset item
+	 * @param integer $offset
 	 */
 	public function offsetUnset($offset)
 	{

Spacing +56 added lines, -56 removed lines

@@ -34,22 +34,22 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TList extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r=false;
+	private $_r = false;
 
 	/**
 	 * Constructor.
@@ -58,9 +58,9 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data = null, $readOnly = false)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -78,7 +78,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -118,10 +118,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if ($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 */
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
 
 	/**
@@ -145,22 +145,22 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index===$this->_c)
-				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			if ($index === $this->_c)
+				$this->_d[$this->_c++] = $item;
+			else if ($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 	 */
 	public function remove($item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if (($index = $this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -185,7 +185,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -197,25 +197,25 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if ($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index===$this->_c)
+				if ($index === $this->_c)
 					return array_pop($this->_d);
 				else
 				{
-					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					$item = $this->_d[$index];
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -224,7 +224,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for ($i = $this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -234,7 +234,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
+		if (($index = array_search($item, $this->_d, true)) === false)
 			return -1;
 		else
 			return $index;
@@ -260,9 +260,9 @@ 
 	 */
 	public function insertBefore($baseitem, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if (($index = $this->indexOf($baseitem)) == -1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index, $item);
@@ -270,7 +270,7 @@ 
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -284,9 +284,9 @@ 
 	 */
 	public function insertAfter($baseitem, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if (($index = $this->indexOf($baseitem)) == -1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index + 1, $item);
@@ -294,7 +294,7 @@ 
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -313,14 +313,14 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
+			if ($this->_c > 0)
 				$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -332,12 +332,12 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -349,7 +349,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**
@@ -370,14 +370,14 @@ 
 	 * @param integer the offset to set item
 	 * @param mixed the item value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+		if ($offset === null || $offset === $this->_c)
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 
@@ -427,9 +427,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

Braces +60 added lines, -51 removed lines

@@ -60,8 +60,9 @@ 
 	 */
 	public function __construct($data=null,$readOnly=false)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 	}
 
@@ -118,10 +119,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
-			return $this->_d[$index];
-		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if($index>=0 && $index<$this->_c) {
+					return $this->_d[$index];
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 
 	/**
@@ -149,18 +151,18 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index===$this->_c)
-				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			if($index===$this->_c) {
+							$this->_d[$this->_c++]=$item;
+			} else if($index>=0 && $index<$this->_c)
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid',$index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
 	/**
@@ -180,12 +182,12 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
+			} else {
+							throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			else
-				throw new TInvalidDataValueException('list_item_inexistent');
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
 	/**
@@ -202,20 +204,20 @@ 
 			if($index>=0 && $index<$this->_c)
 			{
 				$this->_c--;
-				if($index===$this->_c)
-					return array_pop($this->_d);
-				else
+				if($index===$this->_c) {
+									return array_pop($this->_d);
+				} else
 				{
 					$item=$this->_d[$index];
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid',$index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
 	/**
@@ -224,8 +226,9 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
-			$this->removeAt($i);
+		for($i=$this->_c-1;$i>=0;--$i) {
+					$this->removeAt($i);
+		}
 	}
 
 	/**
@@ -243,10 +246,11 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
-			return -1;
-		else
-			return $index;
+		if(($index=array_search($item,$this->_d,true))===false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 
 	/**
@@ -262,15 +266,16 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 
 			$this->insertAt($index, $item);
 
 			return $index;
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
 	/**
@@ -286,15 +291,16 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
 	/**
@@ -315,13 +321,15 @@ 
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
-				$this->clear();
-			foreach($data as $item)
-				$this->add($item);
+			if($this->_c>0) {
+							$this->clear();
+			}
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
 	/**
@@ -334,11 +342,12 @@ 
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
-				$this->add($item);
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
 	/**
@@ -372,9 +381,9 @@ 
 	 */
 	public function offsetSet($offset,$item)
 	{
-		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
-		else
+		if($offset===null || $offset===$this->_c) {
+					$this->insertAt($this->_c,$item);
+		} else
 		{
 			$this->removeAt($offset);
 			$this->insertAt($offset,$item);