Skip to content

Read log10 and log2 as logarithms rather than as powers (#733) #734

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

Merged
Rafael-SOWNet merged 1 commit into from
Aug 5, 2026
Merged

Read log10 and log2 as logarithms rather than as powers (#733) #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Sources/AngouriMath/Core/Antlr/AngouriMath.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ atom returns[Entity value]
| '{' cset_args = cset_arguments '}' { $value = new ConditionalSet($cset_args.couple.variable, $cset_args.couple.predicate); }
| '{' args = function_arguments '}' { $value = new FiniteSet((IEnumerable<Entity>)$args.list); }
| 'log(' args = function_arguments ')' { $value = Assert("log", (1, 2), $args.list.Count) ? MathS.Log(10, $args.list[0]) : MathS.Log($args.list[0], $args.list[1]); }
| 'log10(' args = function_arguments ')' { Assert("log10", 1, $args.list.Count); $value = MathS.Log(10, $args.list[0]); }
| 'log2(' args = function_arguments ')' { Assert("log2", 1, $args.list.Count); $value = MathS.Log(2, $args.list[0]); }
| 'pow(' args = function_arguments ')' { Assert("pow", 2, $args.list.Count); $value = MathS.Pow($args.list[0], $args.list[1]); }
| 'sqrt(' args = function_arguments ')' { Assert("sqrt", 1, $args.list.Count); $value = MathS.Sqrt($args.list[0]); }
| 'cbrt(' args = function_arguments ')' { Assert("cbrt", 1, $args.list.Count); $value = MathS.Cbrt($args.list[0]); }
Expand Down
6 changes: 5 additions & 1 deletion Sources/AngouriMath/Core/Antlr/AngouriMath.interp
View file
Open in desktop

Large diffs are not rendered by default.

188 changes: 96 additions & 92 deletions Sources/AngouriMath/Core/Antlr/AngouriMath.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,15 @@ T__125=126
T__126=127
T__127=128
T__128=129
NEWLINE=130
NUMBER=131
SPECIALSET=132
BOOLEAN=133
VARIABLE=134
COMMENT=135
WS=136
T__129=130
T__130=131
NEWLINE=132
NUMBER=133
SPECIALSET=134
BOOLEAN=135
VARIABLE=136
COMMENT=137
WS=138
'!'=1
'^'=2
'-'=3
Expand Down Expand Up @@ -178,88 +180,90 @@ WS=136
'{'=42
'}'=43
'log('=44
'pow('=45
'sqrt('=46
'cbrt('=47
'sqr('=48
'ln('=49
'exp('=50
'sin('=51
'cos('=52
'tan('=53
'cotan('=54
'cot('=55
'sec('=56
'cosec('=57
'csc('=58
'arcsin('=59
'arccos('=60
'arctan('=61
'arccotan('=62
'arcsec('=63
'arccosec('=64
'arccsc('=65
'acsc('=66
'asin('=67
'acos('=68
'atan('=69
'acotan('=70
'asec('=71
'acosec('=72
'acot('=73
'arccot('=74
'sinh('=75
'sh('=76
'cosh('=77
'ch('=78
'tanh('=79
'th('=80
'cotanh('=81
'coth('=82
'cth('=83
'sech('=84
'sch('=85
'cosech('=86
'csch('=87
'asinh('=88
'arsinh('=89
'arsh('=90
'arcsinh('=91
'acosh('=92
'arcosh('=93
'arch('=94
'arccosh('=95
'atanh('=96
'artanh('=97
'arth('=98
'arctanh('=99
'acoth('=100
'arcoth('=101
'acotanh('=102
'arcotanh('=103
'arcth('=104
'arccotanh('=105
'asech('=106
'arsech('=107
'arsch('=108
'arcsech('=109
'acosech('=110
'arcosech('=111
'arcsch('=112
'arccosech('=113
'acsch('=114
'gamma('=115
'derivative('=116
'integral('=117
'limit('=118
'limitleft('=119
'limitright('=120
'signum('=121
'sgn('=122
'sign('=123
'abs('=124
'phi('=125
'domain('=126
'piecewise('=127
'apply('=128
'lambda('=129
'log10('=45
'log2('=46
'pow('=47
'sqrt('=48
'cbrt('=49
'sqr('=50
'ln('=51
'exp('=52
'sin('=53
'cos('=54
'tan('=55
'cotan('=56
'cot('=57
'sec('=58
'cosec('=59
'csc('=60
'arcsin('=61
'arccos('=62
'arctan('=63
'arccotan('=64
'arcsec('=65
'arccosec('=66
'arccsc('=67
'acsc('=68
'asin('=69
'acos('=70
'atan('=71
'acotan('=72
'asec('=73
'acosec('=74
'acot('=75
'arccot('=76
'sinh('=77
'sh('=78
'cosh('=79
'ch('=80
'tanh('=81
'th('=82
'cotanh('=83
'coth('=84
'cth('=85
'sech('=86
'sch('=87
'cosech('=88
'csch('=89
'asinh('=90
'arsinh('=91
'arsh('=92
'arcsinh('=93
'acosh('=94
'arcosh('=95
'arch('=96
'arccosh('=97
'atanh('=98
'artanh('=99
'arth('=100
'arctanh('=101
'acoth('=102
'arcoth('=103
'acotanh('=104
'arcotanh('=105
'arcth('=106
'arccotanh('=107
'asech('=108
'arsech('=109
'arsch('=110
'arcsech('=111
'acosech('=112
'arcosech('=113
'arcsch('=114
'arccosech('=115
'acsch('=116
'gamma('=117
'derivative('=118
'integral('=119
'limit('=120
'limitleft('=121
'limitright('=122
'signum('=123
'sgn('=124
'sign('=125
'abs('=126
'phi('=127
'domain('=128
'piecewise('=129
'apply('=130
'lambda('=131
Loading
Loading