dwoo-project / dwoo

lib/Dwoo/Plugins/Functions/PluginDump.php

Indentation +169 added lines, -169 removed lines

@@ -31,180 +31,180 @@
  */
 class PluginDump extends Plugin
 {
-    protected $outputObjects;
-    protected $outputMethods;
-
-    /**
-     * @param string $var
-     * @param bool   $show_methods
-     *
-     * @return string
-     */
-    public function process($var = '$', $show_methods = false)
-    {
-        $this->outputMethods = $show_methods;
-        if ($var === '$') {
-            $var = $this->core->getData();
-            $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data';
-        } else {
-            $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump';
-        }
-
-        $this->outputObjects = array();
-
-        if (!is_array($var)) {
-            if (is_object($var)) {
-                return $this->exportObj('', $var);
-            } else {
-                return $this->exportVar('', $var);
-            }
-        }
-
-        $scope = $this->core->getScope();
-
-        if ($var === $scope) {
-            $out .= ' (current scope): <div style="background:#ccc;">';
-        } else {
-            $out .= ':<div style="padding-left:20px;">';
-        }
-
-        $out .= $this->export($var, $scope);
-
-        return $out . '</div></div>';
-    }
-
-    /**
-     * @param $var
-     * @param $scope
-     *
-     * @return string
-     */
-    protected function export($var, $scope)
-    {
-        $out = '';
-        foreach ($var as $i => $v) {
-            if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
-                $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
-                if ($v === $scope) {
-                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
-                } else {
-                    $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
-                }
-            } elseif (is_object($v)) {
-                $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
-            } else {
-                $out .= $this->exportVar($i . ' = ', $v);
-            }
-        }
-
-        return $out;
-    }
-
-    /**
-     * @param $i
-     * @param $v
-     *
-     * @return string
-     */
-    protected function exportVar($i, $v)
-    {
-        if (is_string($v) || is_bool($v) || is_numeric($v)) {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
-        } elseif (is_null($v)) {
-            return $i . 'null<br />';
-        } elseif (is_resource($v)) {
-            return $i . 'resource(' . get_resource_type($v) . ')<br />';
-        } else {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
-        }
-    }
-
-    /**
-     * @param $i
-     * @param $obj
-     *
-     * @return string
-     */
-    protected function exportObj($i, $obj)
-    {
-        if (array_search($obj, $this->outputObjects, true) !== false) {
-            return $i . ' [recursion, skipped]<br />';
-        }
-
-        $this->outputObjects[] = $obj;
-
-        $list = (array)$obj;
-
-        $protectedLength = strlen(get_class($obj)) + 2;
-
-        $out = array();
-
-        if ($this->outputMethods) {
-            $ref = new ReflectionObject($obj);
-
-            foreach ($ref->getMethods() as $method) {
-                if (!$method->isPublic()) {
-                    continue;
-                }
-
-                if (empty($out['method'])) {
-                    $out['method'] = '';
-                }
-
-                $params = array();
-                foreach ($method->getParameters() as $param) {
-                    $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
-                }
-
-                $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
-            }
-        }
-
-        foreach ($list as $attributeName => $attributeValue) {
-            if (property_exists($obj, $attributeName)) {
-                $key = 'public';
-            } elseif (substr($attributeName, 0, 3) === "\0*\0") {
-                $key           = 'protected';
-                $attributeName = substr($attributeName, 3);
-            } else {
-                $key           = 'private';
-                $attributeName = substr($attributeName, $protectedLength);
-            }
-
-            if (empty($out[$key])) {
-                $out[$key] = '';
-            }
-
-            $out[$key] .= '(' . $key . ') ';
-
-            if (is_array($attributeValue)) {
-                $out[$key] .= $attributeName . ' (array):<br />
+	protected $outputObjects;
+	protected $outputMethods;
+
+	/**
+	 * @param string $var
+	 * @param bool   $show_methods
+	 *
+	 * @return string
+	 */
+	public function process($var = '$', $show_methods = false)
+	{
+		$this->outputMethods = $show_methods;
+		if ($var === '$') {
+			$var = $this->core->getData();
+			$out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data';
+		} else {
+			$out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump';
+		}
+
+		$this->outputObjects = array();
+
+		if (!is_array($var)) {
+			if (is_object($var)) {
+				return $this->exportObj('', $var);
+			} else {
+				return $this->exportVar('', $var);
+			}
+		}
+
+		$scope = $this->core->getScope();
+
+		if ($var === $scope) {
+			$out .= ' (current scope): <div style="background:#ccc;">';
+		} else {
+			$out .= ':<div style="padding-left:20px;">';
+		}
+
+		$out .= $this->export($var, $scope);
+
+		return $out . '</div></div>';
+	}
+
+	/**
+	 * @param $var
+	 * @param $scope
+	 *
+	 * @return string
+	 */
+	protected function export($var, $scope)
+	{
+		$out = '';
+		foreach ($var as $i => $v) {
+			if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
+				$out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
+				if ($v === $scope) {
+					$out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+				} else {
+					$out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+				}
+			} elseif (is_object($v)) {
+				$out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
+			} else {
+				$out .= $this->exportVar($i . ' = ', $v);
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * @param $i
+	 * @param $v
+	 *
+	 * @return string
+	 */
+	protected function exportVar($i, $v)
+	{
+		if (is_string($v) || is_bool($v) || is_numeric($v)) {
+			return $i . htmlentities(var_export($v, true)) . '<br />';
+		} elseif (is_null($v)) {
+			return $i . 'null<br />';
+		} elseif (is_resource($v)) {
+			return $i . 'resource(' . get_resource_type($v) . ')<br />';
+		} else {
+			return $i . htmlentities(var_export($v, true)) . '<br />';
+		}
+	}
+
+	/**
+	 * @param $i
+	 * @param $obj
+	 *
+	 * @return string
+	 */
+	protected function exportObj($i, $obj)
+	{
+		if (array_search($obj, $this->outputObjects, true) !== false) {
+			return $i . ' [recursion, skipped]<br />';
+		}
+
+		$this->outputObjects[] = $obj;
+
+		$list = (array)$obj;
+
+		$protectedLength = strlen(get_class($obj)) + 2;
+
+		$out = array();
+
+		if ($this->outputMethods) {
+			$ref = new ReflectionObject($obj);
+
+			foreach ($ref->getMethods() as $method) {
+				if (!$method->isPublic()) {
+					continue;
+				}
+
+				if (empty($out['method'])) {
+					$out['method'] = '';
+				}
+
+				$params = array();
+				foreach ($method->getParameters() as $param) {
+					$params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
+				}
+
+				$out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
+			}
+		}
+
+		foreach ($list as $attributeName => $attributeValue) {
+			if (property_exists($obj, $attributeName)) {
+				$key = 'public';
+			} elseif (substr($attributeName, 0, 3) === "\0*\0") {
+				$key           = 'protected';
+				$attributeName = substr($attributeName, 3);
+			} else {
+				$key           = 'private';
+				$attributeName = substr($attributeName, $protectedLength);
+			}
+
+			if (empty($out[$key])) {
+				$out[$key] = '';
+			}
+
+			$out[$key] .= '(' . $key . ') ';
+
+			if (is_array($attributeValue)) {
+				$out[$key] .= $attributeName . ' (array):<br />
 							<div style="padding-left:20px;">' . $this->export($attributeValue, false) . '</div>';
-            } elseif (is_object($attributeValue)) {
-                $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
-            } else {
-                $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
-            }
-        }
+			} elseif (is_object($attributeValue)) {
+				$out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
+			} else {
+				$out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
+			}
+		}
 
-        $return = $i . '<br /><div style="padding-left:20px;">';
+		$return = $i . '<br /><div style="padding-left:20px;">';
 
-        if (!empty($out['method'])) {
-            $return .= $out['method'];
-        }
+		if (!empty($out['method'])) {
+			$return .= $out['method'];
+		}
 
-        if (!empty($out['public'])) {
-            $return .= $out['public'];
-        }
+		if (!empty($out['public'])) {
+			$return .= $out['public'];
+		}
 
-        if (!empty($out['protected'])) {
-            $return .= $out['protected'];
-        }
+		if (!empty($out['protected'])) {
+			$return .= $out['protected'];
+		}
 
-        if (!empty($out['private'])) {
-            $return .= $out['private'];
-        }
+		if (!empty($out['private'])) {
+			$return .= $out['private'];
+		}
 
-        return $return . '</div>';
-    }
+		return $return . '</div>';
+	}
 }

lib/Dwoo/Plugins/Functions/PluginCountSentences.php

Indentation +10 added lines, -10 removed lines

@@ -30,14 +30,14 @@
  */
 class PluginCountSentences extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value)
-    {
-        return "preg_match_all('#[\\w\\pL]\\.(?![\\w\\pL])#u', $value, \$tmp)";
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value)
+	{
+		return "preg_match_all('#[\\w\\pL]\\.(?![\\w\\pL])#u', $value, \$tmp)";
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginIndent.php

Indentation +12 added lines, -12 removed lines

@@ -32,16 +32,16 @@
  */
 class PluginIndent extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     * @param int      $by
-     * @param string   $char
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, $by = 4, $char = ' ')
-    {
-        return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)";
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 * @param int      $by
+	 * @param string   $char
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, $by = 4, $char = ' ')
+	{
+		return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)";
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginTruncate.php

Indentation +29 added lines, -29 removed lines

@@ -33,37 +33,37 @@
  */
 class PluginTruncate extends Plugin
 {
-    /**
-     * @param string $value
-     * @param int    $length
-     * @param string $etc
-     * @param bool   $break
-     * @param bool   $middle
-     *
-     * @return mixed|string
-     */
-    public function process($value, $length = 80, $etc = '...', $break = false, $middle = false)
-    {
-        if ($length == 0) {
-            return '';
-        }
+	/**
+	 * @param string $value
+	 * @param int    $length
+	 * @param string $etc
+	 * @param bool   $break
+	 * @param bool   $middle
+	 *
+	 * @return mixed|string
+	 */
+	public function process($value, $length = 80, $etc = '...', $break = false, $middle = false)
+	{
+		if ($length == 0) {
+			return '';
+		}
 
-        $value  = (string)$value;
-        $etc    = (string)$etc;
-        $length = (int)$length;
+		$value  = (string)$value;
+		$etc    = (string)$etc;
+		$length = (int)$length;
 
-        if (strlen($value) < $length) {
-            return $value;
-        }
+		if (strlen($value) < $length) {
+			return $value;
+		}
 
-        $length = max($length - strlen($etc), 0);
-        if ($break === false && $middle === false) {
-            $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1));
-        }
-        if ($middle === false) {
-            return substr($value, 0, $length) . $etc;
-        }
+		$length = max($length - strlen($etc), 0);
+		if ($break === false && $middle === false) {
+			$value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1));
+		}
+		if ($middle === false) {
+			return substr($value, 0, $length) . $etc;
+		}
 
-        return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2));
-    }
+		return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2));
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginDefault.php

Indentation +11 added lines, -11 removed lines

@@ -31,15 +31,15 @@
  */
 class PluginDefault extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param mixed    $value
-     * @param string   $default
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, $default = '')
-    {
-        return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param mixed    $value
+	 * @param string   $default
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, $default = '')
+	{
+		return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)';
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginCat.php

Indentation +11 added lines, -11 removed lines

@@ -30,15 +30,15 @@
  */
 class PluginCat extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     * @param array    $rest
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, array $rest)
-    {
-        return '(' . $value . ').(' . implode(').(', $rest) . ')';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 * @param array    $rest
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, array $rest)
+	{
+		return '(' . $value . ').(' . implode(').(', $rest) . ')';
+	}
 }

lib/Dwoo/Plugins/Functions/PluginCountCharacters.php

Indentation +14 added lines, -14 removed lines

@@ -31,19 +31,19 @@
  */
 class PluginCountCharacters extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     * @param bool     $count_spaces
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, $count_spaces = false)
-    {
-        if ($count_spaces === 'false') {
-            return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 * @param bool     $count_spaces
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, $count_spaces = false)
+	{
+		if ($count_spaces === 'false') {
+			return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+		}
 
-        return 'mb_strlen(' . $value . ', $this->charset)';
-    }
+		return 'mb_strlen(' . $value . ', $this->charset)';
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginNl2br.php

Indentation +10 added lines, -10 removed lines

@@ -30,14 +30,14 @@
  */
 class PluginNl2br extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value)
-    {
-        return 'nl2br((string) ' . $value . ')';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value)
+	{
+		return 'nl2br((string) ' . $value . ')';
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginMath.php

Indentation +145 added lines, -145 removed lines

@@ -41,159 +41,159 @@
  */
 class PluginMath extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $equation
-     * @param string   $format
-     * @param string   $assign
-     * @param array    $rest
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
-    {
-        /*
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $equation
+	 * @param string   $format
+	 * @param string   $assign
+	 * @param array    $rest
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
+	{
+		/*
          * Holds the allowed function, characters, operators and constants
          */
-        $allowed = array(
-            '0',
-            '1',
-            '2',
-            '3',
-            '4',
-            '5',
-            '6',
-            '7',
-            '8',
-            '9',
-            '+',
-            '-',
-            '/',
-            '*',
-            '.',
-            ' ',
-            '<<',
-            '>>',
-            '%',
-            '&',
-            '^',
-            '|',
-            '~',
-            'abs(',
-            'ceil(',
-            'floor(',
-            'exp(',
-            'log10(',
-            'cos(',
-            'sin(',
-            'sqrt(',
-            'tan(',
-            'M_PI',
-            'INF',
-            'M_E',
-        );
+		$allowed = array(
+			'0',
+			'1',
+			'2',
+			'3',
+			'4',
+			'5',
+			'6',
+			'7',
+			'8',
+			'9',
+			'+',
+			'-',
+			'/',
+			'*',
+			'.',
+			' ',
+			'<<',
+			'>>',
+			'%',
+			'&',
+			'^',
+			'|',
+			'~',
+			'abs(',
+			'ceil(',
+			'floor(',
+			'exp(',
+			'log10(',
+			'cos(',
+			'sin(',
+			'sqrt(',
+			'tan(',
+			'M_PI',
+			'INF',
+			'M_E',
+		);
 
-        /*
+		/*
          * Holds the functions that can accept multiple arguments
          */
-        $funcs = array(
-            'round(',
-            'log(',
-            'pow(',
-            'max(',
-            'min(',
-            'rand(',
-        );
+		$funcs = array(
+			'round(',
+			'log(',
+			'pow(',
+			'max(',
+			'min(',
+			'rand(',
+		);
 
-        $equation = $equationSrc = str_ireplace(array(
-            'pi',
-            'M_PI()',
-            'inf',
-            ' e '
-        ),
-            array(
-                'M_PI',
-                'M_PI',
-                'INF',
-                ' M_E '
-            ),
-            $equation);
+		$equation = $equationSrc = str_ireplace(array(
+			'pi',
+			'M_PI()',
+			'inf',
+			' e '
+		),
+			array(
+				'M_PI',
+				'M_PI',
+				'INF',
+				' M_E '
+			),
+			$equation);
 
-        $delim      = $equation[0];
-        $open       = $delim . '.';
-        $close      = '.' . $delim;
-        $equation   = substr($equation, 1, - 1);
-        $out        = '';
-        $ptr        = 1;
-        $allowcomma = 0;
-        while (strlen($equation) > 0) {
-            $substr = substr($equation, 0, $ptr);
-            if (array_search($substr, $allowed) !== false) {
-                // allowed string
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif (array_search($substr, $funcs) !== false) {
-                // allowed func
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-                ++ $allowcomma;
-                if ($allowcomma === 1) {
-                    $allowed[] = ',';
-                }
-            } elseif (isset($rest[$substr])) {
-                // variable
-                $out .= $rest[$substr];
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($substr === $open) {
-                // pre-replaced variable
-                preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-                if (empty($m)) {
-                    preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-                }
-                $out .= substr($m[0], 0, - 2);
-                $equation = substr($equation, strlen($m[0]) + 2);
-                $ptr      = 0;
-            } elseif ($substr === '(') {
-                // opening parenthesis
-                if ($allowcomma > 0) {
-                    ++ $allowcomma;
-                }
+		$delim      = $equation[0];
+		$open       = $delim . '.';
+		$close      = '.' . $delim;
+		$equation   = substr($equation, 1, - 1);
+		$out        = '';
+		$ptr        = 1;
+		$allowcomma = 0;
+		while (strlen($equation) > 0) {
+			$substr = substr($equation, 0, $ptr);
+			if (array_search($substr, $allowed) !== false) {
+				// allowed string
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif (array_search($substr, $funcs) !== false) {
+				// allowed func
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+				++ $allowcomma;
+				if ($allowcomma === 1) {
+					$allowed[] = ',';
+				}
+			} elseif (isset($rest[$substr])) {
+				// variable
+				$out .= $rest[$substr];
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($substr === $open) {
+				// pre-replaced variable
+				preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+				if (empty($m)) {
+					preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+				}
+				$out .= substr($m[0], 0, - 2);
+				$equation = substr($equation, strlen($m[0]) + 2);
+				$ptr      = 0;
+			} elseif ($substr === '(') {
+				// opening parenthesis
+				if ($allowcomma > 0) {
+					++ $allowcomma;
+				}
 
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($substr === ')') {
-                // closing parenthesis
-                if ($allowcomma > 0) {
-                    -- $allowcomma;
-                    if ($allowcomma === 0) {
-                        array_pop($allowed);
-                    }
-                }
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($substr === ')') {
+				// closing parenthesis
+				if ($allowcomma > 0) {
+					-- $allowcomma;
+					if ($allowcomma === 0) {
+						array_pop($allowed);
+					}
+				}
 
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($ptr >= strlen($equation)) {
-                // parse error if we've consumed the entire equation without finding anything valid
-                throw new CompilationException($compiler,
-                    'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
-            } else {
-                // nothing special, advance
-                ++ $ptr;
-            }
-        }
-        if ($format !== '\'\'') {
-            $out = 'sprintf(' . $format . ', ' . $out . ')';
-        }
-        if ($assign !== '\'\'') {
-            return '($this->assignInScope(' . $out . ', ' . $assign . '))';
-        }
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($ptr >= strlen($equation)) {
+				// parse error if we've consumed the entire equation without finding anything valid
+				throw new CompilationException($compiler,
+					'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+			} else {
+				// nothing special, advance
+				++ $ptr;
+			}
+		}
+		if ($format !== '\'\'') {
+			$out = 'sprintf(' . $format . ', ' . $out . ')';
+		}
+		if ($assign !== '\'\'') {
+			return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+		}
 
-        return '(' . $out . ')';
-    }
+		return '(' . $out . ')';
+	}
 }
\ No newline at end of file