Commit graph

82 commits

Author SHA1 Message Date
Bruce Wells
265cff175e Fixed function parameter order
Corrected $places default value for addFunction to match TokenFactory
Added function order test and put expected order first in assertEquals
If else blocks in calculator
Updated docs
2019-01-15 18:36:10 -05:00
Bruce Wells
0437f808f2
sync (#6)
* Fixed function parameter order (#42)

* Fixed parsing for ()

* 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

* Fixed function parameter order

Corrected $places default value for addFunction to match TokenFactory
Added function order test and put expected order first in assertEquals
If else blocks in calculator
Updated docs

* Create code-of-conduct.ru.md

* Update code-of-conduct.ru.md
2019-01-15 18:33:27 -05:00
Bruce Wells
c7f937c002
Merge branch 'master' into master 2019-01-12 00:05:03 -05:00
Bruce Wells
44e2bb192e Fixed function parameter order
Corrected $places default value for addFunction to match TokenFactory
Added function order test and put expected order first in assertEquals
If else blocks in calculator
Updated docs
2019-01-11 23:56:39 -05:00
Bruce Wells
145a0a136f Merge branch 'master' of https://github.com/phpfui/MathExecutor
# Conflicts:
#	src/NXP/Classes/Lexer.php
2019-01-11 21:45:29 -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
92445b5083
Merge branch 'master' into master 2019-01-10 20:15:53 -05:00
Alexander Kiryukhin
0adcdeeb1b
Update README.md
Deleted `dev` branch
2019-01-11 03:44:46 +03:00
Alexander Kiryukhin
76517641f7 Fix single quotes parsing (#41)
* Fix single quotes parsing
Fix e-mails
Some small fixes

* Mistake in test

* More PHP versions
2019-01-10 19:27:45 -05:00
Alexander Kiryukhin
bf6204aea7
Update README.md
Some small fixes
2019-01-11 02:15:26 +03:00
Bruce Wells
790827ff45
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 \
2019-01-10 13:53:34 -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
1323063132 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 21:35:39 +03:00
Alexander Kiryukhin
4c86b6fab8 Added simple coc (#37)
* Added simple coc

* Fix
2019-01-10 13:23:20 -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
Timur
808593bacf MathExecutor allow override default operators, functions and vars (#36) 2019-01-09 17:51:21 -05:00
Bruce Wells
9684cfd1d0 Merge branch 'master' of https://github.com/phpfui/MathExecutor
# Conflicts:
#	src/NXP/Classes/Lexer.php
2019-01-08 19:39:48 -05:00
Bruce Wells
e8ede3d6a5
Documentation fixes (#34)
Fixing typos in and clarifying documentation.
2018-12-19 16:07:24 -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
76307e3f41 Fixed parsing for () 2018-11-23 15:38:51 -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