Skip to content

Updates for php5 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates for php5 #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3450676
Declare method/var visibility
colemanw Jan 16, 2017
37f74c0
Update __construct for php5 compat
colemanw Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions matheval.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,29 @@

class EvalMath {

var $suppress_errors = false;
var $last_error = null;
public $suppress_errors = false;
public $last_error = null;

var $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants)
var $f = array(); // user-defined functions
var $vb = array('e', 'pi'); // constants
var $fb = array( // built-in functions
public $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants)
public $f = array(); // user-defined functions
public $vb = array('e', 'pi'); // constants
public $fb = array( // built-in functions
'sin','sinh','arcsin','asin','arcsinh','asinh',
'cos','cosh','arccos','acos','arccosh','acosh',
'tan','tanh','arctan','atan','arctanh','atanh',
'sqrt','abs','ln','log');

function EvalMath() {
public function __construct() {
// make the variables a little more accurate
$this->v['pi'] = pi();
$this->v['e'] = exp(1);
}

function e($expr) {
public function e($expr) {
return $this->evaluate($expr);
}

function evaluate($expr) {
public function evaluate($expr) {
$this->last_error = null;
$expr = trim($expr);
if (substr($expr, -1, 1) == ';') $expr = substr($expr, 0, strlen($expr)-1); // strip semicolons at the end
Expand Down Expand Up @@ -150,14 +150,14 @@ function evaluate($expr) {
}
}

function vars() {
public function vars() {
$output = $this->v;
unset($output['pi']);
unset($output['e']);
return $output;
}

function funcs() {
public function funcs() {
$output = array();
foreach ($this->f as $fnn=>$dat)
$output[] = $fnn . '(' . implode(',', $dat['args']) . ')';
Expand All @@ -167,7 +167,7 @@ function funcs() {
//===================== HERE BE INTERNAL METHODS ====================\\

// Convert infix to postfix notation
function nfx($expr) {
protected function nfx($expr) {

$index = 0;
$stack = new EvalMathStack;
Expand Down Expand Up @@ -293,7 +293,7 @@ function nfx($expr) {
}

// evaluate postfix notation
function pfx($tokens, $vars = array()) {
protected function pfx($tokens, $vars = array()) {

if ($tokens == false) return false;

Expand Down Expand Up @@ -355,7 +355,7 @@ function pfx($tokens, $vars = array()) {
}

// trigger an error, but nicely, if need be
function trigger($msg) {
protected function trigger($msg) {
$this->last_error = $msg;
if (!$this->suppress_errors) trigger_error($msg, E_USER_WARNING);
return false;
Expand All @@ -365,26 +365,25 @@ function trigger($msg) {
// for internal use
class EvalMathStack {

var $stack = array();
var $count = 0;
public $stack = array();
public $count = 0;

function push($val) {
public function push($val) {
$this->stack[$this->count] = $val;
$this->count++;
}

function pop() {
public function pop() {
if ($this->count > 0) {
$this->count--;
return $this->stack[$this->count];
}
return null;
}

function last($n=1) {
public function last($n=1) {
if (isset($this->stack[$this->count-$n])) {
return $this->stack[$this->count-$n];
}
return;
}
}