Skip to content

This closes #20, fix leading plus operator parsing in formulas #21

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
xuri merged 2 commits into from
Sep 21, 2026
+6 −11
Merged

This closes #20, fix leading plus operator parsing in formulas #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86099f4
This closes #20, fix leading plus operator parsing in formulas
wangyica879112 Sep 21, 2026
b0b89d4
Upgrade GitHub Actions workflow, remove test build on RISC-V platform
wangyica879112 Sep 21, 2026
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
10 changes: 0 additions & 10 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@ jobs:
- name: Build
run: go build -v .

- name: Build on ARM and RISC-V
if: runner.os == 'Linux'
run: |
GOARCH=arm GOARM=5 go build .
GOARCH=arm GOARM=6 go build .
GOARCH=arm GOARM=7 go build .
GOARCH=arm64 go build .
GOARCH=arm64 GOOS=android go build .
GOARCH=riscv64 go build .

- name: Test
run: go test -v -race -coverprofile='coverage.txt' -covermode=atomic ./...

Expand Down
6 changes: 5 additions & 1 deletion efp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,11 @@ func (ps *Parser) getTokens() Tokens {

if (token.TType == TokenTypeOperatorInfix) && (len(token.TValue) == 1 && token.TValue[0] == '+') {
if tokens2.BOF() {
token.TType = TokenTypeNoop
if tokens2.EOF() {
token.TType = TokenTypeNoop
} else {
token.TSubType = TokenSubTypeMath
}
} else if (tokens2.previous().TType == TokenTypeFunction) && (tokens2.previous().TSubType == TokenSubTypeStop) || ((tokens2.previous().TType == TokenTypeSubexpression) && (tokens2.previous().TSubType == TokenSubTypeStop) || (tokens2.previous().TType == TokenTypeOperatorPostfix) || (tokens2.previous().TType == TokenTypeOperand)) {
token.TSubType = TokenSubTypeMath
} else {
Expand Down
1 change: 1 addition & 0 deletions efp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func TestEFP(t *testing.T) {
`=1 ''`,
`=10*2^(2*(1+1))% (=10.28114; % has greater precedence than ^)`,
`=2+(10*2^(2*(1+1)+SUM(A2)))*3 (who knows, but you'll push and pop here multiple times)`,
`'C:\Docs\Book[A-B.XLS]C-D'!$BC14`,
// E. W. Bachtal's test formulae
`=IF(P5=1.0,"NA",IF(P5=2.0,"A",IF(P5=3.0,"B",IF(P5=4.0,"C",IF(P5=5.0,"D",IF(P5=6.0,"E",IF(P5=7.0,"F",IF(P5=8.0,"G"))))))))`,
`={SUM(B2:D2*B3:D3)}`,
Expand Down