alxarafe / alixar

Dolibarr/Code/Core/Classes/Utils.php

Spacing +5 added lines, -5 removed lines

@@ -133,14 +133,14 @@ 
             if ($choice == 'allfiles') {
                 // Delete all files (except .lock and .unlock files, do not follow symbolic links)
                 if ($dolibarr_main_data_root) {
-                    $filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1);    // No need to use recursive, we will delete directory
+                    $filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1); // No need to use recursive, we will delete directory
                 }
             }
 
             if ($choice == 'allfilesold') {
                 // Delete all files (except .lock and .unlock files, do not follow symbolic links)
                 if ($dolibarr_main_data_root) {
-                    $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);   // No need to use recursive, we will delete directory
+                    $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold); // No need to use recursive, we will delete directory
                 }
             }
 
@@ -830,7 +830,7 @@ 
                         } elseif (is_string($row[$j]) && $row[$j] == '') {
                             // if it's an empty string, we set it as an empty string
                             $row[$j] = "''";
-                        } elseif (is_numeric($row[$j]) && !strcmp((string)$row[$j], (string)((float)$row[$j] + 0))) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+                        } elseif (is_numeric($row[$j]) && !strcmp((string) $row[$j], (string) ((float) $row[$j] + 0))) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
                             // if it's a number, we return it as-is
                             //                      $row[$j] = $row[$j];
                         } else { // else for all other cases we escape the value and put quotes around
@@ -1390,7 +1390,7 @@ 
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $this->error = "Error sending backp file " . ((string)$error);
+        $this->error = "Error sending backp file " . ((string) $error);
         $this->output = $output;
 
         if ($result) {
@@ -1431,7 +1431,7 @@ 
         }
 
         $cron_job = new Cronjob($db);
-        $cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, [], 1);   // Fetch jobs that are currently running
+        $cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, [], 1); // Fetch jobs that are currently running
 
         // Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)
         foreach ($cron_job->lines as $job_line) {

Dolibarr/Code/Core/Classes/vCard.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
     {
         // $type = "GIF" | "JPEG"
         //$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo;        // must be url of photo
+        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
         //$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
     }
 
@@ -359,7 +359,7 @@ 
     public function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text .= "VERSION:4.0\r\n";     // With V4, all encoding are UTF-8
+        $text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
         //$text.= "VERSION:2.1\r\n";
         foreach ($this->properties as $key => $value) {
             $newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...

Dolibarr/Code/Core/Classes/Canvas.php

Indentation +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
         //print ' => template_dir='.$this->template_dir.'<br>';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Shared method for canvas to assign values for templates
      *
@@ -150,7 +150,7 @@ 
      */
     public function assign_values(&$action = 'view', $id = 0, $ref = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (is_object($this->control) && method_exists($this->control, 'assign_values')) {
             $this->control->assign_values($action, $id, $ref);
         }
@@ -176,7 +176,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Display a canvas page. This will include the template for output.
      *  Variables used by templates may have been defined or loaded before into the assign_values function.
@@ -186,7 +186,7 @@ 
      */
     public function display_canvas($action)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $db, $conf, $langs, $user, $canvas;
         global $form, $formfile;
 

Dolibarr/Code/Core/Classes/Stats.php

Indentation +13 added lines, -13 removed lines

@@ -391,7 +391,7 @@ 
     // Here we have low level of shared code called by XxxStats.class.php
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return nb of elements by year
      *
@@ -400,7 +400,7 @@ 
      */
     protected function _getNbByYear($sql)
     {
-		// phpcs:enable
+        // phpcs:enable
         $result = array();
 
         dol_syslog(get_class($this) . '::' . __FUNCTION__, LOG_DEBUG);
@@ -420,7 +420,7 @@ 
         return $result;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return nb of elements, total amount and avg amount each year
      *
@@ -429,7 +429,7 @@ 
      */
     protected function _getAllByYear($sql)
     {
-		// phpcs:enable
+        // phpcs:enable
         $result = array();
 
         dol_syslog(get_class($this) . '::' . __FUNCTION__, LOG_DEBUG);
@@ -474,7 +474,7 @@ 
         return $result;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Renvoie le nombre de documents par mois pour une annee donnee
      *  Return number of documents per month for a given year
@@ -486,7 +486,7 @@ 
      */
     protected function _getNbByMonth($year, $sql, $format = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $result = array();
@@ -532,7 +532,7 @@ 
         return $data;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return the amount per month for a given year
      *
@@ -543,7 +543,7 @@ 
      */
     protected function _getAmountByMonth($year, $sql, $format = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $result = array();
@@ -589,7 +589,7 @@ 
         return $data;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return the amount average par month for a given year
      *
@@ -600,7 +600,7 @@ 
      */
     protected function _getAverageByMonth($year, $sql, $format = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $result = array();
@@ -647,7 +647,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return number or total of product refs
      *
@@ -657,7 +657,7 @@ 
      */
     protected function _getAllByProduct($sql, $limit = 10)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $result = array();
@@ -688,7 +688,7 @@ 
         return $result;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Returns the summed amounts per year for a given number of past years ending now
      *  @param  string  $sql    SQL

Spacing +4 added lines, -4 removed lines

@@ -102,8 +102,8 @@ 
             return array();
         }
 
-        $data  = array();  // This is the return value
-        $datay = array();  // This is a work value
+        $data  = array(); // This is the return value
+        $datay = array(); // This is a work value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -205,7 +205,7 @@ 
         }
 
         $datay = array();
-        $data = array();  // Return value
+        $data = array(); // Return value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -359,7 +359,7 @@ 
         if ($foundintocache) {    // Cache file found and is not too old
             dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
             $data = json_decode(file_get_contents($newpathofdestfile), true);
-            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data';  // Phan can't decode json_decode's return value
+            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data'; // Phan can't decode json_decode's return value
         } else {
             // This method is defined in parent object only, not into abstract, so we disable phpstan warning
             /** @phpstan-ignore-next-line */

Dolibarr/Code/Core/Classes/Notify.php

Spacing +2 added lines, -2 removed lines

@@ -367,7 +367,7 @@ 
                 $this->fk_user = $obj->fk_user;
                 $this->email = $obj->email;
                 $this->threshold = $obj->threshold;
-                $this->context  = $obj->context;
+                $this->context = $obj->context;
                 $this->datec = $this->db->jdate($obj->datec);
                 $this->datem = $this->db->jdate($obj->datem);
             }
@@ -488,7 +488,7 @@ 
                     while ($i < $num) {
                         $obj = $this->db->fetch_object($resql);
                         // we want to notify only if contact is enable
-                        if ($obj && $obj->status ==  1) {
+                        if ($obj && $obj->status == 1) {
                             $newval2 = trim($obj->email);
                             $isvalid = isValidEmail($newval2);
                             if (empty($resarray[$newval2])) {

Dolibarr/Code/Core/Classes/lessc_parser.php

Indentation +1646 added lines, -1646 removed lines

@@ -61,1650 +61,1650 @@
 // syntax tree
 class lessc_parser
 {
-	protected static $nextBlockId = 0; // used to uniquely identify blocks
-
-	protected static $precedence = array(
-		'=<' => 0,
-		'>=' => 0,
-		'=' => 0,
-		'<' => 0,
-		'>' => 0,
-
-		'+' => 1,
-		'-' => 1,
-		'*' => 2,
-		'/' => 2,
-		'%' => 2,
-	);
-
-	protected static $whitePattern;
-	protected static $commentMulti;
-
-	protected static $commentSingle = "//";
-	protected static $commentMultiLeft = "/*";
-	protected static $commentMultiRight = "*/";
-
-	// regex string to match any of the operators
-	protected static $operatorString;
-
-	// these properties will supress division unless it's inside parenthases
-	protected static $supressDivisionProps =
-		array('/border-radius$/i', '/^font$/i');
-
-	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
-	protected $lineDirectives = array("charset");
-
-	/**
-	 * if we are in parens we can be more liberal with whitespace around
-	 * operators because it must evaluate to a single value and thus is less
-	 * ambiguous.
-	 *
-	 * Consider:
-	 *     property1: 10 -5; // is two numbers, 10 and -5
-	 *     property2: (10 -5); // should evaluate to 5
-	 */
-	protected $inParens = false;
-
-	// caches preg escaped literals
-	protected static $literalCache = array();
-
-	public $env;
-	public $buffer;
-	public $count;
-	public $line;
-	public $eatWhiteDefault;
-	public $lessc;
-	public $sourceName;
-	public $writeComments;
-	public $seenComments;
-	public $currentProperty;
-	public $inExp;
-
-
-	public function __construct($lessc, $sourceName = null)
-	{
-		$this->eatWhiteDefault = true;
-		// reference to less needed for vPrefix, mPrefix, and parentSelector
-		$this->lessc = $lessc;
-
-		$this->sourceName = $sourceName; // name used for error messages
-
-		$this->writeComments = false;
-
-		if (!self::$operatorString) {
-			self::$operatorString =
-				'('.implode('|', array_map(
-					array('lessc', 'preg_quote'),
-					array_keys(self::$precedence)
-				)).')';
-
-			$commentSingle = Lessc::preg_quote(self::$commentSingle);
-			$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
-			$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
-
-			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
-			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
-		}
-	}
-
-	/**
-	 * Parse a string
-	 *
-	 * @param       string  $buffer         String to parse
-	 * @throws exception
-	 * @return NULL|stdclass
-	 */
-	public function parse($buffer)
-	{
-		$this->count = 0;
-		$this->line = 1;
-
-		$this->env = null; // block stack
-		$this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
-		$this->pushSpecialBlock("root");
-		$this->eatWhiteDefault = true;
-		$this->seenComments = array();
-
-		// trim whitespace on head
-		// if (preg_match('/^\s+/', $this->buffer, $m)) {
-		//  $this->line += substr_count($m[0], "\n");
-		//  $this->buffer = ltrim($this->buffer);
-		// }
-		$this->whitespace();
-
-		// parse the entire file
-		while (false !== $this->parseChunk());
-
-		if ($this->count != strlen($this->buffer)) {
-			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
-
-		}
-
-		// TODO report where the block was opened
-		if (!property_exists($this->env, 'parent') || !is_null($this->env->parent)) {
-			throw new exception('parse error: unclosed block');
-		}
-
-		return $this->env;
-	}
-
-	/**
-	 * Parse a single chunk off the head of the buffer and append it to the
-	 * current parse environment.
-	 * Returns false when the buffer is empty, or when there is an error.
-	 *
-	 * This function is called repeatedly until the entire document is
-	 * parsed.
-	 *
-	 * This parser is most similar to a recursive descent parser. Single
-	 * functions represent discrete grammatical rules for the language, and
-	 * they are able to capture the text that represents those rules.
-	 *
-	 * Consider the function Lessc::keyword(). (all parse functions are
-	 * structured the same)
-	 *
-	 * The function takes a single reference argument. When calling the
-	 * function it will attempt to match a keyword on the head of the buffer.
-	 * If it is successful, it will place the keyword in the referenced
-	 * argument, advance the position in the buffer, and return true. If it
-	 * fails then it won't advance the buffer and it will return false.
-	 *
-	 * All of these parse functions are powered by Lessc::match(), which behaves
-	 * the same way, but takes a literal regular expression. Sometimes it is
-	 * more convenient to use match instead of creating a new function.
-	 *
-	 * Because of the format of the functions, to parse an entire string of
-	 * grammatical rules, you can chain them together using &&.
-	 *
-	 * But, if some of the rules in the chain succeed before one fails, then
-	 * the buffer position will be left at an invalid state. In order to
-	 * avoid this, Lessc::seek() is used to remember and set buffer positions.
-	 *
-	 * Before parsing a chain, use $s = $this->seek() to remember the current
-	 * position into $s. Then if a chain fails, use $this->seek($s) to
-	 * go back where we started.
-	 */
-	protected function parseChunk()
-	{
-		if (empty($this->buffer)) {
-			return false;
-		}
-		$s = $this->seek();
-
-		if ($this->whitespace()) {
-			return true;
-		}
-
-		$key = null;
-		$value = null;
-		$mediaQueries = null;
-		$dirName = null;
-		$dirValue = null;
-		$importValue = null;
-		$guards = null;
-		$tag = null;
-		$args = null;
-		$isVararg = null;
-		$argv = null;
-		$suffix = null;
-		$var = null;
-		$tags = null;
-
-		// setting a property
-		if ($this->keyword($key) && $this->assign() &&
-			$this->propertyValue($value, $key) && $this->end()
-		) {
-			$this->append(array('assign', $key, $value), $s);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-
-		// look for special css blocks
-		if ($this->literal('@', false)) {
-			$this->count--;
-
-			// media
-			if ($this->literal('@media')) {
-				if ($this->mediaQueryList($mediaQueries)
-					&& $this->literal('{')
-				) {
-					$media = $this->pushSpecialBlock("media");
-					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
-					return true;
-				} else {
-					$this->seek($s);
-					return false;
-				}
-			}
-
-			if ($this->literal("@", false) && $this->keyword($dirName)) {
-				if ($this->isDirective($dirName, $this->blockDirectives)) {
-					if ($this->openString("{", $dirValue, null, array(";")) &&
-						$this->literal("{")
-					) {
-						$dir = $this->pushSpecialBlock("directive");
-						$dir->name = $dirName;
-						if (isset($dirValue)) {
-							$dir->value = $dirValue;
-						}
-						return true;
-					}
-				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
-					if ($this->propertyValue($dirValue) && $this->end()) {
-						$this->append(array("directive", $dirName, $dirValue));
-						return true;
-					}
-				}
-			}
-
-			$this->seek($s);
-		}
-
-		// setting a variable
-		if ($this->variable($var) && $this->assign() &&
-			$this->propertyValue($value) && $this->end()
-		) {
-			$this->append(array('assign', $var, $value), $s);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		if ($this->import($importValue)) {
-			$this->append($importValue, $s);
-			return true;
-		}
-
-		// opening parametric mixin
-		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
-			$this->guards($guards) &&
-			$this->literal('{')
-		) {
-			$block = $this->pushBlock($this->fixTags(array($tag)));
-			$block->args = $args;
-			$block->isVararg = $isVararg;
-			if (!empty($guards)) {
-				$block->guards = $guards;
-			}
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		// opening a simple block
-		if ($this->tags($tags) && $this->literal('{', false)) {
-			$tags = $this->fixTags($tags);
-			$this->pushBlock($tags);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		// closing a block
-		if ($this->literal('}', false)) {
-			try {
-				$block = $this->pop();
-			} catch (exception $e) {
-				$this->seek($s);
-				$this->throwError($e->getMessage());
-			}
-
-			$hidden = false;
-			if (is_null($block->type)) {
-				$hidden = true;
-				if (!isset($block->args)) {
-					foreach ($block->tags as $tag) {
-						if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
-							$hidden = false;
-							break;
-						}
-					}
-				}
-
-				foreach ($block->tags as $tag) {
-					if (is_string($tag)) {
-						$this->env->children[$tag][] = $block;
-					}
-				}
-			}
-
-			if (!$hidden) {
-				$this->append(array('block', $block), $s);
-			}
-
-			// this is done here so comments aren't bundled into he block that
-			// was just closed
-			$this->whitespace();
-			return true;
-		}
-
-		// mixin
-		if ($this->mixinTags($tags) &&
-			$this->argumentDef($argv, $isVararg) &&
-			$this->keyword($suffix)  && $this->end()
-		) {
-			$tags = $this->fixTags($tags);
-			$this->append(array('mixin', $tags, $argv, $suffix), $s);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		// spare ;
-		if ($this->literal(';')) {
-			return true;
-		}
-
-		return false; // got nothing, throw error
-	}
-
-	protected function isDirective($dirname, $directives)
-	{
-		// TODO: cache pattern in parser
-		$pattern = implode(
-			"|",
-			array_map(array("lessc", "preg_quote"), $directives)
-		);
-		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
-
-		return preg_match($pattern, $dirname);
-	}
-
-	protected function fixTags($tags)
-	{
-		// move @ tags out of variable namespace
-		foreach ($tags as &$tag) {
-			if ($tag[0] == $this->lessc->vPrefix) {
-				$tag[0] = $this->lessc->mPrefix;
-			}
-		}
-		return $tags;
-	}
-
-	// a list of expressions
-	protected function expressionList(&$exps)
-	{
-		$exp = null;
-
-		$values = array();
-
-		while ($this->expression($exp)) {
-			$values[] = $exp;
-		}
-
-		if (count($values) == 0) {
-			return false;
-		}
-
-		$exps = Lessc::compressList($values, ' ');
-		return true;
-	}
-
-	/**
-	 * Attempt to consume an expression.
-	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
-	 */
-	protected function expression(&$out)
-	{
-		$lhs = null;
-		$rhs = null;
-
-		if ($this->value($lhs)) {
-			$out = $this->expHelper($lhs, 0);
-
-			// look for / shorthand
-			if (!empty($this->env->supressedDivision)) {
-				unset($this->env->supressedDivision);
-				$s = $this->seek();
-				if ($this->literal("/") && $this->value($rhs)) {
-					$out = array("list", "",
-						array($out, array("keyword", "/"), $rhs));
-				} else {
-					$this->seek($s);
-				}
-			}
-
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * recursively parse infix equation with $lhs at precedence $minP
-	 */
-	protected function expHelper($lhs, $minP)
-	{
-		$next = null;
-		$rhs = null;
-
-		$this->inExp = true;
-		$ss = $this->seek();
-
-		while (true) {
-			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
-				ctype_space($this->buffer[$this->count - 1]);
-
-			// If there is whitespace before the operator, then we require
-			// whitespace after the operator for it to be an expression
-			$needWhite = $whiteBefore && !$this->inParens;
-
-			$m = array();
-			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
-				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
-					foreach (self::$supressDivisionProps as $pattern) {
-						if (preg_match($pattern, $this->env->currentProperty)) {
-							$this->env->supressedDivision = true;
-							break 2;
-						}
-					}
-				}
-
-
-				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
-					ctype_space($this->buffer[$this->count - 1]);
-
-				if (!$this->value($rhs)) {
-					break;
-				}
-
-				// peek for next operator to see what to do with rhs
-				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
-					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
-				}
-
-				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
-				$ss = $this->seek();
-
-				continue;
-			}
-
-			break;
-		}
-
-		$this->seek($ss);
-
-		return $lhs;
-	}
-
-	// consume a list of values for a property
-	public function propertyValue(&$value, $keyName = null)
-	{
-		$v = null;
-		$values = array();
-
-		if ($keyName !== null) {
-			$this->env->currentProperty = $keyName;
-		}
-
-		$s = null;
-		while ($this->expressionList($v)) {
-			$values[] = $v;
-			$s = $this->seek();
-			if (!$this->literal(',')) {
-				break;
-			}
-		}
-
-		if ($s) {
-			$this->seek($s);
-		}
-
-		if ($keyName !== null) {
-			unset($this->env->currentProperty);
-		}
-
-		if (count($values) == 0) {
-			return false;
-		}
-
-		$value = Lessc::compressList($values, ', ');
-		return true;
-	}
-
-	protected function parenValue(&$out)
-	{
-		$exp = null;
-
-		$s = $this->seek();
-
-		// speed shortcut
-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
-			return false;
-		}
-
-		$inParens = $this->inParens;
-		if ($this->literal("(") &&
-			($this->inParens = true) && $this->expression($exp) &&
-			$this->literal(")")
-		) {
-			$out = $exp;
-			$this->inParens = $inParens;
-			return true;
-		} else {
-			$this->inParens = $inParens;
-			$this->seek($s);
-		}
-
-		return false;
-	}
-
-	// a single value
-	protected function value(&$value)
-	{
-		$inner = null;
-		$word = null;
-		$str = null;
-		$var = null;
-
-		$s = $this->seek();
-
-		// speed shortcut
-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
-			// negation
-			if ($this->literal("-", false) &&
-				(($this->variable($inner) && $inner = array("variable", $inner)) ||
-				$this->unit($inner) ||
-				$this->parenValue($inner))
-			) {
-				$value = array("unary", "-", $inner);
-				return true;
-			} else {
-				$this->seek($s);
-			}
-		}
-
-		if ($this->parenValue($value)) {
-			return true;
-		}
-		if ($this->unit($value)) {
-			return true;
-		}
-		if ($this->color($value)) {
-			return true;
-		}
-		if ($this->func($value)) {
-			return true;
-		}
-		if ($this->string($value)) {
-			return true;
-		}
-
-		if ($this->keyword($word)) {
-			$value = array('keyword', $word);
-			return true;
-		}
-
-		// try a variable
-		if ($this->variable($var)) {
-			$value = array('variable', $var);
-			return true;
-		}
-
-		// unquote string (should this work on any type?
-		if ($this->literal("~") && $this->string($str)) {
-			$value = array("escape", $str);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		// css hack: \0
-		$m = array();
-		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
-			$value = array('keyword', '\\'.$m[1]);
-			return true;
-		} else {
-			$this->seek($s);
-		}
-
-		return false;
-	}
-
-	// an import statement
-	protected function import(&$out, $value = '')
-	{
-		if (!$this->literal('@import')) {
-			return false;
-		}
-
-		// @import "something.css" media;
-		// @import url("something.css") media;
-		// @import url(something.css) media;
-
-		if ($this->propertyValue($value)) {
-			$out = array("import", $value);
-			return true;
-		}
-
-		return false;
-	}
-
-	protected function mediaQueryList(&$out)
-	{
-		$list = null;
-
-		if ($this->genericList($list, "mediaQuery", ",", false)) {
-			$out = $list[2];
-			return true;
-		}
-		return false;
-	}
-
-	protected function mediaQuery(&$out)
-	{
-		$mediaType = null;
-
-		$s = $this->seek();
-
-		$expressions = null;
-		$parts = array();
-
-		if ((($this->literal("only") && ($only = true)) || ($this->literal("not") && ($not = true))) && $this->keyword($mediaType)) {
-			$prop = array("mediaType");
-			if (isset($only)) {
-				$prop[] = "only";
-			}
-			if (isset($not)) {
-				$prop[] = "not";
-			}
-			$prop[] = $mediaType;
-			$parts[] = $prop;
-		} else {
-			$this->seek($s);
-		}
-
-
-		if (!empty($mediaType) && !$this->literal("and")) {
-			// ~
-		} else {
-			$this->genericList($expressions, "mediaExpression", "and", false);
-			if (is_array($expressions)) {
-				$parts = array_merge($parts, $expressions[2]);
-			}
-		}
-
-		if (count($parts) == 0) {
-			$this->seek($s);
-			return false;
-		}
-
-		$out = $parts;
-		return true;
-	}
-
-	protected function mediaExpression(&$out)
-	{
-		$feature = null;
-		$variable = null;
-
-		$s = $this->seek();
-		$value = null;
-		if ($this->literal("(") &&
-			$this->keyword($feature) &&
-			($this->literal(":") && $this->expression($value)) &&
-			$this->literal(")")
-		) {
-			$out = array("mediaExp", $feature);
-			if ($value) {
-				$out[] = $value;
-			}
-			return true;
-		} elseif ($this->variable($variable)) {
-			$out = array('variable', $variable);
-			return true;
-		}
-
-		$this->seek($s);
-		return false;
-	}
-
-	// an unbounded string stopped by $end
-	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
-	{
-		$str = null;
-		$inter = null;
-
-		$oldWhite = $this->eatWhiteDefault;
-		$this->eatWhiteDefault = false;
-
-		$stop = array("'", '"', "@{", $end);
-		$stop = array_map(array("lessc", "preg_quote"), $stop);
-		// $stop[] = self::$commentMulti;
-
-		if (!is_null($rejectStrs)) {
-			$stop = array_merge($stop, $rejectStrs);
-		}
-
-		$patt = '(.*?)('.implode("|", $stop).')';
-
-		$nestingLevel = 0;
-
-		$content = array();
-		$m = array();
-		while ($this->match($patt, $m, false)) {
-			if (!empty($m[1])) {
-				$content[] = $m[1];
-				if ($nestingOpen) {
-					$nestingLevel += substr_count($m[1], $nestingOpen);
-				}
-			}
-
-			$tok = $m[2];
-
-			$this->count -= strlen($tok);
-			if ($tok == $end) {
-				if ($nestingLevel == 0) {
-					break;
-				} else {
-					$nestingLevel--;
-				}
-			}
-
-			if (($tok == "'" || $tok == '"') && $this->string($str)) {
-				$content[] = $str;
-				continue;
-			}
-
-			if ($tok == "@{" && $this->interpolation($inter)) {
-				$content[] = $inter;
-				continue;
-			}
-
-			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
-				break;
-			}
-
-			$content[] = $tok;
-			$this->count += strlen($tok);
-		}
-
-		$this->eatWhiteDefault = $oldWhite;
-
-		if (count($content) == 0) {
-			return false;
-		}
-
-		// trim the end
-		if (is_string(end($content))) {
-			$content[count($content) - 1] = rtrim(end($content));
-		}
-
-		$out = array("string", "", $content);
-		return true;
-	}
-
-	protected function string(&$out)
-	{
-		$inter = null;
-
-		$s = $this->seek();
-		if ($this->literal('"', false)) {
-			$delim = '"';
-		} elseif ($this->literal("'", false)) {
-			$delim = "'";
-		} else {
-			return false;
-		}
-
-		$content = array();
-
-		// look for either ending delim , escape, or string interpolation
-		$patt = '([^\n]*?)(@\{|\\\\|'.
-			Lessc::preg_quote($delim).')';
-
-		$oldWhite = $this->eatWhiteDefault;
-		$this->eatWhiteDefault = false;
-
-		$m = array();
-		while ($this->match($patt, $m, false)) {
-			$content[] = $m[1];
-			if ($m[2] == "@{") {
-				$this->count -= strlen($m[2]);
-				if ($this->interpolation($inter)) {
-					$content[] = $inter;
-				} else {
-					$this->count += strlen($m[2]);
-					$content[] = "@{"; // ignore it
-				}
-			} elseif ($m[2] == '\\') {
-				$content[] = $m[2];
-				if ($this->literal($delim, false)) {
-					$content[] = $delim;
-				}
-			} else {
-				$this->count -= strlen($delim);
-				break; // delim
-			}
-		}
-
-		$this->eatWhiteDefault = $oldWhite;
-
-		if ($this->literal($delim)) {
-			$out = array("string", $delim, $content);
-			return true;
-		}
-
-		$this->seek($s);
-		return false;
-	}
-
-	protected function interpolation(&$out)
-	{
-		$interp = array();
-
-		$oldWhite = $this->eatWhiteDefault;
-		$this->eatWhiteDefault = true;
-
-		$s = $this->seek();
-		if ($this->literal("@{") &&
-			$this->openString("}", $interp, null, array("'", '"', ";")) &&
-			$this->literal("}", false)
-		) {
-			$out = array("interpolate", $interp);
-			$this->eatWhiteDefault = $oldWhite;
-			if ($this->eatWhiteDefault) {
-				$this->whitespace();
-			}
-			return true;
-		}
-
-		$this->eatWhiteDefault = $oldWhite;
-		$this->seek($s);
-		return false;
-	}
-
-	protected function unit(&$unit)
-	{
-		$m = array();
-
-		// speed shortcut
-		if (isset($this->buffer[$this->count])) {
-			$char = $this->buffer[$this->count];
-			if (!ctype_digit($char) && $char != ".") {
-				return false;
-			}
-		}
-
-		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
-			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
-			return true;
-		}
-		return false;
-	}
-
-	// a # color
-	protected function color(&$out)
-	{
-		$m = array();
-
-		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
-			if (strlen($m[1]) > 7) {
-				$out = array("string", "", array($m[1]));
-			} else {
-				$out = array("raw_color", $m[1]);
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	// consume an argument definition list surrounded by ()
-	// each argument is a variable name with optional value
-	// or at the end a ... or a variable named followed by ...
-	// arguments are separated by , unless a ; is in the list, then ; is the
-	// delimiter.
-	protected function argumentDef(&$args, &$isVararg)
-	{
-		$value = array();
-		$rhs = null;
-
-		$s = $this->seek();
-		if (!$this->literal('(')) {
-			return false;
-		}
-
-		$values = array();
-		$delim = ",";
-		$method = "expressionList";
-
-		$isVararg = false;
-		while (true) {
-			if ($this->literal("...")) {
-				$isVararg = true;
-				break;
-			}
-
-			if ($this->$method($value)) {
-				if ($value[0] == "variable") {
-					$arg = array("arg", $value[1]);
-					$ss = $this->seek();
-
-					if ($this->assign() && $this->$method($rhs)) {
-						$arg[] = $rhs;
-					} else {
-						$this->seek($ss);
-						if ($this->literal("...")) {
-							$arg[0] = "rest";
-							$isVararg = true;
-						}
-					}
-
-					$values[] = $arg;
-					if ($isVararg) {
-						break;
-					}
-					continue;
-				} else {
-					$values[] = array("lit", $value);
-				}
-			}
-
-
-			if (!$this->literal($delim)) {
-				if ($delim == "," && $this->literal(";")) {
-					// found new delim, convert existing args
-					$delim = ";";
-					$method = "propertyValue";
-
-					// transform arg list
-					if (isset($values[1])) { // 2 items
-						$newList = array();
-						foreach ($values as $i => $arg) {
-							switch ($arg[0]) {
-								case "arg":
-									if ($i) {
-										$this->throwError("Cannot mix ; and , as delimiter types");
-									}
-									$newList[] = $arg[2];
-									break;
-								case "lit":
-									$newList[] = $arg[1];
-									break;
-								case "rest":
-									$this->throwError("Unexpected rest before semicolon");
-							}
-						}
-
-						$newList = array("list", ", ", $newList);
-
-						switch ($values[0][0]) {
-							case "arg":
-								$newArg = array("arg", $values[0][1], $newList);
-								break;
-							case "lit":
-								$newArg = array("lit", $newList);
-								break;
-						}
-
-					} elseif ($values) { // 1 item
-						$newArg = $values[0];
-					}
-
-					if ($newArg) {
-						$values = array($newArg);
-					}
-				} else {
-					break;
-				}
-			}
-		}
-
-		if (!$this->literal(')')) {
-			$this->seek($s);
-			return false;
-		}
-
-		$args = $values;
-
-		return true;
-	}
-
-	// consume a list of tags
-	// this accepts a hanging delimiter
-	protected function tags(&$tags, $simple = false, $delim = ',')
-	{
-		$tt = array();
-
-		$tags = array();
-		while ($this->tag($tt, $simple)) {
-			$tags[] = $tt;
-			if (!$this->literal($delim)) {
-				break;
-			}
-		}
-		if (count($tags) == 0) {
-			return false;
-		}
-
-		return true;
-	}
-
-	// list of tags of specifying mixin path
-	// optionally separated by > (lazy, accepts extra >)
-	protected function mixinTags(&$tags)
-	{
-		$tt = array();
-
-		$tags = array();
-		while ($this->tag($tt, true)) {
-			$tags[] = $tt;
-			$this->literal(">");
-		}
-
-		if (!$tags) {
-			return false;
-		}
-
-		return true;
-	}
-
-	// a bracketed value (contained within in a tag definition)
-	protected function tagBracket(&$parts, &$hasExpression)
-	{
-		$str = null;
-		$inter = null;
-		$word = null;
-
-		// speed shortcut
-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
-			return false;
-		}
-
-		$s = $this->seek();
-
-		$hasInterpolation = false;
-
-		if ($this->literal("[", false)) {
-			$attrParts = array("[");
-			// keyword, string, operator
-			while (true) {
-				if ($this->literal("]", false)) {
-					$this->count--;
-					break; // get out early
-				}
-
-				$m = array();
-				if ($this->match('\s+', $m)) {
-					$attrParts[] = " ";
-					continue;
-				}
-				if ($this->string($str)) {
-					// escape parent selector, (yuck)
-					foreach ($str[2] as &$chunk) {
-						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
-					}
-
-					$attrParts[] = $str;
-					$hasInterpolation = true;
-					continue;
-				}
-
-				if ($this->keyword($word)) {
-					$attrParts[] = $word;
-					continue;
-				}
-
-				if ($this->interpolation($inter)) {
-					$attrParts[] = $inter;
-					$hasInterpolation = true;
-					continue;
-				}
-
-				// operator, handles attr namespace too
-				if ($this->match('[|-~\$\*\^=]+', $m)) {
-					$attrParts[] = $m[0];
-					continue;
-				}
-
-				break;
-			}
-
-			if ($this->literal("]", false)) {
-				$attrParts[] = "]";
-				foreach ($attrParts as $part) {
-					$parts[] = $part;
-				}
-				$hasExpression = $hasExpression || $hasInterpolation;
-				return true;
-			}
-			$this->seek($s);
-		}
-
-		$this->seek($s);
-		return false;
-	}
-
-	// a space separated list of selectors
-	protected function tag(&$tag, $simple = false)
-	{
-		$interp = null;
-		$unit = null;
-
-		if ($simple) {
-			$chars = '^@,:;{}\][>\(\) "\'';
-		} else {
-			$chars = '^@,;{}["\'';
-		}
-		$s = $this->seek();
-
-		$hasExpression = false;
-		$parts = array();
-		while ($this->tagBracket($parts, $hasExpression));
-
-		$oldWhite = $this->eatWhiteDefault;
-		$this->eatWhiteDefault = false;
-
-		while (true) {
-			$m = array();
-			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
-				$parts[] = $m[1];
-				if ($simple) {
-					break;
-				}
-
-				while ($this->tagBracket($parts, $hasExpression));
-				continue;
-			}
-
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
-				if ($this->interpolation($interp)) {
-					$hasExpression = true;
-					$interp[2] = true; // don't unescape
-					$parts[] = $interp;
-					continue;
-				}
-
-				if ($this->literal("@")) {
-					$parts[] = "@";
-					continue;
-				}
-			}
-
-			if ($this->unit($unit)) { // for keyframes
-				$parts[] = $unit[1];
-				$parts[] = $unit[2];
-				continue;
-			}
-
-			break;
-		}
-
-		$this->eatWhiteDefault = $oldWhite;
-		if (!$parts) {
-			$this->seek($s);
-			return false;
-		}
-
-		if ($hasExpression) {
-			$tag = array("exp", array("string", "", $parts));
-		} else {
-			$tag = trim(implode($parts));
-		}
-
-		$this->whitespace();
-		return true;
-	}
-
-	// a css function
-	protected function func(&$func)
-	{
-		$s = $this->seek();
-
-		$m = array();
-		$value = array();
-		$string = array();
-		$name = null;
-
-		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
-			$fname = $m[1];
-
-			$sPreArgs = $this->seek();
-
-			$args = array();
-			while (true) {
-				$ss = $this->seek();
-				// this ugly nonsense is for ie filter properties
-				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
-					$args[] = array("string", "", array($name, "=", $value));
-				} else {
-					$this->seek($ss);
-					if ($this->expressionList($value)) {
-						$args[] = $value;
-					}
-				}
-
-				if (!$this->literal(',')) {
-					break;
-				}
-			}
-			$args = array('list', ',', $args);
-
-			if ($this->literal(')')) {
-				$func = array('function', $fname, $args);
-				return true;
-			} elseif ($fname == 'url') {
-				// couldn't parse and in url? treat as string
-				$this->seek($sPreArgs);
-				if ($this->openString(")", $string) && $this->literal(")")) {
-					$func = array('function', $fname, $string);
-					return true;
-				}
-			}
-		}
-
-		$this->seek($s);
-		return false;
-	}
-
-	// consume a less variable
-	protected function variable(&$name)
-	{
-		$sub = null;
-		$name = null;
-
-		$s = $this->seek();
-		if ($this->literal($this->lessc->vPrefix, false) &&
-			($this->variable($sub) || $this->keyword($name))
-		) {
-			if (!empty($sub)) {
-				$name = array('variable', $sub);
-			} else {
-				$name = $this->lessc->vPrefix.$name;
-			}
-			return true;
-		}
-
-		$name = null;
-		$this->seek($s);
-		return false;
-	}
-
-	/**
-	 * Consume an assignment operator
-	 * Can optionally take a name that will be set to the current property name
-	 */
-	protected function assign($name = null)
-	{
-		if ($name) {
-			$this->currentProperty = $name;
-		}
-		return $this->literal(':') || $this->literal('=');
-	}
-
-	// consume a keyword
-	protected function keyword(&$word)
-	{
-		$m = array();
-		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
-			$word = $m[1];
-			return true;
-		}
-		return false;
-	}
-
-	// consume an end of statement delimiter
-	protected function end()
-	{
-		if ($this->literal(';', false)) {
-			return true;
-		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
-			// if there is end of file or a closing block next then we don't need a ;
-			return true;
-		}
-		return false;
-	}
-
-	protected function guards(&$guards)
-	{
-		$g = null;
-
-		$s = $this->seek();
-
-		if (!$this->literal("when")) {
-			$this->seek($s);
-			return false;
-		}
-
-		$guards = array();
-
-		while ($this->guardGroup($g)) {
-			$guards[] = $g;
-			if (!$this->literal(",")) {
-				break;
-			}
-		}
-
-		if (count($guards) == 0) {
-			$guards = null;
-			$this->seek($s);
-			return false;
-		}
-
-		return true;
-	}
-
-	// a bunch of guards that are and'd together
-	// TODO rename to guardGroup
-	protected function guardGroup(&$guardGroup)
-	{
-		$guard = null;
-
-		$s = $this->seek();
-		$guardGroup = array();
-		while ($this->guard($guard)) {
-			$guardGroup[] = $guard;
-			if (!$this->literal("and")) {
-				break;
-			}
-		}
-
-		if (count($guardGroup) == 0) {
-			$guardGroup = null;
-			$this->seek($s);
-			return false;
-		}
-
-		return true;
-	}
-
-	protected function guard(&$guard)
-	{
-		$exp = null;
-
-		$s = $this->seek();
-		$negate = $this->literal("not");
-
-		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
-			$guard = $exp;
-			if ($negate) {
-				$guard = array("negate", $guard);
-			}
-			return true;
-		}
-
-		$this->seek($s);
-		return false;
-	}
-
-	/* raw parsing functions */
-
-	protected function literal($what, $eatWhitespace = null)
-	{
-		if ($eatWhitespace === null) {
-			$eatWhitespace = $this->eatWhiteDefault;
-		}
-
-		// shortcut on single letter
-		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
-			if ($this->buffer[$this->count] == $what) {
-				if (!$eatWhitespace) {
-					$this->count++;
-					return true;
-				}
-			// goes below...
-			} else {
-				return false;
-			}
-		}
-
-		if (!isset(self::$literalCache[$what])) {
-			self::$literalCache[$what] = Lessc::preg_quote($what);
-		}
-
-		$m = array();
-		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
-	}
-
-	protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
-	{
-		$value = null;
-
-		$s = $this->seek();
-		$items = array();
-		while ($this->$parseItem($value)) {
-			$items[] = $value;
-			if ($delim) {
-				if (!$this->literal($delim)) {
-					break;
-				}
-			}
-		}
-
-		if (count($items) == 0) {
-			$this->seek($s);
-			return false;
-		}
-
-		if ($flatten && count($items) == 1) {
-			$out = $items[0];
-		} else {
-			$out = array("list", $delim, $items);
-		}
-
-		return true;
-	}
-
-
-	// advance counter to next occurrence of $what
-	// $until - don't include $what in advance
-	// $allowNewline, if string, will be used as valid char set
-	protected function to($what, &$out, $until = false, $allowNewline = false)
-	{
-		if (is_string($allowNewline)) {
-			$validChars = $allowNewline;
-		} else {
-			$validChars = $allowNewline ? "." : "[^\n]";
-		}
-		$m = array();
-		if (!$this->match('('.$validChars.'*?)'.Lessc::preg_quote($what), $m, !$until)) {
-			return false;
-		}
-		if ($until) {
-			$this->count -= strlen($what); // give back $what
-		}
-		$out = $m[1];
-		return true;
-	}
-
-	// try to match something on head of buffer
-	protected function match($regex, &$out, $eatWhitespace = null)
-	{
-		if ($eatWhitespace === null) {
-			$eatWhitespace = $this->eatWhiteDefault;
-		}
-
-		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
-		if (preg_match($r, $this->buffer, $out, 0, $this->count)) {
-			$this->count += strlen($out[0]);
-			if ($eatWhitespace && $this->writeComments) {
-				$this->whitespace();
-			}
-			return true;
-		}
-		return false;
-	}
-
-	// match some whitespace
-	protected function whitespace()
-	{
-		if ($this->writeComments) {
-			$gotWhite = false;
-			$m = array();
-			while (preg_match(self::$whitePattern, $this->buffer, $m, 0, $this->count)) {
-				if (isset($m[1]) && empty($this->seenComments[$this->count])) {
-					$this->append(array("comment", $m[1]));
-					$this->seenComments[$this->count] = true;
-				}
-				$this->count += strlen($m[0]);
-				$gotWhite = true;
-			}
-			return $gotWhite;
-		} else {
-			$this->match("", $m);
-			return strlen($m[0]) > 0;
-		}
-	}
-
-	// match something without consuming it
-	protected function peek($regex, &$out = null, $from = null)
-	{
-		if (is_null($from)) {
-			$from = $this->count;
-		}
-		$r = '/'.$regex.'/Ais';
-		$result = preg_match($r, $this->buffer, $out, 0, $from);
-
-		return $result;
-	}
-
-	// seek to a spot in the buffer or return where we are on no argument
-	protected function seek($where = null)
-	{
-		if ($where === null) {
-			return $this->count;
-		} else {
-			$this->count = $where;
-		}
-		return true;
-	}
-
-	/* misc functions */
-
-	public function throwError($msg = "parse error", $count = null)
-	{
-		$count = is_null($count) ? $this->count : $count;
-
-		$line = $this->line +
-			substr_count(substr($this->buffer, 0, $count), "\n");
-
-		if (!empty($this->sourceName)) {
-			$loc = "$this->sourceName on line $line";
-		} else {
-			$loc = "line: $line";
-		}
-
-		// TODO this depends on $this->count
-		$m = array();
-		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
-			throw new exception("$msg: failed at `$m[1]` $loc");
-		} else {
-			throw new exception("$msg: $loc");
-		}
-	}
-
-	protected function pushBlock($selectors = null, $type = null)
-	{
-		$b = new stdclass();
-		$b->parent = $this->env;
-
-		$b->type = $type;
-		$b->id = self::$nextBlockId++;
-
-		$b->isVararg = false; // TODO: kill me from here
-		$b->tags = $selectors;
-
-		$b->props = array();
-		$b->children = array();
-
-		$this->env = $b;
-		return $b;
-	}
-
-	// push a block that doesn't multiply tags
-	protected function pushSpecialBlock($type)
-	{
-		return $this->pushBlock(null, $type);
-	}
-
-	// append a property to the current block
-	protected function append($prop, $pos = null)
-	{
-		if ($pos !== null) {
-			$prop[-1] = $pos;
-		}
-		$this->env->props[] = $prop;
-	}
-
-	// pop something off the stack
-	protected function pop()
-	{
-		$old = $this->env;
-		$this->env = $this->env->parent;
-		return $old;
-	}
-
-	// remove comments from $text
-	// todo: make it work for all functions, not just url
-	protected function removeComments($text)
-	{
-		$look = array(
-			'url(', '//', '/*', '"', "'"
-		);
-
-		$out = '';
-		$min = null;
-		while (true) {
-			// find the next item
-			foreach ($look as $token) {
-				$pos = strpos($text, $token);
-				if ($pos !== false) {
-					if (!isset($min) || $pos < $min[1]) {
-						$min = array($token, $pos);
-					}
-				}
-			}
-
-			if (is_null($min)) {
-				break;
-			}
-
-			$count = $min[1];
-			$skip = 0;
-			$newlines = 0;
-			switch ($min[0]) {
-				case 'url(':
-					$m = array();
-					if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) {
-						$count += strlen($m[0]) - strlen($min[0]);
-					}
-					break;
-				case '"':
-				case "'":
-					$m = array();
-					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
-						$count += strlen($m[0]) - 1;
-					}
-					break;
-				case '//':
-					$skip = strpos($text, "\n", $count);
-					if ($skip === false) {
-						$skip = strlen($text) - $count;
-					} else {
-						$skip -= $count;
-					}
-					break;
-				case '/*':
-					$m = array();
-					if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
-						$skip = strlen($m[0]);
-						$newlines = substr_count($m[0], "\n");
-					}
-					break;
-			}
-
-			if ($skip == 0) {
-				$count += strlen($min[0]);
-			}
-
-			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
-			$text = substr($text, $count + $skip);
-
-			$min = null;
-		}
-
-		return $out.$text;
-	}
+    protected static $nextBlockId = 0; // used to uniquely identify blocks
+
+    protected static $precedence = array(
+        '=<' => 0,
+        '>=' => 0,
+        '=' => 0,
+        '<' => 0,
+        '>' => 0,
+
+        '+' => 1,
+        '-' => 1,
+        '*' => 2,
+        '/' => 2,
+        '%' => 2,
+    );
+
+    protected static $whitePattern;
+    protected static $commentMulti;
+
+    protected static $commentSingle = "//";
+    protected static $commentMultiLeft = "/*";
+    protected static $commentMultiRight = "*/";
+
+    // regex string to match any of the operators
+    protected static $operatorString;
+
+    // these properties will supress division unless it's inside parenthases
+    protected static $supressDivisionProps =
+        array('/border-radius$/i', '/^font$/i');
+
+    protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
+    protected $lineDirectives = array("charset");
+
+    /**
+     * if we are in parens we can be more liberal with whitespace around
+     * operators because it must evaluate to a single value and thus is less
+     * ambiguous.
+     *
+     * Consider:
+     *     property1: 10 -5; // is two numbers, 10 and -5
+     *     property2: (10 -5); // should evaluate to 5
+     */
+    protected $inParens = false;
+
+    // caches preg escaped literals
+    protected static $literalCache = array();
+
+    public $env;
+    public $buffer;
+    public $count;
+    public $line;
+    public $eatWhiteDefault;
+    public $lessc;
+    public $sourceName;
+    public $writeComments;
+    public $seenComments;
+    public $currentProperty;
+    public $inExp;
+
+
+    public function __construct($lessc, $sourceName = null)
+    {
+        $this->eatWhiteDefault = true;
+        // reference to less needed for vPrefix, mPrefix, and parentSelector
+        $this->lessc = $lessc;
+
+        $this->sourceName = $sourceName; // name used for error messages
+
+        $this->writeComments = false;
+
+        if (!self::$operatorString) {
+            self::$operatorString =
+                '('.implode('|', array_map(
+                    array('lessc', 'preg_quote'),
+                    array_keys(self::$precedence)
+                )).')';
+
+            $commentSingle = Lessc::preg_quote(self::$commentSingle);
+            $commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
+            $commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
+
+            self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
+            self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+        }
+    }
+
+    /**
+     * Parse a string
+     *
+     * @param       string  $buffer         String to parse
+     * @throws exception
+     * @return NULL|stdclass
+     */
+    public function parse($buffer)
+    {
+        $this->count = 0;
+        $this->line = 1;
+
+        $this->env = null; // block stack
+        $this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
+        $this->pushSpecialBlock("root");
+        $this->eatWhiteDefault = true;
+        $this->seenComments = array();
+
+        // trim whitespace on head
+        // if (preg_match('/^\s+/', $this->buffer, $m)) {
+        //  $this->line += substr_count($m[0], "\n");
+        //  $this->buffer = ltrim($this->buffer);
+        // }
+        $this->whitespace();
+
+        // parse the entire file
+        while (false !== $this->parseChunk());
+
+        if ($this->count != strlen($this->buffer)) {
+            $this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+
+        }
+
+        // TODO report where the block was opened
+        if (!property_exists($this->env, 'parent') || !is_null($this->env->parent)) {
+            throw new exception('parse error: unclosed block');
+        }
+
+        return $this->env;
+    }
+
+    /**
+     * Parse a single chunk off the head of the buffer and append it to the
+     * current parse environment.
+     * Returns false when the buffer is empty, or when there is an error.
+     *
+     * This function is called repeatedly until the entire document is
+     * parsed.
+     *
+     * This parser is most similar to a recursive descent parser. Single
+     * functions represent discrete grammatical rules for the language, and
+     * they are able to capture the text that represents those rules.
+     *
+     * Consider the function Lessc::keyword(). (all parse functions are
+     * structured the same)
+     *
+     * The function takes a single reference argument. When calling the
+     * function it will attempt to match a keyword on the head of the buffer.
+     * If it is successful, it will place the keyword in the referenced
+     * argument, advance the position in the buffer, and return true. If it
+     * fails then it won't advance the buffer and it will return false.
+     *
+     * All of these parse functions are powered by Lessc::match(), which behaves
+     * the same way, but takes a literal regular expression. Sometimes it is
+     * more convenient to use match instead of creating a new function.
+     *
+     * Because of the format of the functions, to parse an entire string of
+     * grammatical rules, you can chain them together using &&.
+     *
+     * But, if some of the rules in the chain succeed before one fails, then
+     * the buffer position will be left at an invalid state. In order to
+     * avoid this, Lessc::seek() is used to remember and set buffer positions.
+     *
+     * Before parsing a chain, use $s = $this->seek() to remember the current
+     * position into $s. Then if a chain fails, use $this->seek($s) to
+     * go back where we started.
+     */
+    protected function parseChunk()
+    {
+        if (empty($this->buffer)) {
+            return false;
+        }
+        $s = $this->seek();
+
+        if ($this->whitespace()) {
+            return true;
+        }
+
+        $key = null;
+        $value = null;
+        $mediaQueries = null;
+        $dirName = null;
+        $dirValue = null;
+        $importValue = null;
+        $guards = null;
+        $tag = null;
+        $args = null;
+        $isVararg = null;
+        $argv = null;
+        $suffix = null;
+        $var = null;
+        $tags = null;
+
+        // setting a property
+        if ($this->keyword($key) && $this->assign() &&
+            $this->propertyValue($value, $key) && $this->end()
+        ) {
+            $this->append(array('assign', $key, $value), $s);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+
+        // look for special css blocks
+        if ($this->literal('@', false)) {
+            $this->count--;
+
+            // media
+            if ($this->literal('@media')) {
+                if ($this->mediaQueryList($mediaQueries)
+                    && $this->literal('{')
+                ) {
+                    $media = $this->pushSpecialBlock("media");
+                    $media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+                    return true;
+                } else {
+                    $this->seek($s);
+                    return false;
+                }
+            }
+
+            if ($this->literal("@", false) && $this->keyword($dirName)) {
+                if ($this->isDirective($dirName, $this->blockDirectives)) {
+                    if ($this->openString("{", $dirValue, null, array(";")) &&
+                        $this->literal("{")
+                    ) {
+                        $dir = $this->pushSpecialBlock("directive");
+                        $dir->name = $dirName;
+                        if (isset($dirValue)) {
+                            $dir->value = $dirValue;
+                        }
+                        return true;
+                    }
+                } elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+                    if ($this->propertyValue($dirValue) && $this->end()) {
+                        $this->append(array("directive", $dirName, $dirValue));
+                        return true;
+                    }
+                }
+            }
+
+            $this->seek($s);
+        }
+
+        // setting a variable
+        if ($this->variable($var) && $this->assign() &&
+            $this->propertyValue($value) && $this->end()
+        ) {
+            $this->append(array('assign', $var, $value), $s);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        if ($this->import($importValue)) {
+            $this->append($importValue, $s);
+            return true;
+        }
+
+        // opening parametric mixin
+        if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+            $this->guards($guards) &&
+            $this->literal('{')
+        ) {
+            $block = $this->pushBlock($this->fixTags(array($tag)));
+            $block->args = $args;
+            $block->isVararg = $isVararg;
+            if (!empty($guards)) {
+                $block->guards = $guards;
+            }
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        // opening a simple block
+        if ($this->tags($tags) && $this->literal('{', false)) {
+            $tags = $this->fixTags($tags);
+            $this->pushBlock($tags);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        // closing a block
+        if ($this->literal('}', false)) {
+            try {
+                $block = $this->pop();
+            } catch (exception $e) {
+                $this->seek($s);
+                $this->throwError($e->getMessage());
+            }
+
+            $hidden = false;
+            if (is_null($block->type)) {
+                $hidden = true;
+                if (!isset($block->args)) {
+                    foreach ($block->tags as $tag) {
+                        if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
+                            $hidden = false;
+                            break;
+                        }
+                    }
+                }
+
+                foreach ($block->tags as $tag) {
+                    if (is_string($tag)) {
+                        $this->env->children[$tag][] = $block;
+                    }
+                }
+            }
+
+            if (!$hidden) {
+                $this->append(array('block', $block), $s);
+            }
+
+            // this is done here so comments aren't bundled into he block that
+            // was just closed
+            $this->whitespace();
+            return true;
+        }
+
+        // mixin
+        if ($this->mixinTags($tags) &&
+            $this->argumentDef($argv, $isVararg) &&
+            $this->keyword($suffix)  && $this->end()
+        ) {
+            $tags = $this->fixTags($tags);
+            $this->append(array('mixin', $tags, $argv, $suffix), $s);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        // spare ;
+        if ($this->literal(';')) {
+            return true;
+        }
+
+        return false; // got nothing, throw error
+    }
+
+    protected function isDirective($dirname, $directives)
+    {
+        // TODO: cache pattern in parser
+        $pattern = implode(
+            "|",
+            array_map(array("lessc", "preg_quote"), $directives)
+        );
+        $pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
+
+        return preg_match($pattern, $dirname);
+    }
+
+    protected function fixTags($tags)
+    {
+        // move @ tags out of variable namespace
+        foreach ($tags as &$tag) {
+            if ($tag[0] == $this->lessc->vPrefix) {
+                $tag[0] = $this->lessc->mPrefix;
+            }
+        }
+        return $tags;
+    }
+
+    // a list of expressions
+    protected function expressionList(&$exps)
+    {
+        $exp = null;
+
+        $values = array();
+
+        while ($this->expression($exp)) {
+            $values[] = $exp;
+        }
+
+        if (count($values) == 0) {
+            return false;
+        }
+
+        $exps = Lessc::compressList($values, ' ');
+        return true;
+    }
+
+    /**
+     * Attempt to consume an expression.
+     * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+     */
+    protected function expression(&$out)
+    {
+        $lhs = null;
+        $rhs = null;
+
+        if ($this->value($lhs)) {
+            $out = $this->expHelper($lhs, 0);
+
+            // look for / shorthand
+            if (!empty($this->env->supressedDivision)) {
+                unset($this->env->supressedDivision);
+                $s = $this->seek();
+                if ($this->literal("/") && $this->value($rhs)) {
+                    $out = array("list", "",
+                        array($out, array("keyword", "/"), $rhs));
+                } else {
+                    $this->seek($s);
+                }
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * recursively parse infix equation with $lhs at precedence $minP
+     */
+    protected function expHelper($lhs, $minP)
+    {
+        $next = null;
+        $rhs = null;
+
+        $this->inExp = true;
+        $ss = $this->seek();
+
+        while (true) {
+            $whiteBefore = isset($this->buffer[$this->count - 1]) &&
+                ctype_space($this->buffer[$this->count - 1]);
+
+            // If there is whitespace before the operator, then we require
+            // whitespace after the operator for it to be an expression
+            $needWhite = $whiteBefore && !$this->inParens;
+
+            $m = array();
+            if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+                if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+                    foreach (self::$supressDivisionProps as $pattern) {
+                        if (preg_match($pattern, $this->env->currentProperty)) {
+                            $this->env->supressedDivision = true;
+                            break 2;
+                        }
+                    }
+                }
+
+
+                $whiteAfter = isset($this->buffer[$this->count - 1]) &&
+                    ctype_space($this->buffer[$this->count - 1]);
+
+                if (!$this->value($rhs)) {
+                    break;
+                }
+
+                // peek for next operator to see what to do with rhs
+                if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+                    $rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+                }
+
+                $lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+                $ss = $this->seek();
+
+                continue;
+            }
+
+            break;
+        }
+
+        $this->seek($ss);
+
+        return $lhs;
+    }
+
+    // consume a list of values for a property
+    public function propertyValue(&$value, $keyName = null)
+    {
+        $v = null;
+        $values = array();
+
+        if ($keyName !== null) {
+            $this->env->currentProperty = $keyName;
+        }
+
+        $s = null;
+        while ($this->expressionList($v)) {
+            $values[] = $v;
+            $s = $this->seek();
+            if (!$this->literal(',')) {
+                break;
+            }
+        }
+
+        if ($s) {
+            $this->seek($s);
+        }
+
+        if ($keyName !== null) {
+            unset($this->env->currentProperty);
+        }
+
+        if (count($values) == 0) {
+            return false;
+        }
+
+        $value = Lessc::compressList($values, ', ');
+        return true;
+    }
+
+    protected function parenValue(&$out)
+    {
+        $exp = null;
+
+        $s = $this->seek();
+
+        // speed shortcut
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+            return false;
+        }
+
+        $inParens = $this->inParens;
+        if ($this->literal("(") &&
+            ($this->inParens = true) && $this->expression($exp) &&
+            $this->literal(")")
+        ) {
+            $out = $exp;
+            $this->inParens = $inParens;
+            return true;
+        } else {
+            $this->inParens = $inParens;
+            $this->seek($s);
+        }
+
+        return false;
+    }
+
+    // a single value
+    protected function value(&$value)
+    {
+        $inner = null;
+        $word = null;
+        $str = null;
+        $var = null;
+
+        $s = $this->seek();
+
+        // speed shortcut
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+            // negation
+            if ($this->literal("-", false) &&
+                (($this->variable($inner) && $inner = array("variable", $inner)) ||
+                $this->unit($inner) ||
+                $this->parenValue($inner))
+            ) {
+                $value = array("unary", "-", $inner);
+                return true;
+            } else {
+                $this->seek($s);
+            }
+        }
+
+        if ($this->parenValue($value)) {
+            return true;
+        }
+        if ($this->unit($value)) {
+            return true;
+        }
+        if ($this->color($value)) {
+            return true;
+        }
+        if ($this->func($value)) {
+            return true;
+        }
+        if ($this->string($value)) {
+            return true;
+        }
+
+        if ($this->keyword($word)) {
+            $value = array('keyword', $word);
+            return true;
+        }
+
+        // try a variable
+        if ($this->variable($var)) {
+            $value = array('variable', $var);
+            return true;
+        }
+
+        // unquote string (should this work on any type?
+        if ($this->literal("~") && $this->string($str)) {
+            $value = array("escape", $str);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        // css hack: \0
+        $m = array();
+        if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+            $value = array('keyword', '\\'.$m[1]);
+            return true;
+        } else {
+            $this->seek($s);
+        }
+
+        return false;
+    }
+
+    // an import statement
+    protected function import(&$out, $value = '')
+    {
+        if (!$this->literal('@import')) {
+            return false;
+        }
+
+        // @import "something.css" media;
+        // @import url("something.css") media;
+        // @import url(something.css) media;
+
+        if ($this->propertyValue($value)) {
+            $out = array("import", $value);
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function mediaQueryList(&$out)
+    {
+        $list = null;
+
+        if ($this->genericList($list, "mediaQuery", ",", false)) {
+            $out = $list[2];
+            return true;
+        }
+        return false;
+    }
+
+    protected function mediaQuery(&$out)
+    {
+        $mediaType = null;
+
+        $s = $this->seek();
+
+        $expressions = null;
+        $parts = array();
+
+        if ((($this->literal("only") && ($only = true)) || ($this->literal("not") && ($not = true))) && $this->keyword($mediaType)) {
+            $prop = array("mediaType");
+            if (isset($only)) {
+                $prop[] = "only";
+            }
+            if (isset($not)) {
+                $prop[] = "not";
+            }
+            $prop[] = $mediaType;
+            $parts[] = $prop;
+        } else {
+            $this->seek($s);
+        }
+
+
+        if (!empty($mediaType) && !$this->literal("and")) {
+            // ~
+        } else {
+            $this->genericList($expressions, "mediaExpression", "and", false);
+            if (is_array($expressions)) {
+                $parts = array_merge($parts, $expressions[2]);
+            }
+        }
+
+        if (count($parts) == 0) {
+            $this->seek($s);
+            return false;
+        }
+
+        $out = $parts;
+        return true;
+    }
+
+    protected function mediaExpression(&$out)
+    {
+        $feature = null;
+        $variable = null;
+
+        $s = $this->seek();
+        $value = null;
+        if ($this->literal("(") &&
+            $this->keyword($feature) &&
+            ($this->literal(":") && $this->expression($value)) &&
+            $this->literal(")")
+        ) {
+            $out = array("mediaExp", $feature);
+            if ($value) {
+                $out[] = $value;
+            }
+            return true;
+        } elseif ($this->variable($variable)) {
+            $out = array('variable', $variable);
+            return true;
+        }
+
+        $this->seek($s);
+        return false;
+    }
+
+    // an unbounded string stopped by $end
+    protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
+    {
+        $str = null;
+        $inter = null;
+
+        $oldWhite = $this->eatWhiteDefault;
+        $this->eatWhiteDefault = false;
+
+        $stop = array("'", '"', "@{", $end);
+        $stop = array_map(array("lessc", "preg_quote"), $stop);
+        // $stop[] = self::$commentMulti;
+
+        if (!is_null($rejectStrs)) {
+            $stop = array_merge($stop, $rejectStrs);
+        }
+
+        $patt = '(.*?)('.implode("|", $stop).')';
+
+        $nestingLevel = 0;
+
+        $content = array();
+        $m = array();
+        while ($this->match($patt, $m, false)) {
+            if (!empty($m[1])) {
+                $content[] = $m[1];
+                if ($nestingOpen) {
+                    $nestingLevel += substr_count($m[1], $nestingOpen);
+                }
+            }
+
+            $tok = $m[2];
+
+            $this->count -= strlen($tok);
+            if ($tok == $end) {
+                if ($nestingLevel == 0) {
+                    break;
+                } else {
+                    $nestingLevel--;
+                }
+            }
+
+            if (($tok == "'" || $tok == '"') && $this->string($str)) {
+                $content[] = $str;
+                continue;
+            }
+
+            if ($tok == "@{" && $this->interpolation($inter)) {
+                $content[] = $inter;
+                continue;
+            }
+
+            if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+                break;
+            }
+
+            $content[] = $tok;
+            $this->count += strlen($tok);
+        }
+
+        $this->eatWhiteDefault = $oldWhite;
+
+        if (count($content) == 0) {
+            return false;
+        }
+
+        // trim the end
+        if (is_string(end($content))) {
+            $content[count($content) - 1] = rtrim(end($content));
+        }
+
+        $out = array("string", "", $content);
+        return true;
+    }
+
+    protected function string(&$out)
+    {
+        $inter = null;
+
+        $s = $this->seek();
+        if ($this->literal('"', false)) {
+            $delim = '"';
+        } elseif ($this->literal("'", false)) {
+            $delim = "'";
+        } else {
+            return false;
+        }
+
+        $content = array();
+
+        // look for either ending delim , escape, or string interpolation
+        $patt = '([^\n]*?)(@\{|\\\\|'.
+            Lessc::preg_quote($delim).')';
+
+        $oldWhite = $this->eatWhiteDefault;
+        $this->eatWhiteDefault = false;
+
+        $m = array();
+        while ($this->match($patt, $m, false)) {
+            $content[] = $m[1];
+            if ($m[2] == "@{") {
+                $this->count -= strlen($m[2]);
+                if ($this->interpolation($inter)) {
+                    $content[] = $inter;
+                } else {
+                    $this->count += strlen($m[2]);
+                    $content[] = "@{"; // ignore it
+                }
+            } elseif ($m[2] == '\\') {
+                $content[] = $m[2];
+                if ($this->literal($delim, false)) {
+                    $content[] = $delim;
+                }
+            } else {
+                $this->count -= strlen($delim);
+                break; // delim
+            }
+        }
+
+        $this->eatWhiteDefault = $oldWhite;
+
+        if ($this->literal($delim)) {
+            $out = array("string", $delim, $content);
+            return true;
+        }
+
+        $this->seek($s);
+        return false;
+    }
+
+    protected function interpolation(&$out)
+    {
+        $interp = array();
+
+        $oldWhite = $this->eatWhiteDefault;
+        $this->eatWhiteDefault = true;
+
+        $s = $this->seek();
+        if ($this->literal("@{") &&
+            $this->openString("}", $interp, null, array("'", '"', ";")) &&
+            $this->literal("}", false)
+        ) {
+            $out = array("interpolate", $interp);
+            $this->eatWhiteDefault = $oldWhite;
+            if ($this->eatWhiteDefault) {
+                $this->whitespace();
+            }
+            return true;
+        }
+
+        $this->eatWhiteDefault = $oldWhite;
+        $this->seek($s);
+        return false;
+    }
+
+    protected function unit(&$unit)
+    {
+        $m = array();
+
+        // speed shortcut
+        if (isset($this->buffer[$this->count])) {
+            $char = $this->buffer[$this->count];
+            if (!ctype_digit($char) && $char != ".") {
+                return false;
+            }
+        }
+
+        if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+            $unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+            return true;
+        }
+        return false;
+    }
+
+    // a # color
+    protected function color(&$out)
+    {
+        $m = array();
+
+        if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+            if (strlen($m[1]) > 7) {
+                $out = array("string", "", array($m[1]));
+            } else {
+                $out = array("raw_color", $m[1]);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    // consume an argument definition list surrounded by ()
+    // each argument is a variable name with optional value
+    // or at the end a ... or a variable named followed by ...
+    // arguments are separated by , unless a ; is in the list, then ; is the
+    // delimiter.
+    protected function argumentDef(&$args, &$isVararg)
+    {
+        $value = array();
+        $rhs = null;
+
+        $s = $this->seek();
+        if (!$this->literal('(')) {
+            return false;
+        }
+
+        $values = array();
+        $delim = ",";
+        $method = "expressionList";
+
+        $isVararg = false;
+        while (true) {
+            if ($this->literal("...")) {
+                $isVararg = true;
+                break;
+            }
+
+            if ($this->$method($value)) {
+                if ($value[0] == "variable") {
+                    $arg = array("arg", $value[1]);
+                    $ss = $this->seek();
+
+                    if ($this->assign() && $this->$method($rhs)) {
+                        $arg[] = $rhs;
+                    } else {
+                        $this->seek($ss);
+                        if ($this->literal("...")) {
+                            $arg[0] = "rest";
+                            $isVararg = true;
+                        }
+                    }
+
+                    $values[] = $arg;
+                    if ($isVararg) {
+                        break;
+                    }
+                    continue;
+                } else {
+                    $values[] = array("lit", $value);
+                }
+            }
+
+
+            if (!$this->literal($delim)) {
+                if ($delim == "," && $this->literal(";")) {
+                    // found new delim, convert existing args
+                    $delim = ";";
+                    $method = "propertyValue";
+
+                    // transform arg list
+                    if (isset($values[1])) { // 2 items
+                        $newList = array();
+                        foreach ($values as $i => $arg) {
+                            switch ($arg[0]) {
+                                case "arg":
+                                    if ($i) {
+                                        $this->throwError("Cannot mix ; and , as delimiter types");
+                                    }
+                                    $newList[] = $arg[2];
+                                    break;
+                                case "lit":
+                                    $newList[] = $arg[1];
+                                    break;
+                                case "rest":
+                                    $this->throwError("Unexpected rest before semicolon");
+                            }
+                        }
+
+                        $newList = array("list", ", ", $newList);
+
+                        switch ($values[0][0]) {
+                            case "arg":
+                                $newArg = array("arg", $values[0][1], $newList);
+                                break;
+                            case "lit":
+                                $newArg = array("lit", $newList);
+                                break;
+                        }
+
+                    } elseif ($values) { // 1 item
+                        $newArg = $values[0];
+                    }
+
+                    if ($newArg) {
+                        $values = array($newArg);
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+
+        if (!$this->literal(')')) {
+            $this->seek($s);
+            return false;
+        }
+
+        $args = $values;
+
+        return true;
+    }
+
+    // consume a list of tags
+    // this accepts a hanging delimiter
+    protected function tags(&$tags, $simple = false, $delim = ',')
+    {
+        $tt = array();
+
+        $tags = array();
+        while ($this->tag($tt, $simple)) {
+            $tags[] = $tt;
+            if (!$this->literal($delim)) {
+                break;
+            }
+        }
+        if (count($tags) == 0) {
+            return false;
+        }
+
+        return true;
+    }
+
+    // list of tags of specifying mixin path
+    // optionally separated by > (lazy, accepts extra >)
+    protected function mixinTags(&$tags)
+    {
+        $tt = array();
+
+        $tags = array();
+        while ($this->tag($tt, true)) {
+            $tags[] = $tt;
+            $this->literal(">");
+        }
+
+        if (!$tags) {
+            return false;
+        }
+
+        return true;
+    }
+
+    // a bracketed value (contained within in a tag definition)
+    protected function tagBracket(&$parts, &$hasExpression)
+    {
+        $str = null;
+        $inter = null;
+        $word = null;
+
+        // speed shortcut
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+            return false;
+        }
+
+        $s = $this->seek();
+
+        $hasInterpolation = false;
+
+        if ($this->literal("[", false)) {
+            $attrParts = array("[");
+            // keyword, string, operator
+            while (true) {
+                if ($this->literal("]", false)) {
+                    $this->count--;
+                    break; // get out early
+                }
+
+                $m = array();
+                if ($this->match('\s+', $m)) {
+                    $attrParts[] = " ";
+                    continue;
+                }
+                if ($this->string($str)) {
+                    // escape parent selector, (yuck)
+                    foreach ($str[2] as &$chunk) {
+                        $chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+                    }
+
+                    $attrParts[] = $str;
+                    $hasInterpolation = true;
+                    continue;
+                }
+
+                if ($this->keyword($word)) {
+                    $attrParts[] = $word;
+                    continue;
+                }
+
+                if ($this->interpolation($inter)) {
+                    $attrParts[] = $inter;
+                    $hasInterpolation = true;
+                    continue;
+                }
+
+                // operator, handles attr namespace too
+                if ($this->match('[|-~\$\*\^=]+', $m)) {
+                    $attrParts[] = $m[0];
+                    continue;
+                }
+
+                break;
+            }
+
+            if ($this->literal("]", false)) {
+                $attrParts[] = "]";
+                foreach ($attrParts as $part) {
+                    $parts[] = $part;
+                }
+                $hasExpression = $hasExpression || $hasInterpolation;
+                return true;
+            }
+            $this->seek($s);
+        }
+
+        $this->seek($s);
+        return false;
+    }
+
+    // a space separated list of selectors
+    protected function tag(&$tag, $simple = false)
+    {
+        $interp = null;
+        $unit = null;
+
+        if ($simple) {
+            $chars = '^@,:;{}\][>\(\) "\'';
+        } else {
+            $chars = '^@,;{}["\'';
+        }
+        $s = $this->seek();
+
+        $hasExpression = false;
+        $parts = array();
+        while ($this->tagBracket($parts, $hasExpression));
+
+        $oldWhite = $this->eatWhiteDefault;
+        $this->eatWhiteDefault = false;
+
+        while (true) {
+            $m = array();
+            if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+                $parts[] = $m[1];
+                if ($simple) {
+                    break;
+                }
+
+                while ($this->tagBracket($parts, $hasExpression));
+                continue;
+            }
+
+            if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+                if ($this->interpolation($interp)) {
+                    $hasExpression = true;
+                    $interp[2] = true; // don't unescape
+                    $parts[] = $interp;
+                    continue;
+                }
+
+                if ($this->literal("@")) {
+                    $parts[] = "@";
+                    continue;
+                }
+            }
+
+            if ($this->unit($unit)) { // for keyframes
+                $parts[] = $unit[1];
+                $parts[] = $unit[2];
+                continue;
+            }
+
+            break;
+        }
+
+        $this->eatWhiteDefault = $oldWhite;
+        if (!$parts) {
+            $this->seek($s);
+            return false;
+        }
+
+        if ($hasExpression) {
+            $tag = array("exp", array("string", "", $parts));
+        } else {
+            $tag = trim(implode($parts));
+        }
+
+        $this->whitespace();
+        return true;
+    }
+
+    // a css function
+    protected function func(&$func)
+    {
+        $s = $this->seek();
+
+        $m = array();
+        $value = array();
+        $string = array();
+        $name = null;
+
+        if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+            $fname = $m[1];
+
+            $sPreArgs = $this->seek();
+
+            $args = array();
+            while (true) {
+                $ss = $this->seek();
+                // this ugly nonsense is for ie filter properties
+                if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+                    $args[] = array("string", "", array($name, "=", $value));
+                } else {
+                    $this->seek($ss);
+                    if ($this->expressionList($value)) {
+                        $args[] = $value;
+                    }
+                }
+
+                if (!$this->literal(',')) {
+                    break;
+                }
+            }
+            $args = array('list', ',', $args);
+
+            if ($this->literal(')')) {
+                $func = array('function', $fname, $args);
+                return true;
+            } elseif ($fname == 'url') {
+                // couldn't parse and in url? treat as string
+                $this->seek($sPreArgs);
+                if ($this->openString(")", $string) && $this->literal(")")) {
+                    $func = array('function', $fname, $string);
+                    return true;
+                }
+            }
+        }
+
+        $this->seek($s);
+        return false;
+    }
+
+    // consume a less variable
+    protected function variable(&$name)
+    {
+        $sub = null;
+        $name = null;
+
+        $s = $this->seek();
+        if ($this->literal($this->lessc->vPrefix, false) &&
+            ($this->variable($sub) || $this->keyword($name))
+        ) {
+            if (!empty($sub)) {
+                $name = array('variable', $sub);
+            } else {
+                $name = $this->lessc->vPrefix.$name;
+            }
+            return true;
+        }
+
+        $name = null;
+        $this->seek($s);
+        return false;
+    }
+
+    /**
+     * Consume an assignment operator
+     * Can optionally take a name that will be set to the current property name
+     */
+    protected function assign($name = null)
+    {
+        if ($name) {
+            $this->currentProperty = $name;
+        }
+        return $this->literal(':') || $this->literal('=');
+    }
+
+    // consume a keyword
+    protected function keyword(&$word)
+    {
+        $m = array();
+        if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+            $word = $m[1];
+            return true;
+        }
+        return false;
+    }
+
+    // consume an end of statement delimiter
+    protected function end()
+    {
+        if ($this->literal(';', false)) {
+            return true;
+        } elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+            // if there is end of file or a closing block next then we don't need a ;
+            return true;
+        }
+        return false;
+    }
+
+    protected function guards(&$guards)
+    {
+        $g = null;
+
+        $s = $this->seek();
+
+        if (!$this->literal("when")) {
+            $this->seek($s);
+            return false;
+        }
+
+        $guards = array();
+
+        while ($this->guardGroup($g)) {
+            $guards[] = $g;
+            if (!$this->literal(",")) {
+                break;
+            }
+        }
+
+        if (count($guards) == 0) {
+            $guards = null;
+            $this->seek($s);
+            return false;
+        }
+
+        return true;
+    }
+
+    // a bunch of guards that are and'd together
+    // TODO rename to guardGroup
+    protected function guardGroup(&$guardGroup)
+    {
+        $guard = null;
+
+        $s = $this->seek();
+        $guardGroup = array();
+        while ($this->guard($guard)) {
+            $guardGroup[] = $guard;
+            if (!$this->literal("and")) {
+                break;
+            }
+        }
+
+        if (count($guardGroup) == 0) {
+            $guardGroup = null;
+            $this->seek($s);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function guard(&$guard)
+    {
+        $exp = null;
+
+        $s = $this->seek();
+        $negate = $this->literal("not");
+
+        if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+            $guard = $exp;
+            if ($negate) {
+                $guard = array("negate", $guard);
+            }
+            return true;
+        }
+
+        $this->seek($s);
+        return false;
+    }
+
+    /* raw parsing functions */
+
+    protected function literal($what, $eatWhitespace = null)
+    {
+        if ($eatWhitespace === null) {
+            $eatWhitespace = $this->eatWhiteDefault;
+        }
+
+        // shortcut on single letter
+        if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+            if ($this->buffer[$this->count] == $what) {
+                if (!$eatWhitespace) {
+                    $this->count++;
+                    return true;
+                }
+            // goes below...
+            } else {
+                return false;
+            }
+        }
+
+        if (!isset(self::$literalCache[$what])) {
+            self::$literalCache[$what] = Lessc::preg_quote($what);
+        }
+
+        $m = array();
+        return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+    }
+
+    protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
+    {
+        $value = null;
+
+        $s = $this->seek();
+        $items = array();
+        while ($this->$parseItem($value)) {
+            $items[] = $value;
+            if ($delim) {
+                if (!$this->literal($delim)) {
+                    break;
+                }
+            }
+        }
+
+        if (count($items) == 0) {
+            $this->seek($s);
+            return false;
+        }
+
+        if ($flatten && count($items) == 1) {
+            $out = $items[0];
+        } else {
+            $out = array("list", $delim, $items);
+        }
+
+        return true;
+    }
+
+
+    // advance counter to next occurrence of $what
+    // $until - don't include $what in advance
+    // $allowNewline, if string, will be used as valid char set
+    protected function to($what, &$out, $until = false, $allowNewline = false)
+    {
+        if (is_string($allowNewline)) {
+            $validChars = $allowNewline;
+        } else {
+            $validChars = $allowNewline ? "." : "[^\n]";
+        }
+        $m = array();
+        if (!$this->match('('.$validChars.'*?)'.Lessc::preg_quote($what), $m, !$until)) {
+            return false;
+        }
+        if ($until) {
+            $this->count -= strlen($what); // give back $what
+        }
+        $out = $m[1];
+        return true;
+    }
+
+    // try to match something on head of buffer
+    protected function match($regex, &$out, $eatWhitespace = null)
+    {
+        if ($eatWhitespace === null) {
+            $eatWhitespace = $this->eatWhiteDefault;
+        }
+
+        $r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+        if (preg_match($r, $this->buffer, $out, 0, $this->count)) {
+            $this->count += strlen($out[0]);
+            if ($eatWhitespace && $this->writeComments) {
+                $this->whitespace();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    // match some whitespace
+    protected function whitespace()
+    {
+        if ($this->writeComments) {
+            $gotWhite = false;
+            $m = array();
+            while (preg_match(self::$whitePattern, $this->buffer, $m, 0, $this->count)) {
+                if (isset($m[1]) && empty($this->seenComments[$this->count])) {
+                    $this->append(array("comment", $m[1]));
+                    $this->seenComments[$this->count] = true;
+                }
+                $this->count += strlen($m[0]);
+                $gotWhite = true;
+            }
+            return $gotWhite;
+        } else {
+            $this->match("", $m);
+            return strlen($m[0]) > 0;
+        }
+    }
+
+    // match something without consuming it
+    protected function peek($regex, &$out = null, $from = null)
+    {
+        if (is_null($from)) {
+            $from = $this->count;
+        }
+        $r = '/'.$regex.'/Ais';
+        $result = preg_match($r, $this->buffer, $out, 0, $from);
+
+        return $result;
+    }
+
+    // seek to a spot in the buffer or return where we are on no argument
+    protected function seek($where = null)
+    {
+        if ($where === null) {
+            return $this->count;
+        } else {
+            $this->count = $where;
+        }
+        return true;
+    }
+
+    /* misc functions */
+
+    public function throwError($msg = "parse error", $count = null)
+    {
+        $count = is_null($count) ? $this->count : $count;
+
+        $line = $this->line +
+            substr_count(substr($this->buffer, 0, $count), "\n");
+
+        if (!empty($this->sourceName)) {
+            $loc = "$this->sourceName on line $line";
+        } else {
+            $loc = "line: $line";
+        }
+
+        // TODO this depends on $this->count
+        $m = array();
+        if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+            throw new exception("$msg: failed at `$m[1]` $loc");
+        } else {
+            throw new exception("$msg: $loc");
+        }
+    }
+
+    protected function pushBlock($selectors = null, $type = null)
+    {
+        $b = new stdclass();
+        $b->parent = $this->env;
+
+        $b->type = $type;
+        $b->id = self::$nextBlockId++;
+
+        $b->isVararg = false; // TODO: kill me from here
+        $b->tags = $selectors;
+
+        $b->props = array();
+        $b->children = array();
+
+        $this->env = $b;
+        return $b;
+    }
+
+    // push a block that doesn't multiply tags
+    protected function pushSpecialBlock($type)
+    {
+        return $this->pushBlock(null, $type);
+    }
+
+    // append a property to the current block
+    protected function append($prop, $pos = null)
+    {
+        if ($pos !== null) {
+            $prop[-1] = $pos;
+        }
+        $this->env->props[] = $prop;
+    }
+
+    // pop something off the stack
+    protected function pop()
+    {
+        $old = $this->env;
+        $this->env = $this->env->parent;
+        return $old;
+    }
+
+    // remove comments from $text
+    // todo: make it work for all functions, not just url
+    protected function removeComments($text)
+    {
+        $look = array(
+            'url(', '//', '/*', '"', "'"
+        );
+
+        $out = '';
+        $min = null;
+        while (true) {
+            // find the next item
+            foreach ($look as $token) {
+                $pos = strpos($text, $token);
+                if ($pos !== false) {
+                    if (!isset($min) || $pos < $min[1]) {
+                        $min = array($token, $pos);
+                    }
+                }
+            }
+
+            if (is_null($min)) {
+                break;
+            }
+
+            $count = $min[1];
+            $skip = 0;
+            $newlines = 0;
+            switch ($min[0]) {
+                case 'url(':
+                    $m = array();
+                    if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) {
+                        $count += strlen($m[0]) - strlen($min[0]);
+                    }
+                    break;
+                case '"':
+                case "'":
+                    $m = array();
+                    if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
+                        $count += strlen($m[0]) - 1;
+                    }
+                    break;
+                case '//':
+                    $skip = strpos($text, "\n", $count);
+                    if ($skip === false) {
+                        $skip = strlen($text) - $count;
+                    } else {
+                        $skip -= $count;
+                    }
+                    break;
+                case '/*':
+                    $m = array();
+                    if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
+                        $skip = strlen($m[0]);
+                        $newlines = substr_count($m[0], "\n");
+                    }
+                    break;
+            }
+
+            if ($skip == 0) {
+                $count += strlen($min[0]);
+            }
+
+            $out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+            $text = substr($text, $count + $skip);
+
+            $min = null;
+        }
+
+        return $out.$text;
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -133,17 +133,17 @@ 
 
 		if (!self::$operatorString) {
 			self::$operatorString =
-				'('.implode('|', array_map(
+				'(' . implode('|', array_map(
 					array('lessc', 'preg_quote'),
 					array_keys(self::$precedence)
-				)).')';
+				)) . ')';
 
 			$commentSingle = Lessc::preg_quote(self::$commentSingle);
 			$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
 			$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
 
-			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
-			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+			self::$commentMulti = $commentMultiLeft . '.*?' . $commentMultiRight;
+			self::$whitePattern = '/' . $commentSingle . '[^\n]*\s*|(' . self::$commentMulti . ')\s*|\s+/Ais';
 		}
 	}
 
@@ -176,7 +176,7 @@ 
 		while (false !== $this->parseChunk());
 
 		if ($this->count != strlen($this->buffer)) {
-			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+			$this->throwError('parse error count ' . $this->count . ' != len buffer ' . strlen($this->buffer));
 
 		}
 
@@ -383,7 +383,7 @@ 
 		// mixin
 		if ($this->mixinTags($tags) &&
 			$this->argumentDef($argv, $isVararg) &&
-			$this->keyword($suffix)  && $this->end()
+			$this->keyword($suffix) && $this->end()
 		) {
 			$tags = $this->fixTags($tags);
 			$this->append(array('mixin', $tags, $argv, $suffix), $s);
@@ -407,7 +407,7 @@ 
 			"|",
 			array_map(array("lessc", "preg_quote"), $directives)
 		);
-		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
+		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
 
 		return preg_match($pattern, $dirname);
 	}
@@ -491,7 +491,7 @@ 
 			$needWhite = $whiteBefore && !$this->inParens;
 
 			$m = array();
-			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+			if ($this->match(self::$operatorString . ($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
 				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
 					foreach (self::$supressDivisionProps as $pattern) {
 						if (preg_match($pattern, $this->env->currentProperty)) {
@@ -653,7 +653,7 @@ 
 		// css hack: \0
 		$m = array();
 		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
-			$value = array('keyword', '\\'.$m[1]);
+			$value = array('keyword', '\\' . $m[1]);
 			return true;
 		} else {
 			$this->seek($s);
@@ -777,7 +777,7 @@ 
 			$stop = array_merge($stop, $rejectStrs);
 		}
 
-		$patt = '(.*?)('.implode("|", $stop).')';
+		$patt = '(.*?)(' . implode("|", $stop) . ')';
 
 		$nestingLevel = 0;
 
@@ -851,8 +851,8 @@ 
 		$content = array();
 
 		// look for either ending delim , escape, or string interpolation
-		$patt = '([^\n]*?)(@\{|\\\\|'.
-			Lessc::preg_quote($delim).')';
+		$patt = '([^\n]*?)(@\{|\\\\|' .
+			Lessc::preg_quote($delim) . ')';
 
 		$oldWhite = $this->eatWhiteDefault;
 		$this->eatWhiteDefault = false;
@@ -1199,7 +1199,7 @@ 
 
 		while (true) {
 			$m = array();
-			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+			if ($this->match('([' . $chars . '0-9][' . $chars . ']*)', $m)) {
 				$parts[] = $m[1];
 				if ($simple) {
 					break;
@@ -1312,7 +1312,7 @@ 
 			if (!empty($sub)) {
 				$name = array('variable', $sub);
 			} else {
-				$name = $this->lessc->vPrefix.$name;
+				$name = $this->lessc->vPrefix . $name;
 			}
 			return true;
 		}
@@ -1499,7 +1499,7 @@ 
 			$validChars = $allowNewline ? "." : "[^\n]";
 		}
 		$m = array();
-		if (!$this->match('('.$validChars.'*?)'.Lessc::preg_quote($what), $m, !$until)) {
+		if (!$this->match('(' . $validChars . '*?)' . Lessc::preg_quote($what), $m, !$until)) {
 			return false;
 		}
 		if ($until) {
@@ -1516,7 +1516,7 @@ 
 			$eatWhitespace = $this->eatWhiteDefault;
 		}
 
-		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		$r = '/' . $regex . ($eatWhitespace && !$this->writeComments ? '\s*' : '') . '/Ais';
 		if (preg_match($r, $this->buffer, $out, 0, $this->count)) {
 			$this->count += strlen($out[0]);
 			if ($eatWhitespace && $this->writeComments) {
@@ -1554,7 +1554,7 @@ 
 		if (is_null($from)) {
 			$from = $this->count;
 		}
-		$r = '/'.$regex.'/Ais';
+		$r = '/' . $regex . '/Ais';
 		$result = preg_match($r, $this->buffer, $out, 0, $from);
 
 		return $result;
@@ -1674,7 +1674,7 @@ 
 				case '"':
 				case "'":
 					$m = array();
-					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
+					if (preg_match('/' . $min[0] . '.*?(?<!\\\\)' . $min[0] . '/', $text, $m, 0, $count)) {
 						$count += strlen($m[0]) - 1;
 					}
 					break;
@@ -1699,12 +1699,12 @@ 
 				$count += strlen($min[0]);
 			}
 
-			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+			$out .= substr($text, 0, $count) . str_repeat("\n", $newlines);
 			$text = substr($text, $count + $skip);
 
 			$min = null;
 		}
 
-		return $out.$text;
+		return $out . $text;
 	}
 }

Dolibarr/Code/Core/Classes/CommonStickerGenerator.php

Indentation +18 added lines, -18 removed lines

@@ -70,7 +70,7 @@ 
 
     public $code; // Code of format
 
-	// phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
     // protected
     // Name of stick
     protected $_Avery_Name = '';
@@ -109,7 +109,7 @@ 
      * @var array
      */
     public $_Avery_Labels;
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      *  Constructor
@@ -121,7 +121,7 @@ 
         $this->db = $db;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build PDF on disk, then output on HTTP stream.
      *
@@ -132,7 +132,7 @@ 
      *  @return int                             1=OK, 0=KO
      */
     abstract public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
@@ -144,7 +144,7 @@ 
      */
     abstract public function addSticker(&$pdf, $outputlangs, $param);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Methode qui permet de modifier la taille des caracteres
      * Cela modiera aussi l'espace entre chaque ligne
@@ -155,7 +155,7 @@ 
      */
     public function Set_Char_Size(&$pdf, $pt)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($pt > 3) {
             $this->_Char_Size = $pt;
             $this->_Line_Height = $this->_Get_Height_Chars($pt);
@@ -163,8 +163,8 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * protected Print dot line
      *
@@ -179,7 +179,7 @@ 
      */
     protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
     {
-		// phpcs:enable
+        // phpcs:enable
         $pdf->SetLineWidth($epaisseur);
         $length = abs($x1 - $x2);
         $hauteur = abs($y1 - $y2);
@@ -210,8 +210,8 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * protected Function realisant une croix aux 4 coins des cartes
      *
@@ -228,7 +228,7 @@ 
      */
     protected function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
     {
-		// phpcs:enable
+        // phpcs:enable
         $pdf->SetDrawColor(192, 192, 192);
 
         $pdf->SetLineWidth($epaisseur);
@@ -271,8 +271,8 @@ 
         return $value;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * protected Give the height for a char size given.
      *
@@ -281,7 +281,7 @@ 
      */
     protected function _Get_Height_Chars($pt)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Array for link between height of characters and space between lines
         $_Table_Hauteur_Chars = array(6 => 2, 7 => 2.5, 8 => 3, 9 => 3.5, 10 => 4, 11 => 6, 12 => 7, 13 => 8, 14 => 9, 15 => 10);
         if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
@@ -291,8 +291,8 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * protected Set format
      *
@@ -302,7 +302,7 @@ 
      */
     protected function _Set_Format(&$pdf, $format)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->_Metric = $format['metric'];
         $this->_Avery_Name = $format['name'];
         $this->_Avery_Code = empty($format['code']) ? '' : $format['code'];

Dolibarr/Code/Core/Classes/SMTPs.php

Indentation +23 added lines, -23 removed lines

@@ -141,9 +141,9 @@ 
      * Message Sensitivity
      */
     private $_arySensitivity = array(false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential');
+                                    'Personal',
+                                    'Private',
+                                    'Company Confidential');
 
     /**
      * Message Sensitivity
@@ -171,12 +171,12 @@ 
      * Content-Transfer-Encoding
      */
     private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
-                                         '8bit', // 8-bit coding with line termination characters
-                                         'base64', // 3 octets encoded into 4 sextets with offset
-                                         'binary', // Arbitrary binary stream
-                                         'mac-binhex40', // Macintosh binary to hex encoding
-                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode'); // UUENCODE encoding
+                                            '8bit', // 8-bit coding with line termination characters
+                                            'base64', // 3 octets encoded into 4 sextets with offset
+                                            'binary', // Arbitrary binary stream
+                                            'mac-binhex40', // Macintosh binary to hex encoding
+                                            'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                            'uuencode'); // UUENCODE encoding
 
     /**
      * Content-Transfer-Encoding
@@ -401,7 +401,7 @@ 
         $_aryToList = $this->getTo();
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Attempt a connection to mail server
      *
@@ -409,7 +409,7 @@ 
      */
     private function _server_connect()
     {
-		// phpcs:enable
+        // phpcs:enable
         // Default return value
         $_retVal = true;
 
@@ -479,7 +479,7 @@ 
         return $_retVal;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Attempt mail server authentication for a secure connection
      *
@@ -487,7 +487,7 @@ 
      */
     private function _server_authenticate()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php';
@@ -1264,7 +1264,7 @@ 
         $this->_msgRecipients = $aryHost;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Returns an array of the various parts of an email address
      * This assumes a well formed address:
@@ -1283,7 +1283,7 @@ 
      */
     private function _strip_email($_strAddr)
     {
-		// phpcs:enable
+        // phpcs:enable
         $_aryEmail = array();
         // Keep the original
         $_aryEmail['org'] = $_strAddr;
@@ -1320,7 +1320,7 @@ 
         return $_aryEmail;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Returns an array of bares addresses for use with 'RCPT TO:'
      * This is a "build as you go" method. Each time this method is called
@@ -1330,7 +1330,7 @@ 
      */
     public function get_RCPT_list()
     {
-		// phpcs:enable
+        // phpcs:enable
         /**
          * An array of bares addresses for use with 'RCPT TO:'
          */
@@ -1349,7 +1349,7 @@ 
         return $_RCPT_list;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Returns an array of addresses for a specific type; TO, CC or BCC
      *
@@ -1358,7 +1358,7 @@ 
      */
     public function get_email_list($_which = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // We need to know which address segment to pull
         if ($_which) {
             // Make sure we have addresses to process
@@ -1971,7 +1971,7 @@ 
         return '';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * This function has been modified as provided by SirSir to allow multiline responses when
      * using SMTP Extensions
@@ -1984,7 +1984,7 @@ 
      */
     public function server_parse($socket, $response)
     {
-		// phpcs:enable
+        // phpcs:enable
         /**
          * Returns constructed SELECT Object string or boolean upon failure
          * Default value is set at true
@@ -2016,7 +2016,7 @@ 
         return $_retVal;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Send str
      *
@@ -2027,7 +2027,7 @@ 
      */
     public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($this->_debug) {
             $this->log .= $_strSend; // @CHANGE LDR for log
         }

Spacing +2 added lines, -2 removed lines

@@ -588,7 +588,7 @@ 
                 }
                 // Most servers expect a 2nd pass of EHLO after TLS is established to get another time
                 // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-                if (! $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250')) {
+                if (!$_retVal = $this->socket_send_str('EHLO ' . $hosth, '250')) {
                     $this->_setErr(126, '"' . $hosth . '" does not support authenticated connections or temporary error. Error after 2nd sending EHLO ' . $hosth . ' : ' . $this->lastretval);
                     return $_retVal;
                 }
@@ -1709,7 +1709,7 @@ 
             $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
             $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
             $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-            $this->_msgContent['attachment'][$strFileName]['cid']      = $strCid;       // If defined, it means this attachment must be shown inline
+            $this->_msgContent['attachment'][$strFileName]['cid']      = $strCid; // If defined, it means this attachment must be shown inline
 
             if ($this->getMD5flag()) {
                 $this->_msgContent['attachment'][$strFileName]['md5'] = dol_hash($strContent, 3);

Dolibarr/Code/Core/Classes/Interfaces.php

Indentation +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         $this->db = $db;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *   Function called when a Dolibarr business event occurs
      *   This function call all qualified triggers.
@@ -73,7 +73,7 @@ 
      */
     public function run_triggers($action, $object, $user, $langs, $conf)
     {
-		// phpcs:enable
+        // phpcs:enable
 
         if (getDolGlobalInt('MAIN_TRIGGER_DEBUG')) {
             // This his too much verbose, enabled if const enabled only