Commit graph

67 commits

Author SHA1 Message Date
Bruce Wells
e03df64281 Fixed function argument ordering and default parameter type for addFunction
Updated unit tests
Fixed docs
2019-01-10 20:32:22 -05:00
Bruce Wells
18b12aeeff
sync (#5)
* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* Fix md typo (#39)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Syncing to origin (#4)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* \\ instead of \

* Update README.md

Some small fixes

* Fix single quotes parsing (#41)

* Fix single quotes parsing
Fix e-mails
Some small fixes

* Mistake in test

* More PHP versions

* Update README.md

Deleted `dev` branch
2019-01-10 20:18:10 -05:00
Bruce Wells
ba505031a3
Syncing to origin (#4)
* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression
2019-01-10 13:47:27 -05:00
Bruce Wells
0729b6b9bc
Syncing from origin (#3)
* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)
2019-01-10 12:45:54 -05:00
Bruce Wells
8e9c8508cb
Merge branch 'master' into master 2018-12-19 15:45:37 -05:00
Bruce Wells
83b9b6a3f2 Fixing typos in and clarifying documentation. 2018-12-19 14:46:30 -05:00
Bruce Wells
d50b665927
Fixed Lexor to correctly generate reverse polish notation (#33)
* Updated from NeonXP/MathExecutor

* Fixed function in () block issue
2018-11-26 10:06:26 -05:00
Bruce Wells
5bdc27efdb Fixed function in () block issue 2018-11-26 10:01:01 -05:00
Bruce Wells
aa12a41b1b
Division By Zero Exception support
Updated the documentation.
Unit tests for strings.
Added more unit tests.
DivisionByZeroException support.
2018-10-31 10:03:55 -04:00
Bruce Wells
72aaf58e55
Updated from NeonXP/MathExecutor 2018-10-31 09:57:27 -04:00
Bruce Wells
07d02e1fb0
Merge branch 'master' into master 2018-10-31 09:51:19 -04:00
Bruce Wells
f0d4562b9e Division By Zero Exception support
Updated the documentation.
Unit tests for strings.
DivisionByZeroException support.
2018-10-31 09:35:40 -04:00
Bruce Wells
43f0ff3f28
Support for better invalid expression detection and divide by zero (#30)
* Additional validation for bad expressions (*+ for example)

* Removing DivisionByZeroException testing for now

Added more unit tests.
2018-10-25 11:54:54 -04:00
Bruce Wells
334dd26e3c Removing DivisionByZeroException testing for now
Added more unit tests.
2018-10-25 11:43:57 -04:00
Bruce Wells
b9f72a001b Additional validation for bad expressions (*+ for example) 2018-10-24 16:01:01 -04:00
Bruce Wells
12d41b160b
Merge pull request #1 from NeonXP/master
Merge from upstream master
2018-09-12 14:21:25 -04:00
Alexander Kiryukhin
4a672cfd94
Merge pull request #28 from phpfui/support_for_double_quoted_strings
Support for double quoted strings
2018-09-12 20:05:09 +03:00
Bruce Wells
2722a5201d
Fixed merge error 2018-09-12 13:02:03 -04:00
Bruce Wells
7a36e07736
Merge branch 'master' into support_for_double_quoted_strings 2018-09-12 12:36:15 -04:00
Bruce Wells
00def17f0e Support for double quoted strings
Changed array() to [] syntax.
Added variable in question to unknown variable exception.
Added getVar and getVars accessor functions.
Added getOperators and getFunctions accessor functions for completeness.
Extended all Exceptions off MathExecutorException.
2018-09-12 12:33:17 -04:00
Alexander Kiryukhin
76d1b4b8f0
Update .travis.yml 2018-09-06 21:12:54 +03:00
Alexander Kiryukhin
2a629d37dd
Merge pull request #27 from NeonXP/dev
Dev
2018-09-06 20:41:20 +03:00
Alexander Kiryukhin
7b657db13f
Merge branch 'master' into dev 2018-09-06 20:41:13 +03:00
Alexander Kiryukhin
aa1a092a9e
Merge pull request #26 from phpfui/getters_for_function_and_operators
Getters for function and operators
2018-09-06 20:39:56 +03:00
Alexander Kiryukhin
3011a1c556
Merge branch 'master' into getters_for_function_and_operators 2018-09-06 20:39:47 +03:00
Alexander Kiryukhin
a969571772
Merge pull request #25 from phpfui/Exception_messages
Exception Messages
2018-09-06 20:37:48 +03:00
Bruce Wells
7db873a636 Added variable type to diagnostic message 2018-09-05 18:17:05 -04:00
Bruce Wells
29d32a155f Add ability to get functions and operators that have been registered 2018-08-31 12:22:58 -04:00
Bruce Wells
af2436d7cc Exception Messages
Basically the token that is causing the exception for better diagnostics.
2018-08-27 17:47:28 -04:00
Alexander Kiryukhin
855ca5dfc1 Merge pull request #16 from Deisss/master
Removing the numeric test on setVar.
2017-09-12 15:33:11 +03:00
Alexander Kiryukhin
3cd949c04f Merge pull request #20 from ochi51/master
Fixes exponentiation operator
2017-09-12 15:32:08 +03:00
ochi51
8d602b30dd Fixes exponentiation operator 2017-09-12 20:54:51 +09:00
ochi51
1086fccc92 Bug fixes about "Undefined offset -1" if stack is empty array and token association is RIGHT_ASSOC 2017-09-12 20:47:22 +09:00
Alexander Kiryukhin
3436e0a51f Update composer.json 2017-03-10 15:29:42 +03:00
charles VILLETTE
9e0c01722f Removing the numeric test on setVar. 2016-07-07 14:36:01 +02:00
Alexander Kiryukhin
fa935b0af6 + Test for division by zero 2016-04-01 17:25:29 +03:00
NeonXP
fd7a113b95 Merge pull request #13 from bajb/master
Avoid division by zero
2016-04-01 18:06:45 +04:00
bajb
9acdc3bb57 Specifically check for 0 in division to allow for negative operations 2016-04-01 14:52:34 +01:00
bajb
5d19d0660c Avoid division by zero 2016-04-01 14:29:41 +01:00
Alexander Kiryukhin
e28fb4d7aa Merge pull request #12 from waffle-iron/master
waffle.io Badge
2015-09-29 15:52:35 +03:00
Making GitHub Delicious.
e0eb2d9586 add waffle.io badge 2015-09-29 06:42:26 -06:00
NeonXP
b04cf54aa3 Merge branch 'dev' of github.com:NeonXP/MathExecutor into dev 2013-09-18 20:35:19 +04:00
NeonXP
0b7e6b1b86 + added test for custom user functions 2013-09-18 20:34:51 +04:00
NeonXP
4b092895bc ~ remove callable for PHP 5.3 2013-09-18 20:27:46 +04:00
Alexander Kiryukhin
ec9e067421 Update README.md 2013-09-06 17:33:47 +04:00
NeonXP
e3bac0c101 ~Change readme 2013-09-06 17:30:48 +04:00
NeonXP
abc629a10b + Tests for scientific notation by AntonStoeckl 2013-09-06 16:43:45 +04:00
Alexander Kiryukhin
a0f031dc23 Merge pull request #6 from AntonStoeckl/master
Make TokenNumber aware of scientific notation
2013-09-06 05:39:10 -07:00
Anton Stöckl
31f4bc044d Make TokenNumber aware of scientific notation
Update the regex so scientific notation numbers work, e.g.:
'1 + 3.5E-8'
'1 + 3.5E8'
2013-09-06 10:05:10 +02:00
Alexander Kiryukhin
10c04a966f Update README.md 2013-09-06 08:35:55 +04:00