Compare commits

..

210 Commits

Author SHA1 Message Date
Nicolás Hatcher
6db8c6228e BOB 2024-12-16 18:05:51 +01:00
Daniel
ab3f9c276d FIX: Border picker cosmetics 2024-12-16 17:33:34 +01:00
Nicolás Hatcher
e098105531 FIX: When cut and paste to a different sheet origin is removed
Fixes #193
2024-12-16 08:01:51 +01:00
Daniel
a5919d837f UPDATE: Better active states on Sheet Nav + Double click to rename sheets 2024-12-15 21:29:10 +01:00
Daniel
f214070299 FIX: Several cosmetic changes to make the toolbar look like the figmas 2024-12-15 19:18:51 +01:00
Daniel
0b2de92053 FIX: Made menu on SheetTab consistent with Figmas 2024-12-15 19:15:34 +01:00
Nicolás Hatcher
98dc1f3b06 FIX[WebApp]: Rename navigation => SheetTabBar
Also rename all widgets in that folder to more standard names
2024-12-15 12:12:14 +01:00
Nicolás Hatcher
fb764fed1c FIX[WebApp]: Splits the menu.tsx in two files
This is so that SheetListMenu and SheetRenameDialog are on its own files.

Also renamed isOpen => open and close => onClose
2024-12-15 12:12:14 +01:00
Nicolás Hatcher
23814ec18c FIX: Several fixes on the FV function
(1+x)^(1+y) was stringifyfied incorrectly
We still need work on this

FV now returns currency

FV(-1,-2,1) should return #DIV/0! not #NUM!
2024-12-14 22:08:44 +01:00
Daniel
8c6aaf2af0 FIX: Replace inline styles with StyledMenu component for improved readability 2024-12-14 18:34:13 +01:00
Daniel González-Albo
ed24e57555 Merge pull request #185 from ironcalc/fix/dani-webapp-navigator
FIX: remove legacy scrollbar styles
2024-12-14 18:14:17 +01:00
Daniel González-Albo
e8ced73b9c Merge pull request #186 from ironcalc/fix/dani-rename-sheet-dialog
FIX: Makes styling in Rename Sheet Dialog consistent with rest of dia…
2024-12-14 18:13:50 +01:00
Daniel
7ba002aca4 FIX: Makes footer/navigator scrollable when there are too many sheets 2024-12-14 18:04:35 +01:00
Daniel
b0e72321b4 FIX: Makes styling in Rename Sheet Dialog consistent with rest of dialogs 2024-12-13 20:43:38 +01:00
Nicolás Hatcher
41350fbd73 FIX: Run tests again and disable GEOMEAN test 2024-12-13 16:08:46 +01:00
Gian Hancock
17cd1fee96 Validate arg count for OR function
To be compatible with Excel, at least 1 argument is required.

Fixes #175
2024-12-12 13:06:12 +01:00
Gian Hancock
c59148bdf6 Add tests for OR function
Tests currently fail due to issue #175
2024-12-12 13:06:12 +01:00
Andrew Fillmore
d4a2289826 Add GEOMEAN .xlsx, Update .md files, and Run cargo fmt 2024-12-12 05:58:20 +01:00
Andrew Fillmore
e5aff48e36 Add GEOMEAN Tests 2024-12-12 05:58:20 +01:00
Andrew Fillmore
4c3374c0de Add GEOMEAN to Functions 2024-12-12 05:58:20 +01:00
Sinan Yumurtacı
5f3856350b ugh 2024-12-12 05:49:25 +01:00
Sinan Yumurtaci
7058a59c45 two other typos 2024-12-12 05:49:25 +01:00
Sinan Yumurtaci
075760b7ba typo 2024-12-12 05:49:25 +01:00
Nicolás Hatcher
8669962904 FIX: Apply biome "usafe" changes 2024-12-12 05:34:49 +01:00
Nicolás Hatcher
7b30736792 FIX: Make biome happy 2024-12-12 05:34:49 +01:00
Daniel
40c7fc8f80 FIX: Makes styling in Format Dialog consistent with Figmas 2024-12-12 05:34:49 +01:00
Daniel González-Albo
d8d694dd4a FIX: Makes styling in Format Menu consistent with Figmas (#179) 2024-12-12 05:13:07 +01:00
Daniel González-Albo
4b848f26dd FIX: Makes footer/navigator scrollable when there are too many sheets (#180) 2024-12-12 05:09:30 +01:00
Gian Hancock
2f660f85a7 Fix clippy lint (#177) 2024-12-11 11:45:24 +01:00
Sinan Yumurtacı
eee40c1b9a FIX: Prevent negative column width, row height (#167)
* Prevent negative column width / row height in rust

* prevent in front-end
2024-12-11 00:07:06 +01:00
Nicolás Hatcher Andrés
56915ce0b1 Merge pull request #173 from ironcalc/bugfix/nicolas-format-issue
Bugfix/nicolas format issue
2024-12-10 00:39:30 +01:00
Nicolás Hatcher
a4a3b11858 FIX: Avoid freezing the app on frozen columns or rows 2024-12-09 22:33:22 +01:00
Nicolás Hatcher
65f1738473 FIX: Use unicode code points in getFormulaHTML function 2024-12-09 21:46:03 +01:00
Nicolás Hatcher
a05ff18e40 FIX: Stop propagation in Rename window
We will need to do this in every widget in a more efficient manner
2024-12-09 19:51:28 +01:00
Nicolás Hatcher
4ef8a6882f FIX[Format-parser]: Parse [$€]#,##0.00 correctly
We will need to have a look at the format parser sooner rather
than later though
2024-12-09 19:50:41 +01:00
Nicolás Hatcher Andrés
2f2a5e4fba Merge pull request #172 from ironcalc/feature/dani-color-picker
UPDATE: Color picker changes
2024-12-08 22:32:14 +01:00
Daniel
c39540a747 UPDATE: Changing the color picker to look like in the Figmas 2024-12-08 22:22:17 +01:00
Daniel
0fa69045f9 UPDATE: WIP 2024-12-08 22:22:17 +01:00
Nicolás Hatcher Andrés
23e958af0c Merge pull request #171 from ironcalc/bugfix/dani-button-borders
UPDATE: Moved Border button next to Background color button
2024-12-08 22:16:25 +01:00
Daniel
057835627b UPDATE: Moved Border button next to Background color button 2024-12-08 21:54:34 +01:00
Nicolás Hatcher Andrés
4d6fdf9a4a Merge pull request #170 from ironcalc/feature/nicolas-disable-coverage
FIX: Disable coverage as it is failing for all
2024-12-08 17:15:23 +01:00
Nicolás Hatcher
5731b5cc27 FIX: Disable coverage as it is failing for all
I have send them an email, maybe I can fix this
2024-12-08 17:08:25 +01:00
Nicolás Hatcher Andrés
592ef2415d Merge pull request #169 from ironcalc/update/nicolas-fv-documentation
Update/nicolas fv documentation
2024-12-08 16:21:56 +01:00
Nicolás Hatcher
cb6685f72a FIX: Fv documentation. Some updates to the text 2024-12-08 11:11:48 +01:00
Nicolás Hatcher
8402bb0935 FIX: correct links in fv documentation 2024-12-08 01:55:34 +01:00
Nicolás Hatcher
91df91c425 FIX: Make biome happy 2024-12-07 12:45:49 +01:00
Daniel
4aa770c118 UPDATE: Makes 'File' button the same as 'Help', makes manu consistent 2024-12-07 12:45:49 +01:00
Daniel
c92c065073 UPDATE: Added a Help button 2024-12-07 12:45:49 +01:00
Daniel
6f124185b2 UPDATE: Cosmetic changes on file bar 2024-12-07 12:45:49 +01:00
stevethesleeve
17cf519d41 Update fv files (#162)
* Files updated for FV function documentation.

* Further FV changes
2024-12-07 12:25:57 +01:00
Sylvain Zimmer
bd1a1e3c97 Fix typo 2024-12-06 20:51:32 +01:00
Andrew Grosser
3d517a4af4 added updates from cargo fmt 2024-12-05 23:29:40 +01:00
Andrew Grosser
1734fd5740 added missing api functions for get_cell* 2024-12-05 23:29:40 +01:00
Daniel
d9dbd3bf14 UPDATE: Small fixes in Upload file Dialog 2024-12-05 00:11:41 +01:00
Nicolás Hatcher
d8a5c29e2f FIX: Make Biome happy 2024-12-01 20:14:38 +01:00
Daniel
85cd7ab6a3 UPDATE: design adjustments in 'File' menu 2024-12-01 20:14:38 +01:00
Nicolás Hatcher
4b806c357a FIX[parser]: Check the order (row, column) in range before transforming
Fixes #155
2024-11-30 14:37:06 +01:00
Steve Fanning
3270d587ac Minor update to the README file in docs. 2024-11-29 21:22:00 +01:00
Nicolás Hatcher
e065477b5a FIX: Make clippy happy
This is mostly Rust 1.83
2024-11-29 19:55:12 +01:00
Nicolás Hatcher
1f5f575e7a UPDATE: Update chrono-tzand bitcode crate versions 2024-11-29 19:55:12 +01:00
Nicolás Hatcher
472740f296 UPDATE: Use regex-lite crate instead of of regex
This removes almost 1Mb form the generated wasm(!!!)
2024-11-29 19:55:12 +01:00
Jonathan S
430b420435 Update about.md 2024-11-29 19:00:01 +01:00
Steve Fanning
48fd51fc8a Minor improvements to CONTRIBUTING.md 2024-11-29 11:49:02 +01:00
Nicolás Hatcher
614d71b61c UPDATE: Adds CONTRIBUTING guide an documentation 2024-11-28 22:42:14 +01:00
Nicolás Hatcher
38e21b9639 FIX: Small fix in app routing 2024-11-28 22:42:14 +01:00
Nicolás Hatcher
d6a462dbe3 FIX: Added changelog entry 2024-11-28 22:42:14 +01:00
Nicolás Hatcher
c1df2cec0b FIX: Issues with paste
Copy/Paste is always with tab separated values not "," or others.
Maybe we can add that?
2024-11-27 22:55:39 +01:00
Nicolás Hatcher
283a44e109 FIX: Aaahhh! Make the linter happy 2024-11-27 22:55:39 +01:00
Nicolás Hatcher
f7dac8b015 FIX: fmt issues 2024-11-27 22:55:39 +01:00
Nicolás Hatcher
df0aa51d14 FIX: Adds some tests 2024-11-27 22:55:39 +01:00
Nicolás Hatcher
411c5de59b FIX: Another round a borders
Only test are missing(!)
2024-11-27 22:55:39 +01:00
Nicolás Hatcher
0df132d5c2 FIX: Work undone
We are not going to follow this path, but I will leave this commit as
part of the git history
2024-11-27 22:55:39 +01:00
Nicolás Hatcher
8cdb3b8c60 FIX: Removes ununsed borders code 2024-11-27 22:55:39 +01:00
Nicolás Hatcher
d08fe32f97 FIX: color picker and border issues 2024-11-27 22:55:39 +01:00
Nicolás Hatcher
47acd0d600 FIX: Some fixes to the doumentation 2024-11-27 22:28:07 +01:00
Nicolás Hatcher
d70ab85396 FIX: Adds some more tests fro FORMULATEXT 2024-11-27 22:28:07 +01:00
Nicolás Hatcher
65b959cb1c FIX: Forgotten file :S, adds documentation and CHANGELOG 2024-11-27 22:28:07 +01:00
Nicolás Hatcher
726fc1399d UPDATE: Adds FORMULATEXT for Steve 2024-11-27 22:28:07 +01:00
Nicolás Hatcher
8ed0ab25f6 FIX: Fix run of python examples
This needs to be properly fixed
2024-11-26 20:13:41 +01:00
Nicolás Hatcher
949eafc97f FIX: Removes the csv-sniffer in favour of a simple guess
This removes 500Kb form the was build so it is worth it.
We were using a very old version of the sniffer, the last one might not
have this bug though
2024-11-26 20:13:41 +01:00
Nicolás Hatcher
1f1fd24334 UPDATE: Reorder links. Add desktop app 2024-11-25 19:10:41 +01:00
Nicolás Hatcher
2b0c24de55 UPDATE: Adds bluesky link 2024-11-25 19:10:41 +01:00
Nicolás Hatcher
1aa9b6a220 FIX: Proper path for "Edit GitHub" 2024-11-25 19:10:41 +01:00
Nicolás Hatcher
94ebf33656 UPDATE: Remove docs artifacts that are not needed anymore
generate_docs.rs was used to bootstrap the documentatio effords

Unlikely to be used on a regular basis
2024-11-25 19:10:41 +01:00
Nicolás Hatcher
b3d4c479f6 UPDATE: CHANGELOG for the document server 2024-11-25 19:10:41 +01:00
Nicolás Hatcher
67aaa85a9a FIX: Rename folder (fix typo) 2024-11-25 19:10:41 +01:00
Nicolás Hatcher
5d2953b894 FIX: Incorrect filename.
Fixes #141
2024-11-25 08:32:21 +01:00
Nicolás Hatcher
b84aeb8bb9 FIX: Make Biome happy 2024-11-24 23:08:52 +01:00
Nicolás Hatcher
c5576af81b FIX: Fixes according to design 2024-11-24 23:08:52 +01:00
Daniel
cb38eff899 UPDATE: text changes in some sections, adds placeholder pages 2024-11-24 23:08:52 +01:00
Nicolás Hatcher
16212b1518 FIX: Fixes broken links, rewording 2024-11-24 23:08:52 +01:00
Nicolás Hatcher
8243e231ab UPDATE: Add placeholders for all functions 2024-11-24 23:08:52 +01:00
Nicolás Hatcher
48afb45eb9 UPDATE: Documents reorganization and some additions 2024-11-24 23:08:52 +01:00
Daniel
97846041e5 UPDATE: Adjusted settings, styling and basic content pages 2024-11-24 23:08:52 +01:00
Daniel
c1be1e47cb UPDATE: First commit with the new documentation 2024-11-24 23:08:52 +01:00
Nicolás Hatcher
7efdbede3c UPDATE: Add entry in CHANGELOG for UNICODE function
🚀
2024-11-17 17:08:22 +01:00
Bruno Carvalhal
be6819fec3 Remove unwrap logic 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
e130f784fd add missing test case for multiple arguments in UNICODE 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
c2a2983937 Add missing UNICODE to to_xlsx_string 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
3c49f9a606 Add error cases 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
63817e2d50 Also accept _xlfn.UNICODE 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
028ae1ce98 Change output formatting of UNICODE to Number 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
a4a40c6fd0 Add test workbook for UNICODE 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
0ed2984358 Add code coverage 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
0b1199056f Remove unneeded comment 2024-11-17 16:49:41 +01:00
Bruno Carvalhal
726bf677ed Implement UNICODE function 2024-11-17 16:49:41 +01:00
Nicolás Hatcher
d681f63b25 FIX: Test also full rows and columns in IRR function
This means functions like `=IRR(A:A)` or `=IRR(1:1)`
2024-11-17 11:59:10 +01:00
Nicolás Hatcher
ba5869420b FIX: Run covergae also on merge in main 2024-11-17 11:59:10 +01:00
Nicolás Hatcher
420ea9829c FIX: Refactor some finatial functions to use common code 2024-11-17 11:59:10 +01:00
Nicolás Hatcher
49ae2d8915 FIX: Forbid unwrap, expect and panic in the base code 2024-11-17 11:59:10 +01:00
Nicolás Hatcher
bdd2c8fe04 FIX: Fix several indentation issues in comments
Thanks clippy!
2024-11-17 11:59:10 +01:00
Nicolás Hatcher
24dd63b261 FIX: Correct tag number (oops) 2024-11-15 01:07:02 +01:00
Nicolás Hatcher
861700cb45 UPDATE: Adds CHANGELOG 2024-11-15 00:59:13 +01:00
Mehdi Armachi
98dc557a01 Adds navigation labels for sheet management 2024-11-11 10:36:54 +01:00
Nicolás Hatcher
2c2228c2c2 FIX: [App]: Borders done right 2024-10-31 22:43:43 +01:00
Nicolás Hatcher
494a315cbd FIX: Do geometry right 2024-10-31 22:43:43 +01:00
Nicolás Hatcher
0c69889832 FIX: Column/Row width/height UI issues 2024-10-31 22:43:43 +01:00
Nicolás Hatcher
04d8c658ab UPDATE: Adds cut/paste 2024-10-31 22:43:43 +01:00
Nicolás Hatcher
dad4755b16 FIX: Fixes from Dani's design 2024-10-26 11:04:52 +02:00
Nicolás Hatcher
75d8a5282e FIX: Slightly better behaviour for increase/decrease decimal places
The general solution must be done in Rust and it is a bit more complex.
2024-10-26 11:04:52 +02:00
Nicolás Hatcher
f78027247b FIX: Make biome happy 2024-10-26 11:04:52 +02:00
Nicolás Hatcher
ee6a41c4f4 FIX: Nicer loading image 2024-10-26 11:04:52 +02:00
Nicolás Hatcher
b7336f70d6 FIX[App]: Font-size of menu is 12px 2024-10-26 11:04:52 +02:00
Nicolás Hatcher
dae37f14ba FIX[App]: Over scroll issues 2024-10-26 11:04:52 +02:00
Nicolás Hatcher
7ffbfac432 FIX[WebApp]: fixes in formula bar
* fx is not clickable
* Removed chevron
* Show slecting/ed area in address
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
f9ea4fd757 FIX[WebApp]: Only show the active ranges in the correct sheet
Fixes #104
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
7446932519 FIX[WebApp]: Keep the area extended as selected
Fixes #110
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
d55845e69f FIX[WebApp]: PreventDefault when clicking on the Format Editor
Fixes #112
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
9e5b959ccc FIX[WebApp]: Pass the name along to the serve
Fixes #111
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
ffa93309e2 FIX: Renaming a sheet with the same name doesn't do anything
Fixes #103
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
79216b286b FIX: Caret color is IronCalc 2024-10-24 21:54:34 +02:00
Nicolás Hatcher
411d4a3780 FIX: Make biome happy 2024-10-24 21:54:34 +02:00
Nicolás Hatcher
3a7aa15347 FIX: Mark code as ununsed for now 2024-10-24 21:54:34 +02:00
Nicolás Hatcher
090e852054 FIX: Make selected sheet bold 2024-10-24 21:54:34 +02:00
Nicolás Hatcher
3e54ad5b3c FIX: Rename sheet dialog with correct default name
Fixes #103
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
7b12c2682e FIX: Headers height show be the same as the default row height 2024-10-24 21:54:34 +02:00
Nicolás Hatcher
80273a88ec FIX: When creating a new sheet, select it
Fixes #100
2024-10-24 21:54:34 +02:00
Nicolás Hatcher
3d951c5c50 FIX: Several UI fixes from Dani
* Toast has Inter font-family
* Share button has Inter font family
* More accurate menu list to design
* Removes unused navigation
* Adds link to IronCalc
* Removes line=black :O
2024-10-23 22:42:22 +02:00
Nicolás Hatcher
cd54389e91 UPDATE: Implement copy/paste in the UI 2024-10-23 21:43:18 +02:00
Nicolás Hatcher
843d8beb02 FIX: Once again more
apparently I don't have anything better to do :D
2024-10-15 19:29:21 +02:00
Nicolás Hatcher
09ac29785d FIX[wasm]: Fixes failing test 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
2b530423c8 FIX[base]: Adds test for names and row heigh 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
51c41900d7 FIX: Fix broken tests 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
730a815729 FIX[Editor]: More simplifications and fixes 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
9805d0c518 FIX: Set the color of the refe range to be the next from the active ranges 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
10a9d36f3d FIX: Make biome happy 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
480640dc98 UPDATE[WebApp]: we can now delete models on the localStorage 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
3058a63e4f FIX: Correct default for vertical align 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
8275d73b64 FIX: Set default row height to 22
This matches the line height. So far a magic number
2024-10-15 19:29:21 +02:00
Nicolás Hatcher
072abb2240 FIX: Vertical Align by default is bottom 2024-10-15 19:29:21 +02:00
Nicolás Hatcher
9a46e5ccc7 FIX: More fixes to the cell editor
* Font family is Inter, font size 13, line-width 22
* Correct vertical align for multiline text
* Entering multiline text sets the height of the row (!)
2024-10-15 19:29:21 +02:00
Nicolás Hatcher
585e594d8d FIX: Diverse fixes to the editor
* Editor now expands as you write
* You can switch between the formula bar and cell editor
* While editing in the formula bar you see the results in the editor
* Give Mateusz more credit
2024-10-15 19:29:21 +02:00
Nicolás Hatcher
248ef66e7c FIX: Make biome happy 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
15da2e5785 FIX: Close the sheet list menu when a sheet is selected 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
39174add1f FIX: number format menu closes when selected 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
e412f5fc22 FIX: Delete the selected area correctly
Previously it was deleting one extra row and column
2024-10-11 21:08:16 +02:00
Nicolás Hatcher
42c1a39131 FIX: Cell editor correct behaviour 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
f26cdd3a4b FIX: Sets the patternFill to solid when changing the background color 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
4016eb5944 FIX: Better support for mobile phones 2024-10-11 21:08:16 +02:00
Nicolás Hatcher
58dfdd329e FIX: Fix broken build 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
4a290aec7c FIX: Forgotten file :S 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
3966dbc790 FIX: Correct font-size in navigation bar 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
abd4ce4ea5 FIX: Let’s move the outline handle to left and top 1px 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
02da1eb388 FIX: Make default cells 25% larger 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
1131234531 FIX: Slightly better widths in the row headers
I'm afraid this nees to be completely redone
2024-10-08 23:10:34 +02:00
Nicolás Hatcher
b495397b5f FIX: Proper imports 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
8c0a566995 FIX: Set grid color to grey-300 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
dd62dd2dc6 FIX: Set format menu font-size to 12px 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
79b7b9b817 FIX: Correct paddings in formula bar 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
06ae1a1d6d FIX: Fix tooltips on buttons
* Strike through,
* Hide grid lines
* all vertical/horizontal align buttons
2024-10-08 23:10:34 +02:00
Nicolás Hatcher
6390739fd4 FIX: Correct height of toolbar (48) and formula bar (40) 2024-10-08 23:10:34 +02:00
Nicolás Hatcher
e41741cf77 FIX: Change border color between toolbox and formula bar to grey-300 2024-10-08 23:10:34 +02:00
Nicolás Hatcher Andrés
48719b6416 UPDATE: Adds cell and formula editing (#92)
* UPDATE: Adds cell and formula editing

* FIX: Do not loose focus when clicking on the formula we are editing

* FIX: Minimal implementation of browse mode

* FIX: Initial browse mode within sheets

* UPDATE: Webapp

Minimal Web Application
2024-10-08 19:44:27 +02:00
Nicolás Hatcher Andrés
53d3d5144c UPDATE: point documentation to app instead of playground (#93) 2024-09-28 19:23:32 +02:00
Nicolás Hatcher Andrés
bf9a1ed9f4 FIX: Add infrastructure for python tests (#91)
Also integrated with CI and runs tests in documentation
2024-09-21 15:46:32 +02:00
Nicolás Hatcher Andrés
11df4a55c7 UPDATE: Adds python bindings (#90)
* UPDATE: Adds python bindings

Exclude pyroncalc and wasm from test coverage
2024-09-21 11:58:50 +02:00
Nicolás Hatcher Andrés
00b5b65588 UPDATE: bump version to 0.2.0 (#89) 2024-09-17 00:27:06 +02:00
Varun Hegde
2b03b3e3b9 Error Handling of public Set functions (#88)
What are we trying to achieve ?

++ Currently all the major public set functions is panic prone and does not handle and return error. This PR tries to address to all those functions.

What major errors that could happen in these functions ?

++ All the functions which are being made as error safe is being tested against invalid sheet, row and column values, which could given by user

What are the list of functions whose return type has been altered ?

**base/src/model.rs**
1. update_cell_with_text
2. update_cell_with_bool
3. update_cell_with_number
4. set_user_input
5. get_cell_style_index
6. get_style_for_cell
7. set_cell_with_string

++> New functions being added

1. set_cell_with_boolean
2. set_cell_with_number

**base/src/styles.rs**

1. get_style_with_quote_prefix
3. get_style_with_format
4. get_style_without_quote_prefix
5. get_style

**base/src/worksheet.rs**

1. update_cell
2. set_cell_style
3. set_cell_with_formula
4. set_cell_with_number
6. set_cell_with_string
8. set_cell_with_boolean
9. set_cell_with_error
10. cell_clear_contents
11. cell_clear_contents_with_style

++> Above is the comprehensive list of all functions being ( most are public, some are private ) altered for better error handling. As a side effect of changing function signature, there are many changes being done to other functions ( mostly adding "?" to enable to error propagation further )
2024-09-14 17:37:31 +02:00
Nicolás Hatcher Andrés
83a4431417 FIX[WebApp]: Simplify loading logic of workbook (#87)
Note that previously the model would have been fetched twice
2024-08-24 06:59:19 +02:00
Nicolás Hatcher Andrés
40aa8bebaf UPDATE: Adds load_from_xlsx_bytes (#86)
This is usefull if we are transfering bytes, for instance over the internet
2024-08-24 06:50:31 +02:00
Nicolás Hatcher Andrés
b9bf485379 Update README.md (#80)
We don't need a logo anymore
2024-08-18 12:50:34 +02:00
Nicolás Hatcher Andrés
dc23a7f29c UPDATE: Adds web app (#79)
Things missing:

* Browse mode
* Front end tests
* Storybook
2024-08-18 11:44:16 +02:00
Varun Hegde
083548608e Exporting the Merged Cell : Exports the merged cell properly with testcase to verify the scenario (#76)
* adding the functionality of exporting the merged cell with testcase to vreify the above enhancement

* addressing review comments : 1) moving the testing to appropriate folder 2) fixing lint errors 3) fixing the scenario when merge cell count is 0

* addressing 2nd round review comments : cosmetic fixes

* addressing review comments : taking reference instead of cloning
2024-07-21 16:13:58 +02:00
Nicolás Hatcher Andrés
0ba80035d2 FIX: Run test coverage only on Pull Request (#77) 2024-07-16 07:48:41 +02:00
Nicolás Hatcher Andrés
55a043366a FIX: Fixes TypeScript types correctly (#75)
We really need a better way of doing this :/
2024-06-02 19:03:59 +02:00
Nicolás Hatcher Andrés
864a37f1e6 UPDATE: Adds autofill_columns (#74) 2024-06-02 18:43:43 +02:00
Nicolás Hatcher Andrés
72c7c94f3d UPDATE: Autofill by rows (#73) 2024-06-02 10:01:46 +02:00
Nicolás Hatcher Andrés
c3a9b006d2 FIX: Export views and showGridLines properly (#72) 2024-05-28 21:52:10 +02:00
Nicolás Hatcher Andrés
b37397acb8 UPDATE: Adds ability to show/hide grid lines (#71) 2024-05-26 21:28:00 +02:00
Nicolás Hatcher Andrés
49c3b14bf0 UPDATE: Adds get/set views to the user model API (#69) 2024-05-20 17:51:09 +02:00
Nicolás Hatcher Andrés
d2cba48f8e FIX: Fixes incorrect result in M1 Apple silicom (#68) 2024-05-19 10:34:57 +02:00
Nicolás Hatcher Andrés
f752c90058 UPDATE: Parses selected row/column/range and selected sheet (#67)
* FIX: Update to Rust 1.78.0

* UPDATE: Parses selected row/column/range and selected sheet
2024-05-09 11:46:26 +02:00
Daniel González-Albo
a78d5593f2 Merge pull request #60 from ironcalc/feature/dani-logo
UPDATE: adds missing favicons
2024-04-27 18:11:29 +02:00
Daniel
079208a1bd UPDATE: adds missing favicons 2024-04-27 18:02:04 +02:00
Daniel González-Albo
4721582dfe Merge pull request #42 from ironcalc/feature/dani-logo
UPDATE: adds logo
2024-04-25 19:49:43 +02:00
Daniel
1746eec5da UPDATE: adds logo 2024-04-25 19:42:10 +02:00
Nicolás Hatcher Andrés
f9cf86a17c Bugfix/nicolas more fixes (#36)
* FIX: Remove the serde_json depndendency

* UPDATE: Use binary representation also for languages and locales
2024-04-15 19:25:38 +02:00
Nicolás Hatcher Andrés
49ef846ebd FIX: small diverse fixes (#35) 2024-04-14 21:50:14 +02:00
Nicolás Hatcher Andrés
b3b7dea930 FIX: Fixes types for TypeScript manually (#32) 2024-04-12 21:08:03 +02:00
Nicolás Hatcher Andrés
196e074ef5 UPDATE: Serialize/Deserialize with bitcode (#31)
* UPDATE: Serialize/Deserialize with bitcode

Fixes #12
2024-04-11 23:45:00 +02:00
Nicolás Hatcher Andrés
489027991c UPDATE: Adds Web browser wasm bindings (#30)
* UPDATE: Adds Web browser wasm bindings

* FIX: install wasm-pack in the GitHub actions
2024-04-07 12:41:33 +02:00
Nicolás Hatcher Andrés
d445553d85 UPDATE: Adds 'user model' API (#27)
* bump version for documentation
* Fixes wrong doc comment
* renames old APIs to be consistent
2024-04-03 22:41:15 +02:00
Nicolás Hatcher
e9fc41541b FIX: adds test 2024-03-21 23:07:07 +01:00
Nicolás Hatcher
c474bd2fc0 FIX: Adds small test 2024-03-21 22:51:38 +01:00
Nicolás Hatcher
d6a1f9c28e FIX: Rust update to 1.77.0 2024-03-21 22:51:19 +01:00
Nicolás Hatcher
5be13d1602 FIX: Adds test case for escape_xml function 2024-03-21 22:32:48 +01:00
Nicolás Hatcher
053217d3e4 TEST: check yml file for codecov cfg 2024-03-16 18:07:03 +01:00
Nicolás Hatcher
493dc56892 FIX: Properly format title in function list 2024-03-16 17:38:57 +01:00
Nicolás Hatcher
a38ba93724 FIX: Clearer list for the wiki 2024-03-16 17:35:40 +01:00
Nicolás Hatcher Andrés
0029901ca3 UPDATE: Adds minimal generated documented functions (#22)
See #21
2024-03-16 12:57:25 +01:00
781 changed files with 39973 additions and 4099 deletions

View File

@@ -16,6 +16,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
- name: Build - name: Build
run: cargo build --release --verbose run: cargo build --release --verbose

View File

@@ -1,6 +1,7 @@
name: Coverage name: Coverage
on: [pull_request, push] on:
workflow_dispatch:
jobs: jobs:
coverage: coverage:
@@ -14,7 +15,7 @@ jobs:
- name: Install cargo-llvm-cov - name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov
- name: Generate code coverage - name: Generate code coverage
run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info run: cargo llvm-cov --all-features --workspace --exclude pyroncalc --exclude wasm --lcov --output-path lcov.info
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
with: with:

1
.gitignore vendored
View File

@@ -1 +1,2 @@
target/* target/*
.DS_Store

32
.readthedocs.yaml Normal file
View File

@@ -0,0 +1,32 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
# Required
version: 2
# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"
# You can also specify other tool versions:
# nodejs: "19"
# rust: "1.64"
# golang: "1.19"
# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: bindings/python/docs/conf.py
# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub
# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt

27
CHANGELOG.md Normal file
View File

@@ -0,0 +1,27 @@
# CHANGELOG
## Unreleased
### Added
- New function UNICODE ([#128](https://github.com/ironcalc/IronCalc/pull/128))
- New document server (Thanks Dani!)
- New function FORMULATEXT
### Fixed
- Fixed several issues with pasting content
- Fixed several issues with borders
- Fixed bug where columns and rows could be resized to negative width and height, respectively
## [0.2.0] - 2024-11-06 (The HN release)
### Added
- Rust crate ironcalc_base
- Rust crate ironcalc
- Minimal Python bindings (only Linux)
- JavaScript bindings
- React WebApp
[0.2.0]: https://github.com/IronCalc/ironcalc/releases/tag/v0.2.0

73
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,73 @@
# Contributing to IronCalc
Whether you are a seasoned developer or a rookie, welcome to IronCalc!
🎉 We appreciate your interest in contributing to our project.
Before starting any work it is best if you get in touch to make sure your work is relevant.
Please be patient, I am only one and this is a side project.
---
## 🛠 Changes to the main repo
If are comfortable working with GitHub and Git, the following steps should be straightforward. For more general information visit [GitHub Docs](https://docs.github.com/en) and [Git Documentation](https://git-scm.com/doc).
1. **Fork the repository**
Start by forking the repository to your own GitHub account. You can do this by clicking the "Fork" button on the top right of the repository page.
2. **Clone the original repository**
Clone the original repository to your local machine:
```bash
git clone https://github.com/ironcalc/IronCalc.git
cd IronCalc
```
3. **Add your fork as a remote**
Add your forked repository as a remote named fork:
```bash
git remote add fork https://github.com/<your-username>/IronCalc.git
```
4. **Create a new branch**
Always create a new branch for your changes to keep your work isolated:
```bash
git checkout -b your-feature-name
```
5. **Make changes**
Implement your changes, improvements, or bug fixes. Make sure to follow any coding style or project-specific guidelines.
6. **Commit your changes**
Write clear and concise commit messages:
```bash
git add .
git commit -m "Brief description of your changes"
```
7. **Push to your fork**
Push your branch to your forked repository:
```bash
git push fork your-feature-name
````
8. **Create a Pull Request (PR)**
Follow the steps on the terminal or go to the orig IronCalc repository, and click on "New Pull Request."
Ensure your PR has a clear title and description explaining the purpose of your changes.
Always start from the main branch in a clean state. `git pull` will generally get the lastest changes form the original repo.
You should make sure that your changes are properly tested.
# 🤝 Community and Support
Feel free to reach out if you have questions or need help. Via GitHub, email, our discord server or bluesky.
* Open an issue to report a bug or discuss a feature before implementing it.
* Engage with the community to share ideas or seek guidance.
Note that not all contributors need to be coding. To contribute testing, bug reports, typos, ideas of all kinds, you can just send us an email.
Thank you for your contributions! 💪 Together, we can make IronCalc even better.

784
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,6 +4,8 @@ resolver = "2"
members = [ members = [
"base", "base",
"xlsx", "xlsx",
"bindings/wasm",
"bindings/python",
] ]
exclude = [ exclude = [

View File

@@ -1,33 +1,45 @@
.PHONY: lint
lint: lint:
cargo fmt -- --check cargo fmt -- --check
cargo clippy --all-targets --all-features cargo clippy --all-targets --all-features -- -W clippy::unwrap_used -W clippy::expect_used -W clippy::panic -D warnings
cd webapp && npm install && npm run check
.PHONY: format
format: format:
cargo fmt cargo fmt
.PHONY: tests
tests: lint tests: lint
cargo test cargo test
make remove-xlsx make remove-artifacts
# Regretabbly we need to build the wasm twice, once for the nodejs tests
# and a second one for the vitest.
cd bindings/wasm/ && wasm-pack build --target nodejs && node tests/test.mjs && make
cd webapp && npm run test
cd bindings/python && ./run_tests.sh && ./run_examples.sh
remove-xlsx: .PHONY: remove-artifacts
remove-artifacts:
rm -f xlsx/hello-calc.xlsx rm -f xlsx/hello-calc.xlsx
rm -f xlsx/hello-styles.xlsx rm -f xlsx/hello-styles.xlsx
rm -f xlsx/widths-and-heights.xlsx rm -f xlsx/widths-and-heights.xlsx
clean: remove-xlsx .PHONY: clean
clean: remove-artifacts
cargo clean cargo clean
rm -r -f base/target rm -r -f base/target
rm -r -f xlsx/target rm -r -f xlsx/target
rm -r -f bindings/python/target
rm -r -f bindings/wasm/targets
rm -f cargo-test-* rm -f cargo-test-*
rm -f base/cargo-test-* rm -f base/cargo-test-*
rm -f xlsx/cargo-test-* rm -f xlsx/cargo-test-*
.PHONY: coverage
coverage: coverage:
CARGO_INCREMENTAL=0 RUSTFLAGS='-C instrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test CARGO_INCREMENTAL=0 RUSTFLAGS='-C instrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test
grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html
.PHONY: docs
docs: docs:
cargo doc --no-deps cargo doc --no-deps
.PHONY: lint format tests docs coverage all

View File

@@ -123,12 +123,12 @@ See https://github.com/ironcalc
An early preview of the technology running entirely in your browser: An early preview of the technology running entirely in your browser:
https://playground.ironcalc.com https://app.ironcalc.com
# Collaborators needed!. Call to action # Collaborators needed!. Call to action
We don't have a vibrant community just yet. This is the very stages of the project. But if you are passionate about code with high standards and no compromises, if you are looking for a project with high impact, if you are interested in a better, more open infrastructure for spreadsheets, whether you are a developer (rust, python, TypeScript, electron/tauri/anything else native app, React, you name it), a designer (we need a logo desperately!), an Excel power user who wants features, a business looking to integrate a MIT/Apache licensed spreadsheet in your own SaaS application join us! We don't have a vibrant community just yet. This is the very stages of the project. But if you are passionate about code with high standards and no compromises, if you are looking for a project with high impact, if you are interested in a better, more open infrastructure for spreadsheets, whether you are a developer (rust, python, TypeScript, electron/tauri/anything else native app, React, you name it), a designer, an Excel power user who wants features, a business looking to integrate a MIT/Apache licensed spreadsheet in your own SaaS application join us!
The best place to start will be to join or [discord channel](https://discord.gg/zZYWfh3RHJ) or send us an email at hello@ironcalc.com. The best place to start will be to join or [discord channel](https://discord.gg/zZYWfh3RHJ) or send us an email at hello@ironcalc.com.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/apple-touch-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
assets/favicon-16x16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

BIN
assets/favicon-32x32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@@ -0,0 +1,8 @@
<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="600" height="600" rx="20" fill="#F2994A"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
assets/logo/png/black.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/logo/png/white.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "ironcalc_base" name = "ironcalc_base"
version = "0.1.2" version = "0.2.0"
authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"] authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
edition = "2021" edition = "2021"
homepage = "https://www.ironcalc.com" homepage = "https://www.ironcalc.com"
@@ -12,19 +12,27 @@ readme = "README.md"
[dependencies] [dependencies]
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_repr = "0.1"
ryu = "1.0" ryu = "1.0"
chrono = "0.4" chrono = "0.4"
chrono-tz = "0.7.0" chrono-tz = "0.10"
regex = "1.0" regex = { version = "1.0", optional = true}
regex-lite = { version = "0.1.6", optional = true}
once_cell = "1.16.0" once_cell = "1.16.0"
bincode = "=2.0.0-rc.3" bitcode = "0.6.3"
csv = "1.3.0"
[features]
default = ["use_regex_full"]
use_regex_full = ["regex"]
use_regex_lite = ["regex-lite"]
[dev-dependencies]
serde_json = "1.0"
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = { version = "0.3.60" } js-sys = { version = "0.3.69" }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
rand = "0.8.4" rand = "0.8.5"

View File

@@ -1,17 +1,17 @@
use ironcalc_base::{model::Model, types::CellType}; use ironcalc_base::{types::CellType, Model};
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?; let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;
// A1 // A1
model.set_user_input(0, 1, 1, "1".to_string()); model.set_user_input(0, 1, 1, "1".to_string())?;
// A2 // A2
model.set_user_input(0, 2, 1, "2".to_string()); model.set_user_input(0, 2, 1, "2".to_string())?;
// A3 // A3
model.set_user_input(0, 3, 1, "3".to_string()); model.set_user_input(0, 3, 1, "3".to_string())?;
// B1 // B1
model.set_user_input(0, 1, 2, "=SUM(A1:A3)".to_string()); model.set_user_input(0, 1, 2, "=SUM(A1:A3)".to_string())?;
// B2 // B2
model.set_user_input(0, 2, 2, "=B1/0".to_string()); model.set_user_input(0, 2, 2, "=B1/0".to_string())?;
// Evaluate // Evaluate
model.evaluate(); model.evaluate();

View File

@@ -1,13 +1,13 @@
use ironcalc_base::{cell::CellValue, model::Model}; use ironcalc_base::{cell::CellValue, Model};
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut model = Model::new_empty("hello-world", "en", "UTC")?; let mut model = Model::new_empty("hello-world", "en", "UTC")?;
// A1 // A1
model.set_user_input(0, 1, 1, "Hello".to_string()); model.set_user_input(0, 1, 1, "Hello".to_string())?;
// B1 // B1
model.set_user_input(0, 1, 2, "world!".to_string()); model.set_user_input(0, 1, 2, "world!".to_string())?;
// C1 // C1
model.set_user_input(0, 1, 3, "=CONCAT(A1, \" \", B1".to_string()); model.set_user_input(0, 1, 3, "=CONCAT(A1, \" \", B1".to_string())?;
// evaluates // evaluates
model.evaluate(); model.evaluate();

View File

@@ -77,14 +77,13 @@ impl Model {
let style = source_cell.get_style(); let style = source_cell.get_style();
// FIXME: we need some user_input getter instead of get_text // FIXME: we need some user_input getter instead of get_text
let formula_or_value = self let formula_or_value = self
.cell_formula(sheet, source_row, source_column)? .get_cell_formula(sheet, source_row, source_column)?
.unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language)); .unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
self.set_user_input(sheet, target_row, target_column, formula_or_value); self.set_user_input(sheet, target_row, target_column, formula_or_value)?;
self.workbook self.workbook
.worksheet_mut(sheet)? .worksheet_mut(sheet)?
.set_cell_style(target_row, target_column, style); .set_cell_style(target_row, target_column, style)?;
self.delete_cell(sheet, source_row, source_column)?; self.cell_clear_all(sheet, source_row, source_column)
Ok(())
} }
/// Inserts one or more new columns into the model at the specified index. /// Inserts one or more new columns into the model at the specified index.
@@ -157,6 +156,11 @@ impl Model {
return Err("Please use insert columns instead".to_string()); return Err("Please use insert columns instead".to_string());
} }
// first column being deleted
let column_start = column;
// last column being deleted
let column_end = column + column_count - 1;
// Move cells // Move cells
let worksheet = &self.workbook.worksheet(sheet)?; let worksheet = &self.workbook.worksheet(sheet)?;
let mut all_rows: Vec<i32> = worksheet.sheet_data.keys().copied().collect(); let mut all_rows: Vec<i32> = worksheet.sheet_data.keys().copied().collect();
@@ -166,11 +170,11 @@ impl Model {
for r in all_rows { for r in all_rows {
let columns: Vec<i32> = self.get_columns_for_row(sheet, r, false)?; let columns: Vec<i32> = self.get_columns_for_row(sheet, r, false)?;
for col in columns { for col in columns {
if col >= column { if col >= column_start {
if col >= column + column_count { if col > column_end {
self.move_cell(sheet, r, col, r, col - column_count)?; self.move_cell(sheet, r, col, r, col - column_count)?;
} else { } else {
self.delete_cell(sheet, r, col)?; self.cell_clear_all(sheet, r, col)?;
} }
} }
} }
@@ -184,6 +188,64 @@ impl Model {
delta: -column_count, delta: -column_count,
}), }),
); );
let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
// deletes all the column styles
let mut new_columns = Vec::new();
for col in worksheet.cols.iter_mut() {
// range under study
let min = col.min;
let max = col.max;
// In the diagram:
// |xxxxx| range we are studying [min, max]
// |*****| range we are deleting [column_start, column_end]
// we are going to split it in three big cases:
// ----------------|xxxxxxxx|-----------------
// -----|*****|------------------------------- Case A
// -------|**********|------------------------ Case B
// -------------|**************|-------------- Case C
// ------------------|****|------------------- Case D
// ---------------------|**********|---------- Case E
// -----------------------------|*****|------- Case F
if column_start < min {
if column_end < min {
// Case A
// We displace all columns
let mut new_column = col.clone();
new_column.min = min - column_count;
new_column.max = max - column_count;
new_columns.push(new_column);
} else if column_end < max {
// Case B
// We displace the end
let mut new_column = col.clone();
new_column.min = column_start;
new_column.max = max - column_count;
new_columns.push(new_column);
} else {
// Case C
// skip this, we are deleting the whole range
}
} else if column_start <= max {
if column_end <= max {
// Case D
// We displace the end
let mut new_column = col.clone();
new_column.max = max - column_count;
new_columns.push(new_column);
} else {
// Case E
let mut new_column = col.clone();
new_column.max = column_start - 1;
new_columns.push(new_column);
}
} else {
// Case F
// No action required
new_columns.push(col.clone());
}
}
worksheet.cols = new_columns;
Ok(()) Ok(())
} }
@@ -283,7 +345,7 @@ impl Model {
// remove all cells in row // remove all cells in row
// FIXME: We could just remove the entire row in one go // FIXME: We could just remove the entire row in one go
for column in columns { for column in columns {
self.delete_cell(sheet, r, column)?; self.cell_clear_all(sheet, r, column)?;
} }
} }
} }

View File

@@ -1,12 +1,9 @@
use crate::{ use crate::{
expressions::token::Error, language::Language, number_format::to_excel_precision_str, types::*, expressions::token::Error, language::Language, number_format::to_excel_precision_str, types::*,
}; };
use serde::{Deserialize, Serialize};
use serde_json::json;
/// A CellValue is the representation of the cell content. /// A CellValue is the representation of the cell content.
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Debug, PartialEq)]
#[serde(untagged)]
pub enum CellValue { pub enum CellValue {
None, None,
String(String), String(String),
@@ -14,17 +11,6 @@ pub enum CellValue {
Boolean(bool), Boolean(bool),
} }
impl CellValue {
pub fn to_json_str(&self) -> String {
match &self {
CellValue::None => "null".to_string(),
CellValue::String(s) => json!(s).to_string(),
CellValue::Number(f) => json!(f).to_string(),
CellValue::Boolean(b) => json!(b).to_string(),
}
}
}
impl From<f64> for CellValue { impl From<f64> for CellValue {
fn from(value: f64) -> Self { fn from(value: f64) -> Self {
Self::Number(value) Self::Number(value)

View File

@@ -2,10 +2,12 @@
/// COLUMN_WIDTH and ROW_HEIGHT are pixel values /// COLUMN_WIDTH and ROW_HEIGHT are pixel values
/// A column width of Excel value `w` will result in `w * COLUMN_WIDTH_FACTOR` pixels /// A column width of Excel value `w` will result in `w * COLUMN_WIDTH_FACTOR` pixels
/// Note that these constants are inlined /// Note that these constants are inlined
pub(crate) const DEFAULT_COLUMN_WIDTH: f64 = 100.0; pub(crate) const DEFAULT_COLUMN_WIDTH: f64 = 125.0;
pub(crate) const DEFAULT_ROW_HEIGHT: f64 = 21.0; pub(crate) const DEFAULT_ROW_HEIGHT: f64 = 28.0;
pub(crate) const COLUMN_WIDTH_FACTOR: f64 = 12.0; pub(crate) const COLUMN_WIDTH_FACTOR: f64 = 12.0;
pub(crate) const ROW_HEIGHT_FACTOR: f64 = 2.0; pub(crate) const ROW_HEIGHT_FACTOR: f64 = 2.0;
pub(crate) const DEFAULT_WINDOW_HEIGHT: i64 = 600;
pub(crate) const DEFAULT_WINDOW_WIDTH: i64 = 800;
pub(crate) const LAST_COLUMN: i32 = 16_384; pub(crate) const LAST_COLUMN: i32 = 16_384;
pub(crate) const LAST_ROW: i32 = 1_048_576; pub(crate) const LAST_ROW: i32 = 1_048_576;

View File

@@ -26,6 +26,7 @@ pub struct SetCellValue {
} }
impl Model { impl Model {
#[allow(clippy::expect_used)]
pub(crate) fn shift_cell_formula( pub(crate) fn shift_cell_formula(
&mut self, &mut self,
sheet: u32, sheet: u32,
@@ -57,6 +58,7 @@ impl Model {
} }
} }
#[allow(clippy::expect_used)]
pub fn forward_references( pub fn forward_references(
&mut self, &mut self,
source_area: &Area, source_area: &Area,

View File

@@ -308,9 +308,9 @@ impl Lexer {
return self.consume_range(None); return self.consume_range(None);
} }
let name_upper = name.to_ascii_uppercase(); let name_upper = name.to_ascii_uppercase();
if name_upper == self.language.booleans.true_value { if name_upper == self.language.booleans.r#true {
return TokenType::Boolean(true); return TokenType::Boolean(true);
} else if name_upper == self.language.booleans.false_value { } else if name_upper == self.language.booleans.r#false {
return TokenType::Boolean(false); return TokenType::Boolean(false);
} }
if self.mode == LexerMode::A1 { if self.mode == LexerMode::A1 {
@@ -660,8 +660,8 @@ impl Lexer {
fn consume_error(&mut self) -> TokenType { fn consume_error(&mut self) -> TokenType {
let errors = &self.language.errors; let errors = &self.language.errors;
let rest_of_formula: String = self.chars[self.position - 1..self.len].iter().collect(); let rest_of_formula: String = self.chars[self.position - 1..self.len].iter().collect();
if rest_of_formula.starts_with(&errors.ref_value) { if rest_of_formula.starts_with(&errors.r#ref) {
self.position += errors.ref_value.chars().count() - 1; self.position += errors.r#ref.chars().count() - 1;
return TokenType::Error(Error::REF); return TokenType::Error(Error::REF);
} else if rest_of_formula.starts_with(&errors.name) { } else if rest_of_formula.starts_with(&errors.name) {
self.position += errors.name.chars().count() - 1; self.position += errors.name.chars().count() - 1;

View File

@@ -6,11 +6,11 @@ use crate::{
token::TokenType, token::TokenType,
}, },
language::get_language, language::get_language,
locale::get_locale_fix, locale::get_locale,
}; };
fn new_language_lexer(formula: &str, locale: &str, language: &str) -> Lexer { fn new_language_lexer(formula: &str, locale: &str, language: &str) -> Lexer {
let locale = get_locale_fix(locale).unwrap(); let locale = get_locale(locale).unwrap();
let language = get_language(language).unwrap(); let language = get_language(language).unwrap();
Lexer::new(formula, LexerMode::A1, locale, language) Lexer::new(formula, LexerMode::A1, locale, language)
} }

View File

@@ -1,3 +1,5 @@
#![allow(clippy::expect_used)]
use crate::expressions::{ use crate::expressions::{
lexer::util::get_tokens, lexer::util::get_tokens,
token::{OpCompare, OpSum, TokenType}, token::{OpCompare, OpSum, TokenType},
@@ -22,6 +24,25 @@ fn test_get_tokens() {
assert_eq!(l.end, 10); assert_eq!(l.end, 10);
} }
#[test]
fn get_tokens_unicode() {
let formula = "'🇵🇭 Philippines'!A1";
let t = get_tokens(formula);
assert_eq!(t.len(), 1);
let expected = TokenType::Reference {
sheet: Some("🇵🇭 Philippines".to_string()),
row: 1,
column: 1,
absolute_column: false,
absolute_row: false,
};
let l = t.first().expect("expected token");
assert_eq!(l.token, expected);
assert_eq!(l.start, 0);
assert_eq!(l.end, 19);
}
#[test] #[test]
fn test_simple_tokens() { fn test_simple_tokens() {
assert_eq!( assert_eq!(

View File

@@ -52,7 +52,9 @@ pub fn get_tokens(formula: &str) -> Vec<MarkedToken> {
let mut lexer = Lexer::new( let mut lexer = Lexer::new(
formula, formula,
LexerMode::A1, LexerMode::A1,
#[allow(clippy::expect_used)]
get_locale("en").expect(""), get_locale("en").expect(""),
#[allow(clippy::expect_used)]
get_language("en").expect(""), get_language("en").expect(""),
); );
let mut start = lexer.get_position(); let mut start = lexer.get_position();

View File

@@ -49,21 +49,15 @@ pub mod stringify;
pub mod walk; pub mod walk;
#[cfg(test)] #[cfg(test)]
mod test; mod tests;
#[cfg(test)]
mod test_ranges;
#[cfg(test)]
mod test_move_formula;
#[cfg(test)]
mod test_tables;
pub(crate) fn parse_range(formula: &str) -> Result<(i32, i32, i32, i32), String> { pub(crate) fn parse_range(formula: &str) -> Result<(i32, i32, i32, i32), String> {
let mut lexer = lexer::Lexer::new( let mut lexer = lexer::Lexer::new(
formula, formula,
lexer::LexerMode::A1, lexer::LexerMode::A1,
#[allow(clippy::expect_used)]
get_locale("en").expect(""), get_locale("en").expect(""),
#[allow(clippy::expect_used)]
get_language("en").expect(""), get_language("en").expect(""),
); );
if let TokenType::Range { if let TokenType::Range {
@@ -202,7 +196,9 @@ impl Parser {
let lexer = lexer::Lexer::new( let lexer = lexer::Lexer::new(
"", "",
lexer::LexerMode::A1, lexer::LexerMode::A1,
#[allow(clippy::expect_used)]
get_locale("en").expect(""), get_locale("en").expect(""),
#[allow(clippy::expect_used)]
get_language("en").expect(""), get_language("en").expect(""),
); );
Parser { Parser {
@@ -222,7 +218,7 @@ impl Parser {
pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node { pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node {
self.lexer.set_formula(formula); self.lexer.set_formula(formula);
self.context = context.clone(); self.context.clone_from(context);
self.parse_expr() self.parse_expr()
} }
@@ -518,20 +514,6 @@ impl Parser {
let mut absolute_row1 = left.absolute_row; let mut absolute_row1 = left.absolute_row;
let mut absolute_row2 = right.absolute_row; let mut absolute_row2 = right.absolute_row;
if self.lexer.is_a1_mode() {
if !left.absolute_row {
row1 -= context.row
};
if !left.absolute_column {
column1 -= context.column
};
if !right.absolute_row {
row2 -= context.row
};
if !right.absolute_column {
column2 -= context.column
};
}
if row1 > row2 { if row1 > row2 {
(row2, row1) = (row1, row2); (row2, row1) = (row1, row2);
(absolute_row2, absolute_row1) = (absolute_row1, absolute_row2); (absolute_row2, absolute_row1) = (absolute_row1, absolute_row2);
@@ -540,6 +522,22 @@ impl Parser {
(column2, column1) = (column1, column2); (column2, column1) = (column1, column2);
(absolute_column2, absolute_column1) = (absolute_column1, absolute_column2); (absolute_column2, absolute_column1) = (absolute_column1, absolute_column2);
} }
if self.lexer.is_a1_mode() {
if !absolute_row1 {
row1 -= context.row
};
if !absolute_column1 {
column1 -= context.column
};
if !absolute_row2 {
row2 -= context.row
};
if !absolute_column2 {
column2 -= context.column
};
}
match sheet_index { match sheet_index {
Some(index) => Node::RangeKind { Some(index) => Node::RangeKind {
sheet_name: sheet, sheet_name: sheet,
@@ -675,14 +673,23 @@ impl Parser {
} }
}; };
// table-name => table // table-name => table
let table = self.tables.get(&table_name).unwrap_or_else(|| { let table = match self.tables.get(&table_name) {
panic!( Some(t) => t,
None => {
let message = format!(
"Table not found: '{table_name}' at '{}!{}{}'", "Table not found: '{table_name}' at '{}!{}{}'",
context.sheet, context.sheet,
number_to_column(context.column).expect(""), number_to_column(context.column)
.unwrap_or(format!("{}", context.column)),
context.row context.row
) );
}); return Node::ParseErrorKind {
formula: self.lexer.get_formula(),
position: 0,
message,
};
}
};
let table_sheet_index = match self.get_sheet_index_by_name(&table.sheet_name) { let table_sheet_index = match self.get_sheet_index_by_name(&table.sheet_name) {
Some(i) => i, Some(i) => i,
None => { None => {
@@ -701,6 +708,7 @@ impl Parser {
}; };
// context must be with tables.reference // context must be with tables.reference
#[allow(clippy::expect_used)]
let (column_start, mut row_start, column_end, mut row_end) = let (column_start, mut row_start, column_end, mut row_end) =
parse_range(&table.reference).expect("Failed parsing range"); parse_range(&table.reference).expect("Failed parsing range");

View File

@@ -456,11 +456,65 @@ fn stringify(
}; };
format!("{}{}{}", x, kind, y) format!("{}{}{}", x, kind, y)
} }
OpPowerKind { left, right } => format!( OpPowerKind { left, right } => {
"{}^{}", let x = match **left {
stringify(left, context, displace_data, use_original_name), BooleanKind(_)
| NumberKind(_)
| StringKind(_)
| ReferenceKind { .. }
| RangeKind { .. }
| WrongReferenceKind { .. }
| VariableKind(_)
| WrongRangeKind { .. } => {
stringify(left, context, displace_data, use_original_name)
}
OpRangeKind { .. }
| OpConcatenateKind { .. }
| OpProductKind { .. }
| OpPowerKind { .. }
| FunctionKind { .. }
| InvalidFunctionKind { .. }
| ArrayKind(_)
| UnaryKind { .. }
| ErrorKind(_)
| ParseErrorKind { .. }
| OpSumKind { .. }
| CompareKind { .. }
| EmptyArgKind => format!(
"({})",
stringify(left, context, displace_data, use_original_name)
),
};
let y = match **right {
BooleanKind(_)
| NumberKind(_)
| StringKind(_)
| ReferenceKind { .. }
| RangeKind { .. }
| WrongReferenceKind { .. }
| VariableKind(_)
| WrongRangeKind { .. } => {
stringify(right, context, displace_data, use_original_name)
}
OpRangeKind { .. }
| OpConcatenateKind { .. }
| OpProductKind { .. }
| OpPowerKind { .. }
| FunctionKind { .. }
| InvalidFunctionKind { .. }
| ArrayKind(_)
| UnaryKind { .. }
| ErrorKind(_)
| ParseErrorKind { .. }
| OpSumKind { .. }
| CompareKind { .. }
| EmptyArgKind => format!(
"({})",
stringify(right, context, displace_data, use_original_name) stringify(right, context, displace_data, use_original_name)
), ),
};
format!("{}^{}", x, y)
}
InvalidFunctionKind { name, args } => { InvalidFunctionKind { name, args } => {
format_function(name, args, context, displace_data, use_original_name) format_function(name, args, context, displace_data, use_original_name)
} }

View File

@@ -0,0 +1,6 @@
mod test_general;
mod test_issue_155;
mod test_move_formula;
mod test_ranges;
mod test_stringify;
mod test_tables;

View File

@@ -1,17 +1,13 @@
#![allow(clippy::panic)]
use std::collections::HashMap; use std::collections::HashMap;
use crate::expressions::lexer::LexerMode; use crate::expressions::lexer::LexerMode;
use crate::expressions::parser::stringify::DisplaceData; use crate::expressions::parser::stringify::{
to_rc_format, to_string, to_string_displaced, DisplaceData,
use super::super::types::CellReferenceRC;
use super::Parser;
use super::{
super::parser::{
stringify::{to_rc_format, to_string},
Node,
},
stringify::to_string_displaced,
}; };
use crate::expressions::parser::{Node, Parser};
use crate::expressions::types::CellReferenceRC;
struct Formula<'a> { struct Formula<'a> {
initial: &'a str, initial: &'a str,

View File

@@ -0,0 +1,69 @@
#![allow(clippy::panic)]
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::Parser;
use crate::expressions::types::CellReferenceRC;
#[test]
fn issue_155_parser() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 2,
column: 2,
};
let t = parser.parse("A$1:A2", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "A$1:A2");
}
#[test]
fn issue_155_parser_case_2() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 20,
column: 20,
};
let t = parser.parse("C$1:D2", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "C$1:D2");
}
#[test]
fn issue_155_parser_only_row() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 20,
column: 20,
};
// This is tricky, I am not sure what to do in these cases
let t = parser.parse("A$2:B1", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "A1:B$2");
}
#[test]
fn issue_155_parser_only_column() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 20,
column: 20,
};
// This is tricky, I am not sure what to do in these cases
let t = parser.parse("D1:$A3", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "$A1:D3");
}

View File

@@ -1,10 +1,8 @@
use std::collections::HashMap; use std::collections::HashMap;
use crate::expressions::parser::move_formula::{move_formula, MoveContext}; use crate::expressions::parser::move_formula::{move_formula, MoveContext};
use crate::expressions::types::Area; use crate::expressions::parser::Parser;
use crate::expressions::types::{Area, CellReferenceRC};
use super::super::types::CellReferenceRC;
use super::Parser;
#[test] #[test]
fn test_move_formula() { fn test_move_formula() {

View File

@@ -2,9 +2,9 @@ use std::collections::HashMap;
use crate::expressions::lexer::LexerMode; use crate::expressions::lexer::LexerMode;
use super::super::parser::stringify::{to_rc_format, to_string}; use crate::expressions::parser::stringify::{to_rc_format, to_string};
use super::super::types::CellReferenceRC; use crate::expressions::parser::Parser;
use super::Parser; use crate::expressions::types::CellReferenceRC;
struct Formula<'a> { struct Formula<'a> {
formula_a1: &'a str, formula_a1: &'a str,

View File

@@ -0,0 +1,34 @@
#![allow(clippy::panic)]
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::Parser;
use crate::expressions::types::CellReferenceRC;
#[test]
fn exp_order() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 1,
column: 1,
};
let t = parser.parse("(1 + 2)^3 + 4", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "(1+2)^3+4");
let t = parser.parse("(C5 + 3)^R4", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "(C5+3)^R4");
let t = parser.parse("(C5 + 3)^(R4*6)", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "(C5+3)^(R4*6)");
let t = parser.parse("(C5)^(R4)", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "C5^R4");
let t = parser.parse("(5)^(4)", &Some(cell_reference.clone()));
assert_eq!(to_string(&t, &cell_reference), "5^4");
}

View File

@@ -6,8 +6,8 @@ use crate::expressions::parser::stringify::to_string;
use crate::expressions::utils::{number_to_column, parse_reference_a1}; use crate::expressions::utils::{number_to_column, parse_reference_a1};
use crate::types::{Table, TableColumn, TableStyleInfo}; use crate::types::{Table, TableColumn, TableStyleInfo};
use super::super::types::CellReferenceRC; use crate::expressions::parser::Parser;
use super::Parser; use crate::expressions::types::CellReferenceRC;
fn create_test_table( fn create_test_table(
table_name: &str, table_name: &str,

View File

@@ -1,8 +1,7 @@
use std::fmt; use std::fmt;
use bincode::{Decode, Encode}; use bitcode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::language::Language; use crate::language::Language;
@@ -81,8 +80,7 @@ impl fmt::Display for OpProduct {
/// * "#ERROR!" means there was an error processing the formula (for instance "=A1+") /// * "#ERROR!" means there was an error processing the formula (for instance "=A1+")
/// * "#N/IMPL!" means the formula or feature in Excel but has not been implemented in IronCalc /// * "#N/IMPL!" means the formula or feature in Excel but has not been implemented in IronCalc
/// Note that they are serialized/deserialized by index /// Note that they are serialized/deserialized by index
#[derive(Serialize_repr, Deserialize_repr, Decode, Encode, Debug, PartialEq, Eq, Clone)] #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
#[repr(u8)]
pub enum Error { pub enum Error {
REF, REF,
NAME, NAME,
@@ -120,7 +118,7 @@ impl Error {
pub fn to_localized_error_string(&self, language: &Language) -> String { pub fn to_localized_error_string(&self, language: &Language) -> String {
match self { match self {
Error::NULL => language.errors.null.to_string(), Error::NULL => language.errors.null.to_string(),
Error::REF => language.errors.ref_value.to_string(), Error::REF => language.errors.r#ref.to_string(),
Error::NAME => language.errors.name.to_string(), Error::NAME => language.errors.name.to_string(),
Error::VALUE => language.errors.value.to_string(), Error::VALUE => language.errors.value.to_string(),
Error::DIV => language.errors.div.to_string(), Error::DIV => language.errors.div.to_string(),
@@ -137,7 +135,7 @@ impl Error {
pub fn get_error_by_name(name: &str, language: &Language) -> Option<Error> { pub fn get_error_by_name(name: &str, language: &Language) -> Option<Error> {
let errors = &language.errors; let errors = &language.errors;
if name == errors.ref_value { if name == errors.r#ref {
return Some(Error::REF); return Some(Error::REF);
} else if name == errors.name { } else if name == errors.name {
return Some(Error::NAME); return Some(Error::NAME);

View File

@@ -5,6 +5,7 @@ use chrono::NaiveDate;
use crate::constants::EXCEL_DATE_BASE; use crate::constants::EXCEL_DATE_BASE;
pub fn from_excel_date(days: i64) -> NaiveDate { pub fn from_excel_date(days: i64) -> NaiveDate {
#[allow(clippy::expect_used)]
let dt = NaiveDate::from_ymd_opt(1900, 1, 1).expect("problem with chrono::NaiveDate"); let dt = NaiveDate::from_ymd_opt(1900, 1, 1).expect("problem with chrono::NaiveDate");
dt + Duration::days(days - 2) dt + Duration::days(days - 2)
} }

View File

@@ -245,6 +245,9 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
} }
ParsePart::Number(p) => { ParsePart::Number(p) => {
let mut text = "".to_string(); let mut text = "".to_string();
if let Some(c) = p.currency {
text = format!("{}", c);
}
let tokens = &p.tokens; let tokens = &p.tokens;
value = value * 100.0_f64.powi(p.percent) / (1000.0_f64.powi(p.comma)); value = value * 100.0_f64.powi(p.percent) / (1000.0_f64.powi(p.comma));
// p.precision is the number of significant digits _after_ the decimal point // p.precision is the number of significant digits _after_ the decimal point

View File

@@ -10,6 +10,7 @@ pub struct Lexer {
pub enum Token { pub enum Token {
Color(i32), // [Red] or [Color 23] Color(i32), // [Red] or [Color 23]
Condition(Compare, f64), // [<=100] (Comparator, number) Condition(Compare, f64), // [<=100] (Comparator, number)
Currency(char), // [$€] ($ currency symbol)
Literal(char), // €, $, (, ), /, :, +, -, ^, ', {, }, <, =, !, ~, > and space or scaped \X Literal(char), // €, $, (, ), /, :, +, -, ^, ', {, }, <, =, !, ~, > and space or scaped \X
Spacer(char), // *X Spacer(char), // *X
Ghost(char), // _X Ghost(char), // _X
@@ -274,6 +275,15 @@ impl Lexer {
self.set_error("Failed to parse condition"); self.set_error("Failed to parse condition");
Token::ILLEGAL Token::ILLEGAL
} }
} else if c == '$' {
// currency
self.read_next_char();
if let Some(currency) = self.read_next_char() {
self.read_next_char();
return Token::Currency(currency);
}
self.set_error("Failed to parse currency");
Token::ILLEGAL
} else { } else {
// Color // Color
if let Some(index) = self.consume_color() { if let Some(index) = self.consume_color() {

View File

@@ -74,6 +74,7 @@ mod test;
// //
// * Color [Red] or [Color 23] or [Color23] // * Color [Red] or [Color 23] or [Color23]
// * Conditions [<100] // * Conditions [<100]
// * Currency [$€]
// * Space _X when X is any given char // * Space _X when X is any given char
// * A spacer of chars: *X where X is repeated as much as possible // * A spacer of chars: *X where X is repeated as much as possible
// * Literals: $, (, ), :, +, - and space // * Literals: $, (, ), :, +, - and space

View File

@@ -40,6 +40,7 @@ pub struct NumberPart {
pub is_scientific: bool, pub is_scientific: bool,
pub scientific_minus: bool, pub scientific_minus: bool,
pub exponent_digit_count: i32, pub exponent_digit_count: i32,
pub currency: Option<char>,
} }
pub struct DatePart { pub struct DatePart {
@@ -114,6 +115,7 @@ impl Parser {
let mut exponent_digit_count = 0; let mut exponent_digit_count = 0;
let mut number = 'i'; let mut number = 'i';
let mut index = 0; let mut index = 0;
let mut currency = None;
while token != Token::EOF && token != Token::Separator { while token != Token::EOF && token != Token::Separator {
let next_token = self.lexer.next_token(); let next_token = self.lexer.next_token();
@@ -170,6 +172,9 @@ impl Parser {
Token::Condition(cmp, value) => { Token::Condition(cmp, value) => {
condition = Some((cmp, value)); condition = Some((cmp, value));
} }
Token::Currency(c) => {
currency = Some(c);
}
Token::QuestionMark => { Token::QuestionMark => {
tokens.push(TextToken::Digit(Digit { tokens.push(TextToken::Digit(Digit {
kind: '?', kind: '?',
@@ -291,6 +296,7 @@ impl Parser {
is_scientific, is_scientific,
scientific_minus, scientific_minus,
exponent_digit_count, exponent_digit_count,
currency,
}) })
} }
} }

View File

@@ -76,6 +76,14 @@ fn test_color() {
assert_eq!(format_number(3.1, "[blue]0.00", locale).color, Some(4)); assert_eq!(format_number(3.1, "[blue]0.00", locale).color, Some(4));
} }
#[test]
fn dollar_euro() {
let locale = get_default_locale();
let format = "[$€]#,##0.00";
let t = format_number(3.1, format, locale);
assert_eq!(t.text, "€3.10");
}
#[test] #[test]
fn test_parts() { fn test_parts() {
let locale = get_default_locale(); let locale = get_default_locale();

View File

@@ -1,7 +1,6 @@
use chrono::DateTime;
use chrono::Datelike; use chrono::Datelike;
use chrono::Months; use chrono::Months;
use chrono::NaiveDateTime;
use chrono::TimeZone;
use chrono::Timelike; use chrono::Timelike;
use crate::expressions::types::CellReferenceIndex; use crate::expressions::types::CellReferenceIndex;
@@ -258,8 +257,8 @@ impl Model {
// milliseconds since January 1, 1970 00:00:00 UTC. // milliseconds since January 1, 1970 00:00:00 UTC.
let milliseconds = get_milliseconds_since_epoch(); let milliseconds = get_milliseconds_since_epoch();
let seconds = milliseconds / 1000; let seconds = milliseconds / 1000;
let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) { let local_time = match DateTime::from_timestamp(seconds, 0) {
Some(dt) => dt, Some(dt) => dt.with_timezone(&self.tz),
None => { None => {
return CalcResult::Error { return CalcResult::Error {
error: Error::ERROR, error: Error::ERROR,
@@ -268,7 +267,6 @@ impl Model {
} }
} }
}; };
let local_time = self.tz.from_utc_datetime(&dt);
// 693_594 is computed as: // 693_594 is computed as:
// NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2 // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
// The 2 days offset is because of Excel 1900 bug // The 2 days offset is because of Excel 1900 bug
@@ -289,8 +287,8 @@ impl Model {
// milliseconds since January 1, 1970 00:00:00 UTC. // milliseconds since January 1, 1970 00:00:00 UTC.
let milliseconds = get_milliseconds_since_epoch(); let milliseconds = get_milliseconds_since_epoch();
let seconds = milliseconds / 1000; let seconds = milliseconds / 1000;
let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) { let local_time = match DateTime::from_timestamp(seconds, 0) {
Some(dt) => dt, Some(dt) => dt.with_timezone(&self.tz),
None => { None => {
return CalcResult::Error { return CalcResult::Error {
error: Error::ERROR, error: Error::ERROR,
@@ -299,7 +297,6 @@ impl Model {
} }
} }
}; };
let local_time = self.tz.from_utc_datetime(&dt);
// 693_594 is computed as: // 693_594 is computed as:
// NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2 // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
// The 2 days offset is because of Excel 1900 bug // The 2 days offset is because of Excel 1900 bug

View File

@@ -12,7 +12,7 @@ const EPS_LOW: f64 = 1e-6;
// Known values computed with Arb via Nemo.jl in Julia // Known values computed with Arb via Nemo.jl in Julia
// You can also use Mathematica // You can also use Mathematica
/// But please do not use Excel or any other software without arbitrary precision // But please do not use Excel or any other software without arbitrary precision
fn numbers_are_close(a: f64, b: f64) -> bool { fn numbers_are_close(a: f64, b: f64) -> bool {
if a == b { if a == b {

View File

@@ -89,6 +89,9 @@ fn compute_future_value(
if rate == 0.0 { if rate == 0.0 {
return Ok(-pv - pmt * nper); return Ok(-pv - pmt * nper);
} }
if rate == -1.0 && nper < 0.0 {
return Err((Error::DIV, "Divide by zero".to_string()));
}
let rate_nper = (1.0 + rate).powf(nper); let rate_nper = (1.0 + rate).powf(nper);
let fv = if period_start { let fv = if period_start {
@@ -194,16 +197,24 @@ fn compute_ppmt(
// In these formulas the payment (pmt) is normally negative // In these formulas the payment (pmt) is normally negative
impl Model { impl Model {
// FIXME: These three functions (get_array_of_numbers..) need to be refactored fn get_array_of_numbers_generic(
// They are really similar expect for small issues
fn get_array_of_numbers(
&mut self, &mut self,
arg: &Node, arg: &Node,
cell: &CellReferenceIndex, cell: &CellReferenceIndex,
accept_number_node: bool,
handle_empty_cell: impl Fn() -> Result<Option<f64>, CalcResult>,
handle_non_number_cell: impl Fn() -> Result<Option<f64>, CalcResult>,
) -> Result<Vec<f64>, CalcResult> { ) -> Result<Vec<f64>, CalcResult> {
let mut values = Vec::new(); let mut values = Vec::new();
match self.evaluate_node_in_context(arg, *cell) { match self.evaluate_node_in_context(arg, *cell) {
CalcResult::Number(value) => values.push(value), CalcResult::Number(value) if accept_number_node => values.push(value),
CalcResult::Number(_) => {
return Err(CalcResult::new_error(
Error::VALUE,
*cell,
"Expected range of numbers".to_string(),
));
}
CalcResult::Range { left, right } => { CalcResult::Range { left, right } => {
if left.sheet != right.sheet { if left.sheet != right.sheet {
return Err(CalcResult::new_error( return Err(CalcResult::new_error(
@@ -212,6 +223,7 @@ impl Model {
"Ranges are in different sheets".to_string(), "Ranges are in different sheets".to_string(),
)); ));
} }
let sheet = left.sheet;
let row1 = left.row; let row1 = left.row;
let mut row2 = right.row; let mut row2 = right.row;
let column1 = left.column; let column1 = left.column;
@@ -219,32 +231,46 @@ impl Model {
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = self
.workbook .workbook
.worksheet(left.sheet) .worksheet(sheet)
.expect("Sheet expected during evaluation.") .map_err(|_| {
CalcResult::new_error(
Error::ERROR,
*cell,
format!("Invalid worksheet index: '{}'", sheet),
)
})?
.dimension() .dimension()
.max_row; .max_row;
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = self
.workbook .workbook
.worksheet(left.sheet) .worksheet(sheet)
.expect("Sheet expected during evaluation.") .map_err(|_| {
CalcResult::new_error(
Error::ERROR,
*cell,
format!("Invalid worksheet index: '{}'", sheet),
)
})?
.dimension() .dimension()
.max_column; .max_column;
} }
for row in row1..row2 + 1 { for row in row1..=row2 {
for column in column1..(column2 + 1) { for column in column1..=column2 {
match self.evaluate_cell(CellReferenceIndex { let cell_ref = CellReferenceIndex { sheet, row, column };
sheet: left.sheet, match self.evaluate_cell(cell_ref) {
row, CalcResult::Number(value) => values.push(value),
column, error @ CalcResult::Error { .. } => return Err(error),
}) { CalcResult::EmptyCell => {
CalcResult::Number(value) => { if let Some(value) = handle_empty_cell()? {
values.push(value); values.push(value);
} }
error @ CalcResult::Error { .. } => return Err(error), }
_ => { _ => {
// We ignore booleans and strings if let Some(value) = handle_non_number_cell()? {
values.push(value);
}
} }
} }
} }
@@ -252,88 +278,51 @@ impl Model {
} }
error @ CalcResult::Error { .. } => return Err(error), error @ CalcResult::Error { .. } => return Err(error),
_ => { _ => {
// We ignore booleans and strings handle_non_number_cell()?;
}
} }
};
Ok(values) Ok(values)
} }
fn get_array_of_numbers(
&mut self,
arg: &Node,
cell: &CellReferenceIndex,
) -> Result<Vec<f64>, CalcResult> {
self.get_array_of_numbers_generic(
arg,
cell,
true, // accept_number_node
|| Ok(None), // Ignore empty cells
|| Ok(None), // Ignore non-number cells
)
}
fn get_array_of_numbers_xpnv( fn get_array_of_numbers_xpnv(
&mut self, &mut self,
arg: &Node, arg: &Node,
cell: &CellReferenceIndex, cell: &CellReferenceIndex,
error: Error, error: Error,
) -> Result<Vec<f64>, CalcResult> { ) -> Result<Vec<f64>, CalcResult> {
let mut values = Vec::new(); self.get_array_of_numbers_generic(
match self.evaluate_node_in_context(arg, *cell) { arg,
CalcResult::Number(value) => values.push(value), cell,
CalcResult::Range { left, right } => { true, // accept_number_node
if left.sheet != right.sheet { || {
return Err(CalcResult::new_error( Err(CalcResult::new_error(
Error::VALUE,
*cell,
"Ranges are in different sheets".to_string(),
));
}
let row1 = left.row;
let mut row2 = right.row;
let column1 = left.column;
let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW {
row2 = self
.workbook
.worksheet(left.sheet)
.expect("Sheet expected during evaluation.")
.dimension()
.max_row;
}
if column1 == 1 && column2 == LAST_COLUMN {
column2 = self
.workbook
.worksheet(left.sheet)
.expect("Sheet expected during evaluation.")
.dimension()
.max_column;
}
for row in row1..row2 + 1 {
for column in column1..(column2 + 1) {
match self.evaluate_cell(CellReferenceIndex {
sheet: left.sheet,
row,
column,
}) {
CalcResult::Number(value) => {
values.push(value);
}
error @ CalcResult::Error { .. } => return Err(error),
CalcResult::EmptyCell => {
return Err(CalcResult::new_error(
Error::NUM, Error::NUM,
*cell, *cell,
"Expected number".to_string(), "Expected number".to_string(),
)); ))
} },
_ => { || {
return Err(CalcResult::new_error( Err(CalcResult::new_error(
error, error.clone(),
*cell, *cell,
"Expected number".to_string(), "Expected number".to_string(),
)); ))
} },
} )
}
}
}
error @ CalcResult::Error { .. } => return Err(error),
_ => {
return Err(CalcResult::new_error(
error,
*cell,
"Expected number".to_string(),
));
}
};
Ok(values)
} }
fn get_array_of_numbers_xirr( fn get_array_of_numbers_xirr(
@@ -341,69 +330,19 @@ impl Model {
arg: &Node, arg: &Node,
cell: &CellReferenceIndex, cell: &CellReferenceIndex,
) -> Result<Vec<f64>, CalcResult> { ) -> Result<Vec<f64>, CalcResult> {
let mut values = Vec::new(); self.get_array_of_numbers_generic(
match self.evaluate_node_in_context(arg, *cell) { arg,
CalcResult::Range { left, right } => { cell,
if left.sheet != right.sheet { false, // Do not accept a single number node
return Err(CalcResult::new_error( || Ok(Some(0.0)), // Treat empty cells as zero
Error::VALUE, || {
*cell, Err(CalcResult::new_error(
"Ranges are in different sheets".to_string(),
));
}
let row1 = left.row;
let mut row2 = right.row;
let column1 = left.column;
let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW {
row2 = self
.workbook
.worksheet(left.sheet)
.expect("Sheet expected during evaluation.")
.dimension()
.max_row;
}
if column1 == 1 && column2 == LAST_COLUMN {
column2 = self
.workbook
.worksheet(left.sheet)
.expect("Sheet expected during evaluation.")
.dimension()
.max_column;
}
for row in row1..row2 + 1 {
for column in column1..(column2 + 1) {
match self.evaluate_cell(CellReferenceIndex {
sheet: left.sheet,
row,
column,
}) {
CalcResult::Number(value) => {
values.push(value);
}
error @ CalcResult::Error { .. } => return Err(error),
CalcResult::EmptyCell => values.push(0.0),
_ => {
return Err(CalcResult::new_error(
Error::VALUE, Error::VALUE,
*cell, *cell,
"Expected number".to_string(), "Expected number".to_string(),
)); ))
} },
} )
}
}
}
error @ CalcResult::Error { .. } => return Err(error),
_ => {
return Err(CalcResult::new_error(
Error::VALUE,
*cell,
"Expected number".to_string(),
));
}
};
Ok(values)
} }
/// PMT(rate, nper, pv, [fv], [type]) /// PMT(rate, nper, pv, [fv], [type])
@@ -862,20 +801,28 @@ impl Model {
let column1 = left.column; let column1 = left.column;
let mut column2 = right.column; let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
for row in row1..row2 + 1 { for row in row1..row2 + 1 {
for column in column1..(column2 + 1) { for column in column1..(column2 + 1) {
@@ -1393,21 +1340,21 @@ impl Model {
CalcResult::Number(result) CalcResult::Number(result)
} }
/// This next three functions deal with Treasure Bills or T-Bills for short // This next three functions deal with Treasure Bills or T-Bills for short
/// They are zero-coupon that mature in one year or less. // They are zero-coupon that mature in one year or less.
/// Definitions: // Definitions:
/// $r$ be the discount rate // $r$ be the discount rate
/// $v$ the face value of the Bill // $v$ the face value of the Bill
/// $p$ the price of the Bill // $p$ the price of the Bill
/// $d_m$ is the number of days from the settlement to maturity // $d_m$ is the number of days from the settlement to maturity
/// Then: // Then:
/// $$ p = v \times\left(1-\frac{d_m}{r}\right) $$ // $$ p = v \times\left(1-\frac{d_m}{r}\right) $$
/// If d_m is less than 183 days the he Bond Equivalent Yield (BEY, here $y$) is given by: // If d_m is less than 183 days the he Bond Equivalent Yield (BEY, here $y$) is given by:
/// $$ y = \frac{F - B}{M}\times \frac{365}{d_m} = \frac{365\times r}{360-r\times d_m} // $$ y = \frac{F - B}{M}\times \frac{365}{d_m} = \frac{365\times r}{360-r\times d_m}
/// If d_m>= 183 days things are a bit more complicated. // If d_m>= 183 days things are a bit more complicated.
/// Let $d_e = d_m - 365/2$ if $d_m <= 365$ or $d_e = 183$ if $d_m = 366$. // Let $d_e = d_m - 365/2$ if $d_m <= 365$ or $d_e = 183$ if $d_m = 366$.
/// $$ v = p\times \left(1+\frac{y}{2}\right)\left(1+d_e\times\frac{y}{365}\right) $$ // $$ v = p\times \left(1+\frac{y}{2}\right)\left(1+d_e\times\frac{y}{365}\right) $$
/// Together with the previous relation of $p$ and $v$ gives us a quadratic equation for $y$. // Together with the previous relation of $p$ and $v$ gives us a quadratic equation for $y$.
// TBILLEQ(settlement, maturity, discount) // TBILLEQ(settlement, maturity, discount)
pub(crate) fn fn_tbilleq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult { pub(crate) fn fn_tbilleq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {

View File

@@ -165,7 +165,8 @@ impl Model {
message: "argument must be a reference to a single cell".to_string(), message: "argument must be a reference to a single cell".to_string(),
}; };
} }
let is_formula = if let Ok(f) = self.cell_formula(left.sheet, left.row, left.column) { let is_formula = if let Ok(f) = self.get_cell_formula(left.sheet, left.row, left.column)
{
f.is_some() f.is_some()
} else { } else {
false false

View File

@@ -136,6 +136,9 @@ impl Model {
} }
pub(crate) fn fn_or(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult { pub(crate) fn fn_or(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
return CalcResult::new_args_number_error(cell);
}
let mut result = false; let mut result = false;
for arg in args { for arg in args {
match self.evaluate_node_in_context(arg, cell) { match self.evaluate_node_in_context(arg, cell) {

View File

@@ -838,4 +838,43 @@ impl Model {
}; };
CalcResult::Range { left, right } CalcResult::Range { left, right }
} }
pub(crate) fn fn_formulatext(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {
return CalcResult::new_args_number_error(cell);
}
if let CalcResult::Range { left, right } = self.evaluate_node_with_reference(&args[0], cell)
{
if left.sheet != right.sheet {
return CalcResult::Error {
error: Error::ERROR,
origin: cell,
message: "3D ranges not supported".to_string(),
};
}
if left.row != right.row || left.column != right.column {
// FIXME: Implicit intersection or dynamic arrays
return CalcResult::Error {
error: Error::ERROR,
origin: cell,
message: "argument must be a reference to a single cell".to_string(),
};
}
if let Ok(Some(f)) = self.get_cell_formula(left.sheet, left.row, left.column) {
CalcResult::String(f)
} else {
CalcResult::Error {
error: Error::NA,
origin: cell,
message: "Reference does not have a formula".to_string(),
}
}
} else {
CalcResult::Error {
error: Error::ERROR,
origin: cell,
message: "Argument must be a reference".to_string(),
}
}
}
} }

View File

@@ -128,20 +128,28 @@ impl Model {
let column1 = left.column; let column1 = left.column;
let mut column2 = right.column; let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
for row in row1..row2 + 1 { for row in row1..row2 + 1 {
for column in column1..(column2 + 1) { for column in column1..(column2 + 1) {
@@ -195,20 +203,28 @@ impl Model {
let column1 = left.column; let column1 = left.column;
let mut column2 = right.column; let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
for row in row1..row2 + 1 { for row in row1..row2 + 1 {
for column in column1..(column2 + 1) { for column in column1..(column2 + 1) {

View File

@@ -1,4 +1,5 @@
use core::fmt; use core::fmt;
use std::array::IntoIter;
use crate::{ use crate::{
calc_result::CalcResult, calc_result::CalcResult,
@@ -74,6 +75,7 @@ pub enum Function {
// Information // Information
ErrorType, ErrorType,
Formulatext,
Isblank, Isblank,
Iserr, Iserr,
Iserror, Iserror,
@@ -121,6 +123,7 @@ pub enum Function {
Textbefore, Textbefore,
Textjoin, Textjoin,
Trim, Trim,
Unicode,
Upper, Upper,
Value, Value,
Valuetotext, Valuetotext,
@@ -137,6 +140,7 @@ pub enum Function {
Countifs, Countifs,
Maxifs, Maxifs,
Minifs, Minifs,
Geomean,
// Date and time // Date and time
Date, Date,
@@ -244,6 +248,209 @@ pub enum Function {
Subtotal, Subtotal,
} }
impl Function {
pub fn into_iter() -> IntoIter<Function, 195> {
[
Function::And,
Function::False,
Function::If,
Function::Iferror,
Function::Ifna,
Function::Ifs,
Function::Not,
Function::Or,
Function::Switch,
Function::True,
Function::Xor,
Function::Sin,
Function::Cos,
Function::Tan,
Function::Asin,
Function::Acos,
Function::Atan,
Function::Sinh,
Function::Cosh,
Function::Tanh,
Function::Asinh,
Function::Acosh,
Function::Atanh,
Function::Abs,
Function::Pi,
Function::Sqrt,
Function::Sqrtpi,
Function::Atan2,
Function::Power,
Function::Max,
Function::Min,
Function::Product,
Function::Rand,
Function::Randbetween,
Function::Round,
Function::Rounddown,
Function::Roundup,
Function::Sum,
Function::Sumif,
Function::Sumifs,
Function::Choose,
Function::Column,
Function::Columns,
Function::Index,
Function::Indirect,
Function::Hlookup,
Function::Lookup,
Function::Match,
Function::Offset,
Function::Row,
Function::Rows,
Function::Vlookup,
Function::Xlookup,
Function::Concatenate,
Function::Exact,
Function::Value,
Function::T,
Function::Valuetotext,
Function::Concat,
Function::Find,
Function::Left,
Function::Len,
Function::Lower,
Function::Mid,
Function::Right,
Function::Search,
Function::Text,
Function::Trim,
Function::Unicode,
Function::Upper,
Function::Isnumber,
Function::Isnontext,
Function::Istext,
Function::Islogical,
Function::Isblank,
Function::Iserr,
Function::Iserror,
Function::Isna,
Function::Na,
Function::Isref,
Function::Isodd,
Function::Iseven,
Function::ErrorType,
Function::Formulatext,
Function::Isformula,
Function::Type,
Function::Sheet,
Function::Average,
Function::Averagea,
Function::Averageif,
Function::Averageifs,
Function::Count,
Function::Counta,
Function::Countblank,
Function::Countif,
Function::Countifs,
Function::Maxifs,
Function::Minifs,
Function::Geomean,
Function::Year,
Function::Day,
Function::Month,
Function::Eomonth,
Function::Date,
Function::Edate,
Function::Today,
Function::Now,
Function::Pmt,
Function::Pv,
Function::Rate,
Function::Nper,
Function::Fv,
Function::Ppmt,
Function::Ipmt,
Function::Npv,
Function::Mirr,
Function::Irr,
Function::Xirr,
Function::Xnpv,
Function::Rept,
Function::Textafter,
Function::Textbefore,
Function::Textjoin,
Function::Substitute,
Function::Ispmt,
Function::Rri,
Function::Sln,
Function::Syd,
Function::Nominal,
Function::Effect,
Function::Pduration,
Function::Tbillyield,
Function::Tbillprice,
Function::Tbilleq,
Function::Dollarde,
Function::Dollarfr,
Function::Ddb,
Function::Db,
Function::Cumprinc,
Function::Cumipmt,
Function::Besseli,
Function::Besselj,
Function::Besselk,
Function::Bessely,
Function::Erf,
Function::ErfPrecise,
Function::Erfc,
Function::ErfcPrecise,
Function::Bin2dec,
Function::Bin2hex,
Function::Bin2oct,
Function::Dec2Bin,
Function::Dec2hex,
Function::Dec2oct,
Function::Hex2bin,
Function::Hex2dec,
Function::Hex2oct,
Function::Oct2bin,
Function::Oct2dec,
Function::Oct2hex,
Function::Bitand,
Function::Bitlshift,
Function::Bitor,
Function::Bitrshift,
Function::Bitxor,
Function::Complex,
Function::Imabs,
Function::Imaginary,
Function::Imargument,
Function::Imconjugate,
Function::Imcos,
Function::Imcosh,
Function::Imcot,
Function::Imcsc,
Function::Imcsch,
Function::Imdiv,
Function::Imexp,
Function::Imln,
Function::Imlog10,
Function::Imlog2,
Function::Impower,
Function::Improduct,
Function::Imreal,
Function::Imsec,
Function::Imsech,
Function::Imsin,
Function::Imsinh,
Function::Imsqrt,
Function::Imsub,
Function::Imsum,
Function::Imtan,
Function::Convert,
Function::Delta,
Function::Gestep,
Function::Subtotal,
]
.into_iter()
}
}
impl Function { impl Function {
/// Some functions in Excel like CONCAT are stringified as `_xlfn.CONCAT`. /// Some functions in Excel like CONCAT are stringified as `_xlfn.CONCAT`.
pub fn to_xlsx_string(&self) -> String { pub fn to_xlsx_string(&self) -> String {
@@ -259,6 +466,7 @@ impl Function {
Function::Textbefore => "_xlfn.TEXTBEFORE".to_string(), Function::Textbefore => "_xlfn.TEXTBEFORE".to_string(),
Function::Textafter => "_xlfn.TEXTAFTER".to_string(), Function::Textafter => "_xlfn.TEXTAFTER".to_string(),
Function::Textjoin => "_xlfn.TEXTJOIN".to_string(), Function::Textjoin => "_xlfn.TEXTJOIN".to_string(),
Function::Unicode => "_xlfn.UNICODE".to_string(),
Function::Rri => "_xlfn.RRI".to_string(), Function::Rri => "_xlfn.RRI".to_string(),
Function::Pduration => "_xlfn.PDURATION".to_string(), Function::Pduration => "_xlfn.PDURATION".to_string(),
Function::Bitand => "_xlfn.BITAND".to_string(), Function::Bitand => "_xlfn.BITAND".to_string(),
@@ -278,6 +486,7 @@ impl Function {
Function::Valuetotext => "_xlfn.VALUETOTEXT".to_string(), Function::Valuetotext => "_xlfn.VALUETOTEXT".to_string(),
Function::Isformula => "_xlfn.ISFORMULA".to_string(), Function::Isformula => "_xlfn.ISFORMULA".to_string(),
Function::Sheet => "_xlfn.SHEET".to_string(), Function::Sheet => "_xlfn.SHEET".to_string(),
Function::Formulatext => "_xlfn.FORMULATEXT".to_string(),
_ => self.to_string(), _ => self.to_string(),
} }
} }
@@ -366,6 +575,7 @@ impl Function {
"SEARCH" => Some(Function::Search), "SEARCH" => Some(Function::Search),
"TEXT" => Some(Function::Text), "TEXT" => Some(Function::Text),
"TRIM" => Some(Function::Trim), "TRIM" => Some(Function::Trim),
"UNICODE" | "_XLFN.UNICODE" => Some(Function::Unicode),
"UPPER" => Some(Function::Upper), "UPPER" => Some(Function::Upper),
"REPT" => Some(Function::Rept), "REPT" => Some(Function::Rept),
@@ -387,6 +597,7 @@ impl Function {
"ISODD" => Some(Function::Isodd), "ISODD" => Some(Function::Isodd),
"ISEVEN" => Some(Function::Iseven), "ISEVEN" => Some(Function::Iseven),
"ERROR.TYPE" => Some(Function::ErrorType), "ERROR.TYPE" => Some(Function::ErrorType),
"FORMULATEXT" | "_XLFN.FORMULATEXT" => Some(Function::Formulatext),
"ISFORMULA" | "_XLFN.ISFORMULA" => Some(Function::Isformula), "ISFORMULA" | "_XLFN.ISFORMULA" => Some(Function::Isformula),
"TYPE" => Some(Function::Type), "TYPE" => Some(Function::Type),
"SHEET" | "_XLFN.SHEET" => Some(Function::Sheet), "SHEET" | "_XLFN.SHEET" => Some(Function::Sheet),
@@ -402,6 +613,7 @@ impl Function {
"COUNTIFS" => Some(Function::Countifs), "COUNTIFS" => Some(Function::Countifs),
"MAXIFS" | "_XLFN.MAXIFS" => Some(Function::Maxifs), "MAXIFS" | "_XLFN.MAXIFS" => Some(Function::Maxifs),
"MINIFS" | "_XLFN.MINIFS" => Some(Function::Minifs), "MINIFS" | "_XLFN.MINIFS" => Some(Function::Minifs),
"GEOMEAN" => Some(Function::Geomean),
// Date and Time // Date and Time
"YEAR" => Some(Function::Year), "YEAR" => Some(Function::Year),
"DAY" => Some(Function::Day), "DAY" => Some(Function::Day),
@@ -578,6 +790,7 @@ impl fmt::Display for Function {
Function::Search => write!(f, "SEARCH"), Function::Search => write!(f, "SEARCH"),
Function::Text => write!(f, "TEXT"), Function::Text => write!(f, "TEXT"),
Function::Trim => write!(f, "TRIM"), Function::Trim => write!(f, "TRIM"),
Function::Unicode => write!(f, "UNICODE"),
Function::Upper => write!(f, "UPPER"), Function::Upper => write!(f, "UPPER"),
Function::Isnumber => write!(f, "ISNUMBER"), Function::Isnumber => write!(f, "ISNUMBER"),
Function::Isnontext => write!(f, "ISNONTEXT"), Function::Isnontext => write!(f, "ISNONTEXT"),
@@ -592,6 +805,7 @@ impl fmt::Display for Function {
Function::Isodd => write!(f, "ISODD"), Function::Isodd => write!(f, "ISODD"),
Function::Iseven => write!(f, "ISEVEN"), Function::Iseven => write!(f, "ISEVEN"),
Function::ErrorType => write!(f, "ERROR.TYPE"), Function::ErrorType => write!(f, "ERROR.TYPE"),
Function::Formulatext => write!(f, "FORMULATEXT"),
Function::Isformula => write!(f, "ISFORMULA"), Function::Isformula => write!(f, "ISFORMULA"),
Function::Type => write!(f, "TYPE"), Function::Type => write!(f, "TYPE"),
Function::Sheet => write!(f, "SHEET"), Function::Sheet => write!(f, "SHEET"),
@@ -607,6 +821,7 @@ impl fmt::Display for Function {
Function::Countifs => write!(f, "COUNTIFS"), Function::Countifs => write!(f, "COUNTIFS"),
Function::Maxifs => write!(f, "MAXIFS"), Function::Maxifs => write!(f, "MAXIFS"),
Function::Minifs => write!(f, "MINIFS"), Function::Minifs => write!(f, "MINIFS"),
Function::Geomean => write!(f, "GEOMEAN"),
Function::Year => write!(f, "YEAR"), Function::Year => write!(f, "YEAR"),
Function::Day => write!(f, "DAY"), Function::Day => write!(f, "DAY"),
Function::Month => write!(f, "MONTH"), Function::Month => write!(f, "MONTH"),
@@ -708,7 +923,23 @@ impl fmt::Display for Function {
} }
} }
/// Documentation for one function
pub struct Documentation {
pub name: String,
}
impl Model { impl Model {
/// Produces documentation for all implemented functions
pub fn documentation() -> Vec<Documentation> {
let mut doc = Vec::new();
for function in Function::into_iter() {
doc.push(Documentation {
name: function.to_string(),
});
}
doc
}
pub(crate) fn evaluate_function( pub(crate) fn evaluate_function(
&mut self, &mut self,
kind: &Function, kind: &Function,
@@ -795,6 +1026,7 @@ impl Model {
Function::Search => self.fn_search(args, cell), Function::Search => self.fn_search(args, cell),
Function::Text => self.fn_text(args, cell), Function::Text => self.fn_text(args, cell),
Function::Trim => self.fn_trim(args, cell), Function::Trim => self.fn_trim(args, cell),
Function::Unicode => self.fn_unicode(args, cell),
Function::Upper => self.fn_upper(args, cell), Function::Upper => self.fn_upper(args, cell),
// Information // Information
Function::Isnumber => self.fn_isnumber(args, cell), Function::Isnumber => self.fn_isnumber(args, cell),
@@ -810,6 +1042,7 @@ impl Model {
Function::Isodd => self.fn_isodd(args, cell), Function::Isodd => self.fn_isodd(args, cell),
Function::Iseven => self.fn_iseven(args, cell), Function::Iseven => self.fn_iseven(args, cell),
Function::ErrorType => self.fn_errortype(args, cell), Function::ErrorType => self.fn_errortype(args, cell),
Function::Formulatext => self.fn_formulatext(args, cell),
Function::Isformula => self.fn_isformula(args, cell), Function::Isformula => self.fn_isformula(args, cell),
Function::Type => self.fn_type(args, cell), Function::Type => self.fn_type(args, cell),
Function::Sheet => self.fn_sheet(args, cell), Function::Sheet => self.fn_sheet(args, cell),
@@ -825,6 +1058,7 @@ impl Model {
Function::Countifs => self.fn_countifs(args, cell), Function::Countifs => self.fn_countifs(args, cell),
Function::Maxifs => self.fn_maxifs(args, cell), Function::Maxifs => self.fn_maxifs(args, cell),
Function::Minifs => self.fn_minifs(args, cell), Function::Minifs => self.fn_minifs(args, cell),
Function::Geomean => self.fn_geomean(args, cell),
// Date and Time // Date and Time
Function::Year => self.fn_year(args, cell), Function::Year => self.fn_year(args, cell),
Function::Day => self.fn_day(args, cell), Function::Day => self.fn_day(args, cell),
@@ -928,3 +1162,67 @@ impl Model {
} }
} }
} }
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use std::{
fs::File,
io::{BufRead, BufReader},
};
use crate::functions::Function;
#[test]
fn function_iterator() {
// This checks that the number of functions in the enum is the same
// as the number of functions in the Iterator.
// This is tricky. In Rust we cannot loop over all the members of an enum.
// There are alternatives like using an external crate like strum.
// But I am not in the mood for that.
// What we do here is read this file , extract the functions in the enum
// and check they are the same as in the iterator
let file = File::open("src/functions/mod.rs").unwrap();
let reader = BufReader::new(file);
let mut start = false;
let mut list = Vec::new();
for line in reader.lines() {
let text = line.unwrap();
let text = text.trim().trim_end_matches(',');
if text == "pub enum Function {" {
start = true;
continue;
}
if start {
if text == "}" {
break;
}
if text.starts_with("//") {
// skip comments
continue;
}
if text.is_empty() {
// skip empty lines
continue;
}
list.push(text.to_owned());
}
}
// We make a list with their functions names, but we escape ".": ERROR.TYPE => ERRORTYPE
let iter_list = Function::into_iter()
.map(|f| format!("{}", f).replace('.', ""))
.collect::<Vec<_>>();
let len = iter_list.len();
assert_eq!(list.len(), len);
// We still need to check there are no duplicates. This will fail if a function in iter_list
// is included twice and one is missing
for function in list {
assert!(iter_list.contains(&function.to_uppercase()));
}
}
}

View File

@@ -381,11 +381,16 @@ impl Model {
let right_row = first_range.right.row; let right_row = first_range.right.row;
let right_column = first_range.right.column; let right_column = first_range.right.column;
let dimension = self let dimension = match self.workbook.worksheet(first_range.left.sheet) {
.workbook Ok(s) => s.dimension(),
.worksheet(first_range.left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension(); Error::ERROR,
cell,
format!("Invalid worksheet index: '{}'", first_range.left.sheet),
)
}
};
let max_row = dimension.max_row; let max_row = dimension.max_row;
let max_column = dimension.max_column; let max_column = dimension.max_column;
@@ -526,20 +531,28 @@ impl Model {
let mut right_column = sum_range.right.column; let mut right_column = sum_range.right.column;
if left_row == 1 && right_row == LAST_ROW { if left_row == 1 && right_row == LAST_ROW {
right_row = self right_row = match self.workbook.worksheet(sum_range.left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(sum_range.left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return Err(CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
));
}
};
} }
if left_column == 1 && right_column == LAST_COLUMN { if left_column == 1 && right_column == LAST_COLUMN {
right_column = self right_column = match self.workbook.worksheet(sum_range.left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(sum_range.left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return Err(CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
));
}
};
} }
for row in left_row..right_row + 1 { for row in left_row..right_row + 1 {
@@ -622,4 +635,85 @@ impl Model {
} }
CalcResult::Number(max) CalcResult::Number(max)
} }
pub(crate) fn fn_geomean(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
return CalcResult::new_args_number_error(cell);
}
let mut count = 0.0;
let mut product = 1.0;
for arg in args {
match self.evaluate_node_in_context(arg, cell) {
CalcResult::Number(value) => {
count += 1.0;
product *= value;
}
CalcResult::Boolean(b) => {
if let Node::ReferenceKind { .. } = arg {
} else {
product *= if b { 1.0 } else { 0.0 };
count += 1.0;
}
}
CalcResult::Range { left, right } => {
if left.sheet != right.sheet {
return CalcResult::new_error(
Error::VALUE,
cell,
"Ranges are in different sheets".to_string(),
);
}
for row in left.row..(right.row + 1) {
for column in left.column..(right.column + 1) {
match self.evaluate_cell(CellReferenceIndex {
sheet: left.sheet,
row,
column,
}) {
CalcResult::Number(value) => {
count += 1.0;
product *= value;
}
error @ CalcResult::Error { .. } => return error,
CalcResult::Range { .. } => {
return CalcResult::new_error(
Error::ERROR,
cell,
"Unexpected Range".to_string(),
);
}
_ => {}
}
}
}
}
error @ CalcResult::Error { .. } => return error,
CalcResult::String(s) => {
if let Node::ReferenceKind { .. } = arg {
// Do nothing
} else if let Ok(t) = s.parse::<f64>() {
product *= t;
count += 1.0;
} else {
return CalcResult::Error {
error: Error::VALUE,
origin: cell,
message: "Argument cannot be cast into number".to_string(),
};
}
}
_ => {
// Ignore everything else
}
};
}
if count == 0.0 {
return CalcResult::Error {
error: Error::DIV,
origin: cell,
message: "Division by Zero".to_string(),
};
}
CalcResult::Number(product.powf(1.0 / count))
}
} }

View File

@@ -53,8 +53,13 @@ impl Model {
false false
} }
fn cell_hidden_status(&self, sheet_index: u32, row: i32, column: i32) -> CellTableStatus { fn cell_hidden_status(
let worksheet = self.workbook.worksheet(sheet_index).expect(""); &self,
sheet_index: u32,
row: i32,
column: i32,
) -> Result<CellTableStatus, String> {
let worksheet = self.workbook.worksheet(sheet_index)?;
let mut hidden = false; let mut hidden = false;
for row_style in &worksheet.rows { for row_style in &worksheet.rows {
if row_style.r == row { if row_style.r == row {
@@ -63,13 +68,13 @@ impl Model {
} }
} }
if !hidden { if !hidden {
return CellTableStatus::Normal; return Ok(CellTableStatus::Normal);
} }
// The row is hidden we need to know if the table has filters // The row is hidden we need to know if the table has filters
if self.get_table_for_cell(sheet_index, row, column) { if self.get_table_for_cell(sheet_index, row, column) {
CellTableStatus::Filtered Ok(CellTableStatus::Filtered)
} else { } else {
CellTableStatus::Hidden Ok(CellTableStatus::Hidden)
} }
} }
@@ -143,7 +148,11 @@ impl Model {
let column2 = right.column; let column2 = right.column;
for row in row1..=row2 { for row in row1..=row2 {
let cell_status = self.cell_hidden_status(left.sheet, row, column1); let cell_status = self
.cell_hidden_status(left.sheet, row, column1)
.map_err(|message| {
CalcResult::new_error(Error::ERROR, cell, message)
})?;
if cell_status == CellTableStatus::Filtered { if cell_status == CellTableStatus::Filtered {
continue; continue;
} }
@@ -380,7 +389,14 @@ impl Model {
let column2 = right.column; let column2 = right.column;
for row in row1..=row2 { for row in row1..=row2 {
let cell_status = self.cell_hidden_status(left.sheet, row, column1); let cell_status = match self
.cell_hidden_status(left.sheet, row, column1)
{
Ok(s) => s,
Err(message) => {
return CalcResult::new_error(Error::ERROR, cell, message);
}
};
if cell_status == CellTableStatus::Filtered { if cell_status == CellTableStatus::Filtered {
continue; continue;
} }
@@ -449,7 +465,14 @@ impl Model {
let column2 = right.column; let column2 = right.column;
for row in row1..=row2 { for row in row1..=row2 {
let cell_status = self.cell_hidden_status(left.sheet, row, column1); let cell_status = match self
.cell_hidden_status(left.sheet, row, column1)
{
Ok(s) => s,
Err(message) => {
return CalcResult::new_error(Error::ERROR, cell, message);
}
};
if cell_status == CellTableStatus::Filtered { if cell_status == CellTableStatus::Filtered {
continue; continue;
} }

View File

@@ -342,6 +342,53 @@ impl Model {
CalcResult::new_args_number_error(cell) CalcResult::new_args_number_error(cell)
} }
pub(crate) fn fn_unicode(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() == 1 {
let s = match self.evaluate_node_in_context(&args[0], cell) {
CalcResult::Number(v) => format!("{}", v),
CalcResult::String(v) => v,
CalcResult::Boolean(b) => {
if b {
"TRUE".to_string()
} else {
"FALSE".to_string()
}
}
error @ CalcResult::Error { .. } => return error,
CalcResult::Range { .. } => {
// Implicit Intersection not implemented
return CalcResult::Error {
error: Error::NIMPL,
origin: cell,
message: "Implicit Intersection not implemented".to_string(),
};
}
CalcResult::EmptyCell | CalcResult::EmptyArg => {
return CalcResult::Error {
error: Error::VALUE,
origin: cell,
message: "Empty cell".to_string(),
}
}
};
match s.chars().next() {
Some(c) => {
let unicode_number = c as u32;
return CalcResult::Number(unicode_number as f64);
}
None => {
return CalcResult::Error {
error: Error::VALUE,
origin: cell,
message: "Empty cell".to_string(),
};
}
}
}
CalcResult::new_args_number_error(cell)
}
pub(crate) fn fn_upper(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult { pub(crate) fn fn_upper(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() == 1 { if args.len() == 1 {
let s = match self.evaluate_node_in_context(&args[0], cell) { let s = match self.evaluate_node_in_context(&args[0], cell) {
@@ -503,7 +550,7 @@ impl Model {
} }
result.push(ch); result.push(ch);
} }
return CalcResult::String(result.chars().rev().collect::<String>()); CalcResult::String(result.chars().rev().collect::<String>())
} }
pub(crate) fn fn_mid(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult { pub(crate) fn fn_mid(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
@@ -888,20 +935,28 @@ impl Model {
let column1 = left.column; let column1 = left.column;
let mut column2 = right.column; let mut column2 = right.column;
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
for row in row1..row2 + 1 { for row in row1..row2 + 1 {
for column in column1..(column2 + 1) { for column in column1..(column2 + 1) {

View File

@@ -1,4 +1,5 @@
use regex::{escape, Regex}; #[cfg(feature = "use_regex_lite")]
use regex_lite as regex;
use crate::{calc_result::CalcResult, expressions::token::is_english_error_string}; use crate::{calc_result::CalcResult, expressions::token::is_english_error_string};
@@ -25,9 +26,9 @@ pub(crate) fn values_are_equal(left: &CalcResult, right: &CalcResult) -> bool {
} }
} }
/// In Excel there are two ways of comparing cell values. // In Excel there are two ways of comparing cell values.
/// The old school comparison valid in formulas like D3 < D4 or HLOOKUP,... cast empty cells into empty strings or 0 // The old school comparison valid in formulas like D3 < D4 or HLOOKUP,... cast empty cells into empty strings or 0
/// For the new formulas like XLOOKUP or SORT an empty cell is always larger than anything else. // For the new formulas like XLOOKUP or SORT an empty cell is always larger than anything else.
// ..., -2, -1, 0, 1, 2, ..., A-Z, FALSE, TRUE; // ..., -2, -1, 0, 1, 2, ..., A-Z, FALSE, TRUE;
pub(crate) fn compare_values(left: &CalcResult, right: &CalcResult) -> i32 { pub(crate) fn compare_values(left: &CalcResult, right: &CalcResult) -> i32 {
@@ -86,7 +87,7 @@ pub(crate) fn from_wildcard_to_regex(
exact: bool, exact: bool,
) -> Result<regex::Regex, regex::Error> { ) -> Result<regex::Regex, regex::Error> {
// 1. Escape all // 1. Escape all
let reg = &escape(wildcard); let reg = &regex::escape(wildcard);
// 2. We convert the escaped '?' into '.' (matches a single character) // 2. We convert the escaped '?' into '.' (matches a single character)
let reg = &reg.replace("\\?", "."); let reg = &reg.replace("\\?", ".");
@@ -109,13 +110,13 @@ pub(crate) fn from_wildcard_to_regex(
// And we have a valid Perl regex! (As Kim Kardashian said before me: "I know, right?") // And we have a valid Perl regex! (As Kim Kardashian said before me: "I know, right?")
if exact { if exact {
return Regex::new(&format!("^{}$", reg)); return regex::Regex::new(&format!("^{}$", reg));
} }
Regex::new(reg) regex::Regex::new(reg)
} }
/// NUMBERS /// // NUMBERS ///
///*********/// //*********///
// It could be either the number or a string representation of the number // It could be either the number or a string representation of the number
// In the rest of the cases calc_result needs to be a number (cannot be the string "23", for instance) // In the rest of the cases calc_result needs to be a number (cannot be the string "23", for instance)
@@ -180,8 +181,8 @@ fn result_is_not_equal_to_number(calc_result: &CalcResult, target: f64) -> bool
} }
} }
/// BOOLEANS /// // BOOLEANS ///
///**********/// //**********///
// Booleans have to be "exactly" equal // Booleans have to be "exactly" equal
fn result_is_equal_to_bool(calc_result: &CalcResult, target: bool) -> bool { fn result_is_equal_to_bool(calc_result: &CalcResult, target: bool) -> bool {
@@ -198,12 +199,12 @@ fn result_is_not_equal_to_bool(calc_result: &CalcResult, target: bool) -> bool {
} }
} }
/// STRINGS /// // STRINGS ///
///*********/// //*********///
/// Note that strings are case insensitive. `target` must always be lower case. // Note that strings are case insensitive. `target` must always be lower case.
pub(crate) fn result_matches_regex(calc_result: &CalcResult, reg: &Regex) -> bool { pub(crate) fn result_matches_regex(calc_result: &CalcResult, reg: &regex::Regex) -> bool {
match calc_result { match calc_result {
CalcResult::String(s) => reg.is_match(&s.to_lowercase()), CalcResult::String(s) => reg.is_match(&s.to_lowercase()),
_ => false, _ => false,
@@ -269,8 +270,8 @@ fn result_is_greater_or_equal_than_string(calc_result: &CalcResult, target: &str
} }
} }
/// ERRORS /// // ERRORS ///
///********/// //********///
fn result_is_equal_to_error(calc_result: &CalcResult, target: &str) -> bool { fn result_is_equal_to_error(calc_result: &CalcResult, target: &str) -> bool {
match calc_result { match calc_result {
@@ -286,8 +287,8 @@ fn result_is_not_equal_to_error(calc_result: &CalcResult, target: &str) -> bool
} }
} }
/// EMPTY /// // EMPTY ///
///*******/// //*******///
// Note that these two are not inverse of each other. // Note that these two are not inverse of each other.
// In particular, you can never match an empty cell. // In particular, you can never match an empty cell.

View File

@@ -251,20 +251,28 @@ impl Model {
let column1 = left.column; let column1 = left.column;
if row1 == 1 && row2 == LAST_ROW { if row1 == 1 && row2 == LAST_ROW {
row2 = self row2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_row,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_row; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
if column1 == 1 && column2 == LAST_COLUMN { if column1 == 1 && column2 == LAST_COLUMN {
column2 = self column2 = match self.workbook.worksheet(left.sheet) {
.workbook Ok(s) => s.dimension().max_column,
.worksheet(left.sheet) Err(_) => {
.expect("Sheet expected during evaluation.") return CalcResult::new_error(
.dimension() Error::ERROR,
.max_column; cell,
format!("Invalid worksheet index: '{}'", left.sheet),
);
}
};
} }
let left = CellReferenceIndex { let left = CellReferenceIndex {
sheet: left.sheet, sheet: left.sheet,

View File

@@ -0,0 +1 @@
PfrendeesD<>VRAITRUEWAHRVERDADEROTVFAUXFALSEFALSCHFALSOUw#REF!#REF!#BEZUG!#¡REF!e<>#NOM?#NAME?#NAME?#¿NOMBRE?x<>#VALEUR!#VALUE!#WERT!#¡VALOR!w<>#DIV/0!#DIV/0!#DIV/0!#¡DIV/0!<04>#N/A#N/A#NV#N/AXv#NOMBRE!#NUM!#ZAHL!#¡NUM!<02><>#N/IMPL!#N/IMPL!#N/IMPL!#N/IMPL!w{#SPILL!#SPILL!#ÜBERLAUF!#SPILL!ff#CALC!#CALC!#CALC!#CALC!ff#CIRC!#CIRC!#CIRC!#CIRC!ww#ERROR!#ERROR!#ERROR!#ERROR!ff#NULL!#NULL!#NULL!#NULL!

View File

@@ -1,20 +1,17 @@
use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(Serialize, Deserialize, Clone)] use bitcode::{Decode, Encode};
use once_cell::sync::Lazy;
#[derive(Encode, Decode, Clone)]
pub struct Booleans { pub struct Booleans {
#[serde(rename = "true")] pub r#true: String,
pub true_value: String, pub r#false: String,
#[serde(rename = "false")]
pub false_value: String,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct Errors { pub struct Errors {
#[serde(rename = "ref")] pub r#ref: String,
pub ref_value: String,
pub name: String, pub name: String,
pub value: String, pub value: String,
pub div: String, pub div: String,
@@ -28,14 +25,15 @@ pub struct Errors {
pub null: String, pub null: String,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct Language { pub struct Language {
pub booleans: Booleans, pub booleans: Booleans,
pub errors: Errors, pub errors: Errors,
} }
#[allow(clippy::expect_used)]
static LANGUAGES: Lazy<HashMap<String, Language>> = Lazy::new(|| { static LANGUAGES: Lazy<HashMap<String, Language>> = Lazy::new(|| {
serde_json::from_str(include_str!("language.json")).expect("Failed parsing language file") bitcode::decode(include_bytes!("language.bin")).expect("Failed parsing language file")
}); });
pub fn get_language(id: &str) -> Result<&Language, String> { pub fn get_language(id: &str) -> Result<&Language, String> {

View File

@@ -8,7 +8,7 @@
//! //!
//! ```toml //! ```toml
//! [dependencies] //! [dependencies]
//! ironcalc_base = { git = "https://github.com/ironcalc/IronCalc", version = "0.1"} //! ironcalc_base = { git = "https://github.com/ironcalc/IronCalc" }
//! ``` //! ```
//! //!
//! <small> until version 0.5.0 you should use the git dependencies as stated </small> //! <small> until version 0.5.0 you should use the git dependencies as stated </small>
@@ -31,23 +31,21 @@ pub mod expressions;
pub mod formatter; pub mod formatter;
pub mod language; pub mod language;
pub mod locale; pub mod locale;
pub mod model;
pub mod new_empty; pub mod new_empty;
pub mod number_format; pub mod number_format;
pub mod types; pub mod types;
pub mod worksheet; pub mod worksheet;
mod functions;
mod actions; mod actions;
mod cast; mod cast;
mod constants; mod constants;
mod styles;
mod diffs; mod diffs;
mod functions;
mod implicit_intersection; mod implicit_intersection;
mod model;
mod styles;
mod units; mod units;
mod user_model;
mod utils; mod utils;
mod workbook; mod workbook;
@@ -56,3 +54,9 @@ mod test;
#[cfg(test)] #[cfg(test)]
pub mod mock_time; pub mod mock_time;
pub use model::get_milliseconds_since_epoch;
pub use model::Model;
pub use user_model::BorderArea;
pub use user_model::ClipboardData;
pub use user_model::UserModel;

BIN
base/src/locale/locales.bin Normal file

Binary file not shown.

View File

@@ -1,32 +1,29 @@
use bitcode::{Decode, Encode};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct Locale { pub struct Locale {
pub dates: Dates, pub dates: Dates,
pub numbers: NumbersProperties, pub numbers: NumbersProperties,
pub currency: Currency, pub currency: Currency,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct Currency { pub struct Currency {
pub iso: String, pub iso: String,
pub symbol: String, pub symbol: String,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct NumbersProperties { pub struct NumbersProperties {
#[serde(rename = "symbols-numberSystem-latn")]
pub symbols: NumbersSymbols, pub symbols: NumbersSymbols,
#[serde(rename = "decimalFormats-numberSystem-latn")]
pub decimal_formats: DecimalFormats, pub decimal_formats: DecimalFormats,
#[serde(rename = "currencyFormats-numberSystem-latn")]
pub currency_formats: CurrencyFormats, pub currency_formats: CurrencyFormats,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct Dates { pub struct Dates {
pub day_names: Vec<String>, pub day_names: Vec<String>,
pub day_names_short: Vec<String>, pub day_names_short: Vec<String>,
@@ -35,8 +32,7 @@ pub struct Dates {
pub months_letter: Vec<String>, pub months_letter: Vec<String>,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
#[serde(rename_all = "camelCase")]
pub struct NumbersSymbols { pub struct NumbersSymbols {
pub decimal: String, pub decimal: String,
pub group: String, pub group: String,
@@ -54,40 +50,27 @@ pub struct NumbersSymbols {
} }
// See: https://cldr.unicode.org/translation/number-currency-formats/number-and-currency-patterns // See: https://cldr.unicode.org/translation/number-currency-formats/number-and-currency-patterns
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
pub struct CurrencyFormats { pub struct CurrencyFormats {
pub standard: String, pub standard: String,
#[serde(rename = "standard-alphaNextToNumber")]
#[serde(skip_serializing_if = "Option::is_none")]
pub standard_alpha_next_to_number: Option<String>, pub standard_alpha_next_to_number: Option<String>,
#[serde(rename = "standard-noCurrency")]
pub standard_no_currency: String, pub standard_no_currency: String,
pub accounting: String, pub accounting: String,
#[serde(rename = "accounting-alphaNextToNumber")]
#[serde(skip_serializing_if = "Option::is_none")]
pub accounting_alpha_next_to_number: Option<String>, pub accounting_alpha_next_to_number: Option<String>,
#[serde(rename = "accounting-noCurrency")]
pub accounting_no_currency: String, pub accounting_no_currency: String,
} }
#[derive(Serialize, Deserialize, Clone)] #[derive(Encode, Decode, Clone)]
#[serde(rename_all = "camelCase")]
pub struct DecimalFormats { pub struct DecimalFormats {
pub standard: String, pub standard: String,
} }
static LOCALES: Lazy<HashMap<String, Locale>> = Lazy::new(|| { #[allow(clippy::expect_used)]
serde_json::from_str(include_str!("locales.json")).expect("Failed parsing locale") static LOCALES: Lazy<HashMap<String, Locale>> =
}); Lazy::new(|| bitcode::decode(include_bytes!("locales.bin")).expect("Failed parsing locale"));
pub fn get_locale(_id: &str) -> Result<&Locale, String> { pub fn get_locale(id: &str) -> Result<&Locale, String> {
// TODO: pass the locale once we implement locales in Rust // TODO: pass the locale once we implement locales in Rust
let locale = LOCALES.get("en").ok_or("Invalid locale")?;
Ok(locale)
}
// TODO: Remove this function one we implement locales properly
pub fn get_locale_fix(id: &str) -> Result<&Locale, String> {
let locale = LOCALES.get(id).ok_or("Invalid locale")?; let locale = LOCALES.get(id).ok_or("Invalid locale")?;
Ok(locale) Ok(locale)
} }

View File

@@ -10,7 +10,7 @@ use std::cell::RefCell;
// 8 November 2022 12:13 Berlin time // 8 November 2022 12:13 Berlin time
thread_local! { thread_local! {
static MOCK_TIME: RefCell<i64> = RefCell::new(1667906008578); static MOCK_TIME: RefCell<i64> = const { RefCell::new(1667906008578) };
} }
pub fn get_milliseconds_since_epoch() -> i64 { pub fn get_milliseconds_since_epoch() -> i64 {
@@ -20,3 +20,18 @@ pub fn get_milliseconds_since_epoch() -> i64 {
pub fn set_mock_time(time: i64) { pub fn set_mock_time(time: i64) {
MOCK_TIME.with(|cell| *cell.borrow_mut() = time); MOCK_TIME.with(|cell| *cell.borrow_mut() = time);
} }
#[cfg(test)]
mod tests {
use crate::mock_time::MOCK_TIME;
use super::get_milliseconds_since_epoch;
#[test]
fn mock_time() {
let t = get_milliseconds_since_epoch();
assert_eq!(t, 1667906008578);
MOCK_TIME.with_borrow(|v| assert_eq!(*v, 1667906008578));
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,19 +1,24 @@
use chrono::NaiveDateTime; use chrono::DateTime;
use std::collections::HashMap; use std::collections::HashMap;
use crate::{ use crate::{
calc_result::Range, calc_result::Range,
constants::{DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH},
expressions::{ expressions::{
lexer::LexerMode, lexer::LexerMode,
parser::stringify::{rename_sheet_in_node, to_rc_format}, parser::{
parser::Parser, stringify::{rename_sheet_in_node, to_rc_format},
Parser,
},
types::CellReferenceRC, types::CellReferenceRC,
}, },
language::get_language, language::get_language,
locale::get_locale, locale::get_locale,
model::{get_milliseconds_since_epoch, Model, ParsedDefinedName}, model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
types::{Metadata, SheetState, Workbook, WorkbookSettings, Worksheet}, types::{
Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
},
utils::ParsedReference, utils::ParsedReference,
}; };
@@ -33,7 +38,20 @@ fn is_valid_sheet_name(name: &str) -> bool {
impl Model { impl Model {
/// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists /// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
fn new_empty_worksheet(name: &str, sheet_id: u32) -> Worksheet { fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
let mut views = HashMap::new();
for id in view_ids {
views.insert(
**id,
WorksheetView {
row: 1,
column: 1,
range: [1, 1, 1, 1],
top_row: 1,
left_column: 1,
},
);
}
Worksheet { Worksheet {
cols: vec![], cols: vec![],
rows: vec![], rows: vec![],
@@ -48,6 +66,8 @@ impl Model {
color: Default::default(), color: Default::default(),
frozen_columns: 0, frozen_columns: 0,
frozen_rows: 0, frozen_rows: 0,
show_grid_lines: true,
views,
} }
} }
@@ -122,8 +142,8 @@ impl Model {
self.parsed_defined_names = parsed_defined_names; self.parsed_defined_names = parsed_defined_names;
} }
// Reparses all formulas and defined names /// Reparses all formulas and defined names
fn reset_parsed_structures(&mut self) { pub(crate) fn reset_parsed_structures(&mut self) {
self.parser self.parser
.set_worksheets(self.workbook.get_worksheet_names()); .set_worksheets(self.workbook.get_worksheet_names());
self.parsed_formulas = vec![]; self.parsed_formulas = vec![];
@@ -134,10 +154,10 @@ impl Model {
} }
/// Adds a sheet with a automatically generated name /// Adds a sheet with a automatically generated name
pub fn new_sheet(&mut self) { pub fn new_sheet(&mut self) -> (String, u32) {
// First we find a name // First we find a name
// TODO: When/if we support i18n the name could depend on the locale // TODO: The name should depend on the locale
let base_name = "Sheet"; let base_name = "Sheet";
let base_name_uppercase = base_name.to_uppercase(); let base_name_uppercase = base_name.to_uppercase();
let mut index = 1; let mut index = 1;
@@ -153,9 +173,11 @@ impl Model {
let sheet_name = format!("{}{}", base_name, index); let sheet_name = format!("{}{}", base_name, index);
// Now we need a sheet_id // Now we need a sheet_id
let sheet_id = self.get_new_sheet_id(); let sheet_id = self.get_new_sheet_id();
let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id); let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id, &view_ids);
self.workbook.worksheets.push(worksheet); self.workbook.worksheets.push(worksheet);
self.reset_parsed_structures(); self.reset_parsed_structures();
(sheet_name, self.workbook.worksheets.len() as u32 - 1)
} }
/// Inserts a sheet with a particular index /// Inserts a sheet with a particular index
@@ -183,7 +205,8 @@ impl Model {
Some(id) => id, Some(id) => id,
None => self.get_new_sheet_id(), None => self.get_new_sheet_id(),
}; };
let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id); let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id, &view_ids);
if sheet_index as usize > self.workbook.worksheets.len() { if sheet_index as usize > self.workbook.worksheets.len() {
return Err("Sheet index out of range".to_string()); return Err("Sheet index out of range".to_string());
} }
@@ -223,10 +246,10 @@ impl Model {
new_name: &str, new_name: &str,
) -> Result<(), String> { ) -> Result<(), String> {
if !is_valid_sheet_name(new_name) { if !is_valid_sheet_name(new_name) {
return Err(format!("Invalid name for a sheet: '{}'", new_name)); return Err(format!("Invalid name for a sheet: '{}'.", new_name));
} }
if self.get_sheet_index_by_name(new_name).is_some() { if self.get_sheet_index_by_name(new_name).is_some() {
return Err(format!("Sheet already exists: '{}'", new_name)); return Err(format!("Sheet already exists: '{}'.", new_name));
} }
let worksheets = &self.workbook.worksheets; let worksheets = &self.workbook.worksheets;
let sheet_count = worksheets.len() as u32; let sheet_count = worksheets.len() as u32;
@@ -270,7 +293,7 @@ impl Model {
if sheet_count == 1 { if sheet_count == 1 {
return Err("Cannot delete only sheet".to_string()); return Err("Cannot delete only sheet".to_string());
}; };
if sheet_index > sheet_count { if sheet_index >= sheet_count {
return Err("Sheet index too large".to_string()); return Err("Sheet index too large".to_string());
} }
self.workbook.worksheets.remove(sheet_index as usize); self.workbook.worksheets.remove(sheet_index as usize);
@@ -323,18 +346,28 @@ impl Model {
let milliseconds = get_milliseconds_since_epoch(); let milliseconds = get_milliseconds_since_epoch();
let seconds = milliseconds / 1000; let seconds = milliseconds / 1000;
let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) { let dt = match DateTime::from_timestamp(seconds, 0) {
Some(s) => s, Some(s) => s,
None => return Err(format!("Invalid timestamp: {}", milliseconds)), None => return Err(format!("Invalid timestamp: {}", milliseconds)),
}; };
// "2020-08-06T21:20:53Z // "2020-08-06T21:20:53Z
let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string(); let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();
let mut views = HashMap::new();
views.insert(
0,
WorkbookView {
sheet: 0,
window_width: DEFAULT_WINDOW_WIDTH,
window_height: DEFAULT_WINDOW_HEIGHT,
},
);
// String versions of the locale are added here to simplify the serialize/deserialize logic // String versions of the locale are added here to simplify the serialize/deserialize logic
let workbook = Workbook { let workbook = Workbook {
shared_strings: vec![], shared_strings: vec![],
defined_names: vec![], defined_names: vec![],
worksheets: vec![Model::new_empty_worksheet("Sheet1", 1)], worksheets: vec![Model::new_empty_worksheet("Sheet1", 1, &[&0])],
styles: Default::default(), styles: Default::default(),
name: name.to_string(), name: name.to_string(),
settings: WorkbookSettings { settings: WorkbookSettings {
@@ -350,6 +383,7 @@ impl Model {
last_modified: now, last_modified: now,
}, },
tables: HashMap::new(), tables: HashMap::new(),
views,
}; };
let parsed_formulas = Vec::new(); let parsed_formulas = Vec::new();
let worksheets = &workbook.worksheets; let worksheets = &workbook.worksheets;
@@ -358,6 +392,7 @@ impl Model {
let cells = HashMap::new(); let cells = HashMap::new();
// FIXME: Add support for display languages // FIXME: Add support for display languages
#[allow(clippy::expect_used)]
let language = get_language("en").expect("").clone(); let language = get_language("en").expect("").clone();
let mut model = Model { let mut model = Model {
@@ -370,6 +405,7 @@ impl Model {
locale, locale,
language, language,
tz, tz,
view_id: 0,
}; };
model.parse_formulas(); model.parse_formulas();
Ok(model) Ok(model)

View File

@@ -161,26 +161,29 @@ impl Styles {
pub fn create_named_style(&mut self, style_name: &str, style: &Style) -> Result<(), String> { pub fn create_named_style(&mut self, style_name: &str, style: &Style) -> Result<(), String> {
let style_index = self.create_new_style(style); let style_index = self.create_new_style(style);
self.add_named_cell_style(style_name, style_index)?; self.add_named_cell_style(style_name, style_index)
Ok(())
} }
pub(crate) fn get_style_with_quote_prefix(&mut self, index: i32) -> i32 { pub(crate) fn get_style_with_quote_prefix(&mut self, index: i32) -> Result<i32, String> {
let mut style = self.get_style(index); let mut style = self.get_style(index)?;
style.quote_prefix = true; style.quote_prefix = true;
self.get_style_index_or_create(&style) Ok(self.get_style_index_or_create(&style))
} }
pub(crate) fn get_style_with_format(&mut self, index: i32, num_fmt: &str) -> i32 { pub(crate) fn get_style_with_format(
let mut style = self.get_style(index); &mut self,
index: i32,
num_fmt: &str,
) -> Result<i32, String> {
let mut style = self.get_style(index)?;
style.num_fmt = num_fmt.to_string(); style.num_fmt = num_fmt.to_string();
self.get_style_index_or_create(&style) Ok(self.get_style_index_or_create(&style))
} }
pub(crate) fn get_style_without_quote_prefix(&mut self, index: i32) -> i32 { pub(crate) fn get_style_without_quote_prefix(&mut self, index: i32) -> Result<i32, String> {
let mut style = self.get_style(index); let mut style = self.get_style(index)?;
style.quote_prefix = false; style.quote_prefix = false;
self.get_style_index_or_create(&style) Ok(self.get_style_index_or_create(&style))
} }
pub(crate) fn style_is_quote_prefix(&self, index: i32) -> bool { pub(crate) fn style_is_quote_prefix(&self, index: i32) -> bool {
@@ -188,9 +191,11 @@ impl Styles {
cell_xf.quote_prefix cell_xf.quote_prefix
} }
pub(crate) fn get_style(&self, index: i32) -> Style { pub(crate) fn get_style(&self, index: i32) -> Result<Style, String> {
let cell_xf = &self.cell_xfs[index as usize]; let cell_xf = &self
.cell_xfs
.get(index as usize)
.ok_or("Invalid index provided".to_string())?;
let border_id = cell_xf.border_id as usize; let border_id = cell_xf.border_id as usize;
let fill_id = cell_xf.fill_id as usize; let fill_id = cell_xf.fill_id as usize;
let font_id = cell_xf.font_id as usize; let font_id = cell_xf.font_id as usize;
@@ -198,14 +203,14 @@ impl Styles {
let quote_prefix = cell_xf.quote_prefix; let quote_prefix = cell_xf.quote_prefix;
let alignment = cell_xf.alignment.clone(); let alignment = cell_xf.alignment.clone();
Style { Ok(Style {
alignment, alignment,
num_fmt: get_num_fmt(num_fmt_id, &self.num_fmts), num_fmt: get_num_fmt(num_fmt_id, &self.num_fmts),
fill: self.fills[fill_id].clone(), fill: self.fills[fill_id].clone(),
font: self.fonts[font_id].clone(), font: self.fonts[font_id].clone(),
border: self.borders[border_id].clone(), border: self.borders[border_id].clone(),
quote_prefix, quote_prefix,
} })
} }
} }
@@ -221,8 +226,7 @@ impl Model {
let style_index = self.workbook.styles.get_style_index_or_create(style); let style_index = self.workbook.styles.get_style_index_or_create(style);
self.workbook self.workbook
.worksheet_mut(sheet)? .worksheet_mut(sheet)?
.set_cell_style(row, column, style_index); .set_cell_style(row, column, style_index)
Ok(())
} }
pub fn copy_cell_style( pub fn copy_cell_style(
@@ -237,9 +241,7 @@ impl Model {
self.workbook self.workbook
.worksheet_mut(destination_cell.0)? .worksheet_mut(destination_cell.0)?
.set_cell_style(destination_cell.1, destination_cell.2, source_style_index); .set_cell_style(destination_cell.1, destination_cell.2, source_style_index)
Ok(())
} }
/// Sets the style "style_name" in cell /// Sets the style "style_name" in cell
@@ -253,8 +255,7 @@ impl Model {
let style_index = self.workbook.styles.get_style_index_by_name(style_name)?; let style_index = self.workbook.styles.get_style_index_by_name(style_name)?;
self.workbook self.workbook
.worksheet_mut(sheet)? .worksheet_mut(sheet)?
.set_cell_style(row, column, style_index); .set_cell_style(row, column, style_index)
Ok(())
} }
pub fn set_sheet_style(&mut self, sheet: u32, style_name: &str) -> Result<(), String> { pub fn set_sheet_style(&mut self, sheet: u32, style_name: &str) -> Result<(), String> {

View File

@@ -76,10 +76,16 @@ fn fn_imconjugate() {
fn fn_imcos() { fn fn_imcos() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", r#"=IMCOS("4+3i")"#); model._set("A1", r#"=IMCOS("4+3i")"#);
// In macos non intel this is "-6.58066304055116+7.58155274274655i"
model._set("A2", r#"=COMPLEX(-6.58066304055116, 7.58155274274654)"#);
model._set("A3", r#"=IMABS(IMSUB(A1, A2)) < G1"#);
// small number
model._set("G1", "0.0000001");
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "-6.58066304055116+7.58155274274654i"); assert_eq!(model._get_text("A3"), "TRUE");
} }
#[test] #[test]

View File

@@ -1,6 +1,7 @@
mod test_actions; mod test_actions;
mod test_binary_search; mod test_binary_search;
mod test_cell; mod test_cell;
mod test_cell_clear_contents;
mod test_circular_references; mod test_circular_references;
mod test_column_width; mod test_column_width;
mod test_criteria; mod test_criteria;
@@ -14,6 +15,7 @@ mod test_fn_concatenate;
mod test_fn_count; mod test_fn_count;
mod test_fn_exact; mod test_fn_exact;
mod test_fn_financial; mod test_fn_financial;
mod test_fn_formulatext;
mod test_fn_if; mod test_fn_if;
mod test_fn_maxifs; mod test_fn_maxifs;
mod test_fn_minifs; mod test_fn_minifs;
@@ -23,14 +25,14 @@ mod test_fn_sum;
mod test_fn_sumifs; mod test_fn_sumifs;
mod test_fn_textbefore; mod test_fn_textbefore;
mod test_fn_textjoin; mod test_fn_textjoin;
mod test_fn_unicode;
mod test_forward_references; mod test_forward_references;
mod test_frozen_rows_columns; mod test_frozen_rows_columns;
mod test_general; mod test_general;
mod test_math; mod test_math;
mod test_metadata; mod test_metadata;
mod test_model_delete_cell; mod test_model_cell_clear_all;
mod test_model_is_empty_cell; mod test_model_is_empty_cell;
mod test_model_set_cell_empty;
mod test_move_formula; mod test_move_formula;
mod test_quote_prefix; mod test_quote_prefix;
mod test_set_user_input; mod test_set_user_input;
@@ -44,12 +46,19 @@ pub(crate) mod util;
mod engineering; mod engineering;
mod test_fn_offset; mod test_fn_offset;
mod test_fn_or;
mod test_number_format; mod test_number_format;
mod test_escape_quotes; mod test_escape_quotes;
mod test_extend; mod test_extend;
mod test_fn_fv;
mod test_fn_type; mod test_fn_type;
mod test_frozen_rows_and_columns; mod test_frozen_rows_and_columns;
mod test_geomean;
mod test_get_cell_content; mod test_get_cell_content;
mod test_issue_155;
mod test_percentage; mod test_percentage;
mod test_set_functions_error_handling;
mod test_today; mod test_today;
mod test_types;
mod user_model;

View File

@@ -1,8 +1,9 @@
#![allow(clippy::unwrap_used)] #![allow(clippy::unwrap_used)]
use crate::constants::LAST_COLUMN; use crate::constants::{DEFAULT_ROW_HEIGHT, LAST_COLUMN};
use crate::model::Model; use crate::model::Model;
use crate::test::util::new_empty_model; use crate::test::util::new_empty_model;
use crate::types::Col;
#[test] #[test]
fn test_insert_columns() { fn test_insert_columns() {
@@ -86,7 +87,8 @@ fn test_insert_rows_styles() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert!( assert!(
(21.0 - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs() < f64::EPSILON (DEFAULT_ROW_HEIGHT - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs()
< f64::EPSILON
); );
// sets height 42 in row 10 // sets height 42 in row 10
model model
@@ -105,7 +107,8 @@ fn test_insert_rows_styles() {
// Row 10 has the default height // Row 10 has the default height
assert!( assert!(
(21.0 - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs() < f64::EPSILON (DEFAULT_ROW_HEIGHT - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs()
< f64::EPSILON
); );
// Row 10 is now row 15 // Row 10 is now row 15
@@ -119,7 +122,8 @@ fn test_delete_rows_styles() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert!( assert!(
(21.0 - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs() < f64::EPSILON (DEFAULT_ROW_HEIGHT - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs()
< f64::EPSILON
); );
// sets height 42 in row 10 // sets height 42 in row 10
model model
@@ -138,7 +142,8 @@ fn test_delete_rows_styles() {
// Row 10 has the default height // Row 10 has the default height
assert!( assert!(
(21.0 - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs() < f64::EPSILON (DEFAULT_ROW_HEIGHT - model.workbook.worksheet(0).unwrap().row_height(10).unwrap()).abs()
< f64::EPSILON
); );
// Row 10 is now row 5 // Row 10 is now row 5
@@ -195,6 +200,250 @@ fn test_delete_columns() {
assert_eq!(model._get_formula("A3"), *"=SUM(#REF!:K4)"); assert_eq!(model._get_formula("A3"), *"=SUM(#REF!:K4)");
} }
#[test]
fn test_delete_column_width() {
let mut model = new_empty_model();
let (sheet, column) = (0, 5);
let normal_width = model.get_column_width(sheet, column).unwrap();
// Set the width of one column to 5 times the normal width
assert!(model
.set_column_width(sheet, column, normal_width * 5.0)
.is_ok());
// delete it
assert!(model.delete_columns(sheet, column, 1).is_ok());
// all the columns around have the expected width
assert_eq!(
model.get_column_width(sheet, column - 1).unwrap(),
normal_width
);
assert_eq!(model.get_column_width(sheet, column).unwrap(), normal_width);
assert_eq!(
model.get_column_width(sheet, column + 1).unwrap(),
normal_width
);
}
#[test]
// We set the style of columns 4 to 7 and delete column 4
// We check that columns 4 to 6 have the new style
fn test_delete_first_column_width() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 4,
max: 7,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 4);
assert!(model.delete_columns(sheet, column, 1).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 4,
max: 6,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
// Delete the last column in the range
fn test_delete_last_column_width() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 4,
max: 7,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 7);
assert!(model.delete_columns(sheet, column, 1).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 4,
max: 6,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
// Deletes columns at the end
fn test_delete_last_few_columns_width() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 4,
max: 17,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 13);
assert!(model.delete_columns(sheet, column, 10).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 4,
max: 12,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
fn test_delete_columns_non_overlapping_left() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 10,
max: 17,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 3);
assert!(model.delete_columns(sheet, column, 4).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 6,
max: 13,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
fn test_delete_columns_overlapping_left() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 10,
max: 20,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 8);
assert!(model.delete_columns(sheet, column, 4).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 8,
max: 16,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
fn test_delete_columns_non_overlapping_right() {
let mut model = new_empty_model();
model.workbook.worksheets[0].cols = vec![Col {
min: 10,
max: 17,
width: 300.0,
custom_width: true,
style: None,
}];
let (sheet, column) = (0, 23);
assert!(model.delete_columns(sheet, column, 4).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 10,
max: 17,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
// deletes some columns in the middle of the range
fn test_delete_middle_column_width() {
let mut model = new_empty_model();
// styled columns [4, 17]
model.workbook.worksheets[0].cols = vec![Col {
min: 4,
max: 17,
width: 300.0,
custom_width: true,
style: None,
}];
// deletes columns 10, 11, 12
let (sheet, column) = (0, 10);
assert!(model.delete_columns(sheet, column, 3).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 1);
assert_eq!(
cols[0],
Col {
min: 4,
max: 14,
width: 300.0,
custom_width: true,
style: None
}
);
}
#[test]
// the range is inside the deleted columns
fn delete_range_in_columns() {
let mut model = new_empty_model();
// styled columns [6, 10]
model.workbook.worksheets[0].cols = vec![Col {
min: 6,
max: 10,
width: 300.0,
custom_width: true,
style: None,
}];
// deletes columns [4, 17]
let (sheet, column) = (0, 4);
assert!(model.delete_columns(sheet, column, 8).is_ok());
let cols = &model.workbook.worksheets[0].cols;
assert_eq!(cols.len(), 0);
}
#[test]
fn test_delete_columns_error() {
let mut model = new_empty_model();
let (sheet, column) = (0, 5);
assert!(model.delete_columns(sheet, column, -1).is_err());
assert!(model.delete_columns(sheet, column, 0).is_err());
assert!(model.delete_columns(sheet, column, 1).is_ok());
}
#[test] #[test]
fn test_delete_rows() { fn test_delete_rows() {
let mut model = new_empty_model(); let mut model = new_empty_model();

View File

@@ -2,25 +2,25 @@
use crate::test::util::new_empty_model; use crate::test::util::new_empty_model;
#[test] #[test]
fn test_set_cell_empty_non_existing_sheet() { fn test_cell_clear_contents_non_existing_sheet() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert_eq!( assert_eq!(
model.set_cell_empty(13, 1, 1), model.cell_clear_contents(13, 1, 1),
Err("Invalid sheet index".to_string()) Err("Invalid sheet index".to_string())
); );
} }
#[test] #[test]
fn test_set_cell_empty_unset_cell() { fn test_cell_clear_contents_unset_cell() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_cell_empty(0, 1, 1).unwrap(); model.cell_clear_contents(0, 1, 1).unwrap();
assert_eq!(model.is_empty_cell(0, 1, 1), Ok(true)); assert_eq!(model.is_empty_cell(0, 1, 1), Ok(true));
model.evaluate(); model.evaluate();
assert_eq!(model._get_text_at(0, 1, 1), ""); assert_eq!(model._get_text_at(0, 1, 1), "");
} }
#[test] #[test]
fn test_set_cell_empty_with_value() { fn test_cell_clear_contents_with_value() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "hello"); model._set("A1", "hello");
model.evaluate(); model.evaluate();
@@ -28,7 +28,7 @@ fn test_set_cell_empty_with_value() {
assert_eq!(model._get_text_at(0, 1, 1), "hello"); assert_eq!(model._get_text_at(0, 1, 1), "hello");
assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
model.set_cell_empty(0, 1, 1).unwrap(); model.cell_clear_contents(0, 1, 1).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text_at(0, 1, 1), ""); assert_eq!(model._get_text_at(0, 1, 1), "");
@@ -36,7 +36,7 @@ fn test_set_cell_empty_with_value() {
} }
#[test] #[test]
fn test_set_cell_empty_referenced_elsewhere() { fn test_cell_clear_contents_referenced_elsewhere() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "35"); model._set("A1", "35");
model._set("A2", "=2*A1"); model._set("A2", "=2*A1");
@@ -47,7 +47,7 @@ fn test_set_cell_empty_referenced_elsewhere() {
assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false));
model.set_cell_empty(0, 1, 1).unwrap(); model.cell_clear_contents(0, 1, 1).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text_at(0, 1, 1), ""); assert_eq!(model._get_text_at(0, 1, 1), "");

View File

@@ -23,10 +23,10 @@ fn test_column_width() {
.unwrap(); .unwrap();
assert_eq!(model.workbook.worksheets[0].cols.len(), 3); assert_eq!(model.workbook.worksheets[0].cols.len(), 3);
let worksheet = model.workbook.worksheet(0).unwrap(); let worksheet = model.workbook.worksheet(0).unwrap();
assert!((worksheet.column_width(1).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON); assert!((worksheet.get_column_width(1).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
assert!((worksheet.column_width(2).unwrap() - 30.0).abs() < f64::EPSILON); assert!((worksheet.get_column_width(2).unwrap() - 30.0).abs() < f64::EPSILON);
assert!((worksheet.column_width(3).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON); assert!((worksheet.get_column_width(3).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
assert_eq!(model.get_cell_style_index(0, 23, 2), 6); assert_eq!(model.get_cell_style_index(0, 23, 2), Ok(6));
} }
#[test] #[test]
@@ -48,10 +48,12 @@ fn test_column_width_lower_edge() {
.unwrap(); .unwrap();
assert_eq!(model.workbook.worksheets[0].cols.len(), 2); assert_eq!(model.workbook.worksheets[0].cols.len(), 2);
let worksheet = model.workbook.worksheet(0).unwrap(); let worksheet = model.workbook.worksheet(0).unwrap();
assert!((worksheet.column_width(4).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON); assert!((worksheet.get_column_width(4).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
assert!((worksheet.column_width(5).unwrap() - 30.0).abs() < f64::EPSILON); assert!((worksheet.get_column_width(5).unwrap() - 30.0).abs() < f64::EPSILON);
assert!((worksheet.column_width(6).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON); assert!(
assert_eq!(model.get_cell_style_index(0, 23, 5), 1); (worksheet.get_column_width(6).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
);
assert_eq!(model.get_cell_style_index(0, 23, 5), Ok(1));
} }
#[test] #[test]
@@ -74,9 +76,27 @@ fn test_column_width_higher_edge() {
assert_eq!(model.workbook.worksheets[0].cols.len(), 2); assert_eq!(model.workbook.worksheets[0].cols.len(), 2);
let worksheet = model.workbook.worksheet(0).unwrap(); let worksheet = model.workbook.worksheet(0).unwrap();
assert!( assert!(
(worksheet.column_width(15).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON (worksheet.get_column_width(15).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
); );
assert!((worksheet.column_width(16).unwrap() - 30.0).abs() < f64::EPSILON); assert!((worksheet.get_column_width(16).unwrap() - 30.0).abs() < f64::EPSILON);
assert!((worksheet.column_width(17).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON); assert!((worksheet.get_column_width(17).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
assert_eq!(model.get_cell_style_index(0, 23, 16), 1); assert_eq!(model.get_cell_style_index(0, 23, 16), Ok(1));
}
#[test]
fn test_column_width_negative() {
let mut model = new_empty_model();
let result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_column_width(16, -1.0);
assert_eq!(result, Err("Can not set a negative width: -1".to_string()));
assert_eq!(model.workbook.worksheets[0].cols.len(), 0);
let worksheet = model.workbook.worksheet(0).unwrap();
assert_eq!(
(worksheet.get_column_width(16).unwrap()),
DEFAULT_COLUMN_WIDTH
);
assert_eq!(model.get_cell_style_index(0, 23, 16), Ok(0));
} }

View File

@@ -1,4 +1,5 @@
#![allow(clippy::unwrap_used)] #![allow(clippy::unwrap_used)]
#![allow(clippy::panic)]
use crate::test::util::new_empty_model; use crate::test::util::new_empty_model;
use crate::types::Cell; use crate::types::Cell;

View File

@@ -0,0 +1,44 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn wrong_number_of_arguments() {
let mut model = new_empty_model();
model._set("A1", "=FORMULATEXT()");
model._set("A2", "=FORMULATEXT(\"B\",\"A\")");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
assert_eq!(model._get_text("A2"), *"#ERROR!");
}
#[test]
fn multi_sheet_ref() {
let mut model = new_empty_model();
model.new_sheet();
model._set("A1", "=FORMULATEXT(Sheet1!A1:Sheet2!A1)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
}
#[test]
fn implicit_intersection() {
let mut model = new_empty_model();
model._set("A1", "=FORMULATEXT(C1:C2)");
model._set("A2", "=FORMULATEXT(D1:E1)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
assert_eq!(model._get_text("A2"), *"#ERROR!");
}
#[test]
fn non_reference() {
let mut model = new_empty_model();
model._set("A1", "=FORMULATEXT(42)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
}

View File

@@ -0,0 +1,36 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn computation() {
let i2 = "=-C2*(1+D2)^E2-F2*((D2+1)*((1+D2)^E2-1))/D2";
let mut model = new_empty_model();
model._set("C2", "1");
model._set("D2", "2");
model._set("E2", "3");
model._set("F2", "4");
model._set("I2", i2);
model.evaluate();
assert_eq!(model._get_text("I2"), "-183");
assert_eq!(model._get_formula("I2"), i2);
}
#[test]
fn format_as_currency() {
let mut model = new_empty_model();
model._set("C2", "1");
model._set("D2", "2");
model._set("E2", "3");
model._set("F2", "4");
model._set("I2", "=FV(D2,E2,F2,C2,1)");
model.evaluate();
assert_eq!(model._get_text("I2"), "-$183.00");
}

View File

@@ -0,0 +1,36 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn fn_or() {
let mut model = new_empty_model();
model._set("A1", "=OR(1, 0)");
model._set("A2", "=OR(0, 0)");
model._set("A3", "=OR(true, false)");
model._set("A4", "=OR(false, false)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"TRUE");
assert_eq!(model._get_text("A2"), *"FALSE");
assert_eq!(model._get_text("A3"), *"TRUE");
assert_eq!(model._get_text("A4"), *"FALSE");
}
#[test]
fn fn_or_no_arguments() {
let mut model = new_empty_model();
model._set("A1", "=OR()");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
}
#[test]
fn fn_or_missing_arguments() {
let mut model = new_empty_model();
model._set("A1", "=OR(,)");
model._set("A2", "=OR(,1)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"FALSE");
assert_eq!(model._get_text("A2"), *"TRUE");
}

View File

@@ -0,0 +1,63 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn simple_cases() {
let mut model = new_empty_model();
model._set("A1", "=UNICODE(\"1,00\")");
model._set("A2", "=UNICODE(\"1\")");
model._set("A3", "=UNICODE(1)");
model._set("A4", "=UNICODE(\"T\")");
model._set("A5", "=UNICODE(\"TRUE\")");
model._set("A6", "=UNICODE(TRUE)");
model._set("A7", "=UNICODE(FALSE)");
model._set("A8", "=UNICODE(\"\")");
model._set("A9", "=UNICODE(\" \")");
model._set("A10", "=_xlfn.UNICODE(\"T\")");
model.evaluate();
assert_eq!(model._get_text("A1"), *"49");
assert_eq!(model._get_text("A2"), *"49");
assert_eq!(model._get_text("A3"), *"49");
assert_eq!(model._get_text("A4"), *"84");
assert_eq!(model._get_text("A5"), *"84");
assert_eq!(model._get_text("A6"), *"84");
assert_eq!(model._get_text("A7"), *"70");
assert_eq!(model._get_text("A8"), *"12398");
assert_eq!(model._get_text("A9"), *"32");
assert_eq!(model._get_text("A10"), *"84");
}
#[test]
fn test_error_cases() {
let mut model = new_empty_model();
model._set("A1", "=UNICODE(\"\")");
model._set("A2", "=UNICODE(#CALC!)");
model._set("A3", "=UNICODE(#NAME?)");
model._set("A4", "=UNICODE(#VALUE!)");
model._set("A5", "=UNICODE(#REF!)");
model._set("A6", "=UNICODE(#DIV/0!)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#VALUE!");
assert_eq!(model._get_text("A2"), *"#CALC!");
assert_eq!(model._get_text("A3"), *"#NAME?");
assert_eq!(model._get_text("A4"), *"#VALUE!");
assert_eq!(model._get_text("A5"), *"#REF!");
assert_eq!(model._get_text("A6"), *"#DIV/0!");
}
#[test]
fn wrong_number_of_arguments() {
let mut model = new_empty_model();
model._set("A1", "=UNICODE()");
model._set("A2", "=UNICODE(\"B\",\"A\")");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
assert_eq!(model._get_text("A2"), *"#ERROR!");
}

View File

@@ -8,34 +8,37 @@ use crate::{
#[test] #[test]
fn test_empty_model() { fn test_empty_model() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert_eq!(model.get_frozen_rows(0), Ok(0)); assert_eq!(model.get_frozen_rows_count(0), Ok(0));
assert_eq!(model.get_frozen_columns(0), Ok(0)); assert_eq!(model.get_frozen_columns_count(0), Ok(0));
let e = model.set_frozen_rows(0, 3); let e = model.set_frozen_rows(0, 3);
assert!(e.is_ok()); assert!(e.is_ok());
assert_eq!(model.get_frozen_rows(0), Ok(3)); assert_eq!(model.get_frozen_rows_count(0), Ok(3));
assert_eq!(model.get_frozen_columns(0), Ok(0)); assert_eq!(model.get_frozen_columns_count(0), Ok(0));
let e = model.set_frozen_columns(0, 53); let e = model.set_frozen_columns(0, 53);
assert!(e.is_ok()); assert!(e.is_ok());
assert_eq!(model.get_frozen_rows(0), Ok(3)); assert_eq!(model.get_frozen_rows_count(0), Ok(3));
assert_eq!(model.get_frozen_columns(0), Ok(53)); assert_eq!(model.get_frozen_columns_count(0), Ok(53));
// Set them back to zero // Set them back to zero
let e = model.set_frozen_rows(0, 0); let e = model.set_frozen_rows(0, 0);
assert!(e.is_ok()); assert!(e.is_ok());
let e = model.set_frozen_columns(0, 0); let e = model.set_frozen_columns(0, 0);
assert!(e.is_ok()); assert!(e.is_ok());
assert_eq!(model.get_frozen_rows(0), Ok(0)); assert_eq!(model.get_frozen_rows_count(0), Ok(0));
assert_eq!(model.get_frozen_columns(0), Ok(0)); assert_eq!(model.get_frozen_columns_count(0), Ok(0));
} }
#[test] #[test]
fn test_invalid_sheet() { fn test_invalid_sheet() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert_eq!(model.get_frozen_rows(1), Err("Invalid sheet".to_string()));
assert_eq!( assert_eq!(
model.get_frozen_columns(3), model.get_frozen_rows_count(1),
Err("Invalid sheet".to_string())
);
assert_eq!(
model.get_frozen_columns_count(3),
Err("Invalid sheet".to_string()) Err("Invalid sheet".to_string())
); );

View File

@@ -1,5 +1,7 @@
#![allow(clippy::unwrap_used)] #![allow(clippy::unwrap_used)]
use crate::constants::DEFAULT_ROW_HEIGHT;
use crate::cell::CellValue; use crate::cell::CellValue;
use crate::number_format::to_excel_precision_str; use crate::number_format::to_excel_precision_str;
@@ -17,7 +19,9 @@ fn test_empty_model() {
#[test] #[test]
fn test_model_simple_evaluation() { fn test_model_simple_evaluation() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "= 1 + 3".to_string()); model
.set_user_input(0, 1, 1, "= 1 + 3".to_string())
.unwrap();
model.evaluate(); model.evaluate();
let result = model._get_text_at(0, 1, 1); let result = model._get_text_at(0, 1, 1);
assert_eq!(result, *"4"); assert_eq!(result, *"4");
@@ -43,7 +47,7 @@ fn test_model_simple_evaluation_order() {
#[test] #[test]
fn test_model_invalid_formula() { fn test_model_invalid_formula() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "= 1 +".to_string()); model.set_user_input(0, 1, 1, "= 1 +".to_string()).unwrap();
model.evaluate(); model.evaluate();
let result = model._get_text_at(0, 1, 1); let result = model._get_text_at(0, 1, 1);
assert_eq!(result, *"#ERROR!"); assert_eq!(result, *"#ERROR!");
@@ -54,8 +58,10 @@ fn test_model_invalid_formula() {
#[test] #[test]
fn test_model_dependencies() { fn test_model_dependencies() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "23".to_string()); // A1 model.set_user_input(0, 1, 1, "23".to_string()).unwrap(); // A1
model.set_user_input(0, 1, 2, "= A1* 2-4".to_string()); // B1 model
.set_user_input(0, 1, 2, "= A1* 2-4".to_string())
.unwrap(); // B1
model.evaluate(); model.evaluate();
let result = model._get_text_at(0, 1, 1); let result = model._get_text_at(0, 1, 1);
assert_eq!(result, *"23"); assert_eq!(result, *"23");
@@ -65,7 +71,9 @@ fn test_model_dependencies() {
let result = model._get_formula("B1"); let result = model._get_formula("B1");
assert_eq!(result, *"=A1*2-4"); assert_eq!(result, *"=A1*2-4");
model.set_user_input(0, 2, 1, "=SUM(A1, B1)".to_string()); // A2 model
.set_user_input(0, 2, 1, "=SUM(A1, B1)".to_string())
.unwrap(); // A2
model.evaluate(); model.evaluate();
let result = model._get_text_at(0, 2, 1); let result = model._get_text_at(0, 2, 1);
assert_eq!(result, *"65"); assert_eq!(result, *"65");
@@ -74,8 +82,10 @@ fn test_model_dependencies() {
#[test] #[test]
fn test_model_strings() { fn test_model_strings() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "Hello World".to_string()); model
model.set_user_input(0, 1, 2, "=A1".to_string()); .set_user_input(0, 1, 1, "Hello World".to_string())
.unwrap();
model.set_user_input(0, 1, 2, "=A1".to_string()).unwrap();
model.evaluate(); model.evaluate();
let result = model._get_text_at(0, 1, 1); let result = model._get_text_at(0, 1, 1);
assert_eq!(result, *"Hello World"); assert_eq!(result, *"Hello World");
@@ -105,6 +115,15 @@ fn test_set_row_height() {
worksheet.set_row_height(5, 5.0).unwrap(); worksheet.set_row_height(5, 5.0).unwrap();
let worksheet = model.workbook.worksheet(0).unwrap(); let worksheet = model.workbook.worksheet(0).unwrap();
assert!((5.0 - worksheet.row_height(5).unwrap()).abs() < f64::EPSILON); assert!((5.0 - worksheet.row_height(5).unwrap()).abs() < f64::EPSILON);
let worksheet = model.workbook.worksheet_mut(0).unwrap();
let result = worksheet.set_row_height(6, -1.0);
assert_eq!(result, Err("Can not set a negative height: -1".to_string()));
assert_eq!(worksheet.row_height(6).unwrap(), DEFAULT_ROW_HEIGHT);
worksheet.set_row_height(6, 0.0).unwrap();
assert_eq!(worksheet.row_height(6).unwrap(), 0.0);
} }
#[test] #[test]
@@ -152,21 +171,35 @@ fn test_to_excel_precision_str() {
#[test] #[test]
fn test_booleans() { fn test_booleans() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "true".to_string()); model.set_user_input(0, 1, 1, "true".to_string()).unwrap();
model.set_user_input(0, 2, 1, "TRUE".to_string()); model.set_user_input(0, 2, 1, "TRUE".to_string()).unwrap();
model.set_user_input(0, 3, 1, "True".to_string()); model.set_user_input(0, 3, 1, "True".to_string()).unwrap();
model.set_user_input(0, 4, 1, "false".to_string()); model.set_user_input(0, 4, 1, "false".to_string()).unwrap();
model.set_user_input(0, 5, 1, "FALSE".to_string()); model.set_user_input(0, 5, 1, "FALSE".to_string()).unwrap();
model.set_user_input(0, 6, 1, "False".to_string()); model.set_user_input(0, 6, 1, "False".to_string()).unwrap();
model.set_user_input(0, 1, 2, "=ISLOGICAL(A1)".to_string()); model
model.set_user_input(0, 2, 2, "=ISLOGICAL(A2)".to_string()); .set_user_input(0, 1, 2, "=ISLOGICAL(A1)".to_string())
model.set_user_input(0, 3, 2, "=ISLOGICAL(A3)".to_string()); .unwrap();
model.set_user_input(0, 4, 2, "=ISLOGICAL(A4)".to_string()); model
model.set_user_input(0, 5, 2, "=ISLOGICAL(A5)".to_string()); .set_user_input(0, 2, 2, "=ISLOGICAL(A2)".to_string())
model.set_user_input(0, 6, 2, "=ISLOGICAL(A6)".to_string()); .unwrap();
model
.set_user_input(0, 3, 2, "=ISLOGICAL(A3)".to_string())
.unwrap();
model
.set_user_input(0, 4, 2, "=ISLOGICAL(A4)".to_string())
.unwrap();
model
.set_user_input(0, 5, 2, "=ISLOGICAL(A5)".to_string())
.unwrap();
model
.set_user_input(0, 6, 2, "=ISLOGICAL(A6)".to_string())
.unwrap();
model.set_user_input(0, 1, 5, "=IF(false, True, FALSe)".to_string()); model
.set_user_input(0, 1, 5, "=IF(false, True, FALSe)".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -191,19 +224,19 @@ fn test_booleans() {
#[test] #[test]
fn test_set_cell_style() { fn test_set_cell_style() {
let mut model = new_empty_model(); let mut model = new_empty_model();
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(!style.font.b); assert!(!style.font.b);
style.font.b = true; style.font.b = true;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(style.font.b); assert!(style.font.b);
style.font.b = false; style.font.b = false;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let style = model.get_style_for_cell(0, 1, 1); let style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(!style.font.b); assert!(!style.font.b);
} }
@@ -211,21 +244,21 @@ fn test_set_cell_style() {
fn test_copy_cell_style() { fn test_copy_cell_style() {
let mut model = new_empty_model(); let mut model = new_empty_model();
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
style.font.b = true; style.font.b = true;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let mut style = model.get_style_for_cell(0, 1, 2); let mut style = model.get_style_for_cell(0, 1, 2).unwrap();
style.font.i = true; style.font.i = true;
assert!(model.set_cell_style(0, 1, 2, &style).is_ok()); assert!(model.set_cell_style(0, 1, 2, &style).is_ok());
assert!(model.copy_cell_style((0, 1, 1), (0, 1, 2)).is_ok()); assert!(model.copy_cell_style((0, 1, 1), (0, 1, 2)).is_ok());
let style = model.get_style_for_cell(0, 1, 1); let style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(style.font.b); assert!(style.font.b);
assert!(!style.font.i); assert!(!style.font.i);
let style = model.get_style_for_cell(0, 1, 2); let style = model.get_style_for_cell(0, 1, 2).unwrap();
assert!(style.font.b); assert!(style.font.b);
assert!(!style.font.i); assert!(!style.font.i);
} }
@@ -234,15 +267,15 @@ fn test_copy_cell_style() {
fn test_get_cell_style_index() { fn test_get_cell_style_index() {
let mut model = new_empty_model(); let mut model = new_empty_model();
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
let style_index = model.get_cell_style_index(0, 1, 1); let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
assert_eq!(style_index, 0); assert_eq!(style_index, 0);
assert!(!style.font.b); assert!(!style.font.b);
style.font.b = true; style.font.b = true;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let style_index = model.get_cell_style_index(0, 1, 1); let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
assert_eq!(style_index, 1); assert_eq!(style_index, 1);
} }
@@ -250,29 +283,29 @@ fn test_get_cell_style_index() {
fn test_model_set_cells_with_values_styles() { fn test_model_set_cells_with_values_styles() {
let mut model = new_empty_model(); let mut model = new_empty_model();
// Inputs // Inputs
model.set_user_input(0, 1, 1, "21".to_string()); // A1 model.set_user_input(0, 1, 1, "21".to_string()).unwrap(); // A1
model.set_user_input(0, 2, 1, "2".to_string()); // A2 model.set_user_input(0, 2, 1, "2".to_string()).unwrap(); // A2
let style_index = model.get_cell_style_index(0, 1, 1); let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
assert_eq!(style_index, 0); assert_eq!(style_index, 0);
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
style.font.b = true; style.font.b = true;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
assert!(model.set_cell_style(0, 2, 1, &style).is_ok()); assert!(model.set_cell_style(0, 2, 1, &style).is_ok());
let style_index = model.get_cell_style_index(0, 1, 1); let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
assert_eq!(style_index, 1); assert_eq!(style_index, 1);
let style_index = model.get_cell_style_index(0, 2, 1); let style_index = model.get_cell_style_index(0, 2, 1).unwrap();
assert_eq!(style_index, 1); assert_eq!(style_index, 1);
model.update_cell_with_number(0, 1, 2, 1.0); model.update_cell_with_number(0, 1, 2, 1.0).unwrap();
model.update_cell_with_number(0, 2, 1, 2.0); model.update_cell_with_number(0, 2, 1, 2.0).unwrap();
model.evaluate(); model.evaluate();
// Styles are not modified // Styles are not modified
let style_index = model.get_cell_style_index(0, 1, 1); let style_index = model.get_cell_style_index(0, 1, 1).unwrap();
assert_eq!(style_index, 1); assert_eq!(style_index, 1);
let style_index = model.get_cell_style_index(0, 2, 1); let style_index = model.get_cell_style_index(0, 2, 1).unwrap();
assert_eq!(style_index, 1); assert_eq!(style_index, 1);
} }
@@ -280,20 +313,20 @@ fn test_model_set_cells_with_values_styles() {
fn test_style_fmt_id() { fn test_style_fmt_id() {
let mut model = new_empty_model(); let mut model = new_empty_model();
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
style.num_fmt = "#.##".to_string(); style.num_fmt = "#.##".to_string();
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let style = model.get_style_for_cell(0, 1, 1); let style = model.get_style_for_cell(0, 1, 1).unwrap();
assert_eq!(style.num_fmt, "#.##"); assert_eq!(style.num_fmt, "#.##");
let mut style = model.get_style_for_cell(0, 10, 1); let mut style = model.get_style_for_cell(0, 10, 1).unwrap();
style.num_fmt = "$$#,##0.0000".to_string(); style.num_fmt = "$$#,##0.0000".to_string();
assert!(model.set_cell_style(0, 10, 1, &style).is_ok()); assert!(model.set_cell_style(0, 10, 1, &style).is_ok());
let style = model.get_style_for_cell(0, 10, 1); let style = model.get_style_for_cell(0, 10, 1).unwrap();
assert_eq!(style.num_fmt, "$$#,##0.0000"); assert_eq!(style.num_fmt, "$$#,##0.0000");
// Make sure old style is not touched // Make sure old style is not touched
let style = model.get_style_for_cell(0, 1, 1); let style = model.get_style_for_cell(0, 1, 1).unwrap();
assert_eq!(style.num_fmt, "#.##"); assert_eq!(style.num_fmt, "#.##");
} }
@@ -357,9 +390,13 @@ fn set_input_autocomplete() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "1"); model._set("A1", "1");
model._set("A2", "2"); model._set("A2", "2");
model.set_user_input(0, 3, 1, "=SUM(A1:A2".to_string()); model
.set_user_input(0, 3, 1, "=SUM(A1:A2".to_string())
.unwrap();
// This will fail anyway // This will fail anyway
model.set_user_input(0, 4, 1, "=SUM(A1*".to_string()); model
.set_user_input(0, 4, 1, "=SUM(A1*".to_string())
.unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_formula("A3"), "=SUM(A1:A2)"); assert_eq!(model._get_formula("A3"), "=SUM(A1:A2)");
@@ -405,17 +442,17 @@ fn test_get_formatted_cell_value() {
model._set("A5", "123.456"); model._set("A5", "123.456");
// change A5 format // change A5 format
let mut style = model.get_style_for_cell(0, 5, 1); let mut style = model.get_style_for_cell(0, 5, 1).unwrap();
style.num_fmt = "$#,##0.00".to_string(); style.num_fmt = "$#,##0.00".to_string();
model.set_cell_style(0, 5, 1, &style).unwrap(); model.set_cell_style(0, 5, 1, &style).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model.formatted_cell_value(0, 1, 1).unwrap(), "foobar"); assert_eq!(model.get_formatted_cell_value(0, 1, 1).unwrap(), "foobar");
assert_eq!(model.formatted_cell_value(0, 2, 1).unwrap(), "TRUE"); assert_eq!(model.get_formatted_cell_value(0, 2, 1).unwrap(), "TRUE");
assert_eq!(model.formatted_cell_value(0, 3, 1).unwrap(), ""); assert_eq!(model.get_formatted_cell_value(0, 3, 1).unwrap(), "");
assert_eq!(model.formatted_cell_value(0, 4, 1).unwrap(), "123.456"); assert_eq!(model.get_formatted_cell_value(0, 4, 1).unwrap(), "123.456");
assert_eq!(model.formatted_cell_value(0, 5, 1).unwrap(), "$123.46"); assert_eq!(model.get_formatted_cell_value(0, 5, 1).unwrap(), "$123.46");
} }
#[test] #[test]
@@ -426,20 +463,20 @@ fn test_cell_formula() {
model.evaluate(); model.evaluate();
assert_eq!( assert_eq!(
model.cell_formula(0, 1, 1), // A1 model.get_cell_formula(0, 1, 1), // A1
Ok(Some("=1+2+3".to_string())), Ok(Some("=1+2+3".to_string())),
); );
assert_eq!( assert_eq!(
model.cell_formula(0, 2, 1), // A2 model.get_cell_formula(0, 2, 1), // A2
Ok(None), Ok(None),
); );
assert_eq!( assert_eq!(
model.cell_formula(0, 3, 1), // A3 - empty cell model.get_cell_formula(0, 3, 1), // A3 - empty cell
Ok(None), Ok(None),
); );
assert_eq!( assert_eq!(
model.cell_formula(42, 1, 1), model.get_cell_formula(42, 1, 1),
Err("Invalid sheet index".to_string()), Err("Invalid sheet index".to_string()),
); );
} }
@@ -453,16 +490,16 @@ fn test_xlfn() {
model.evaluate(); model.evaluate();
// Only modern formulas strip the '_xlfn.' // Only modern formulas strip the '_xlfn.'
assert_eq!( assert_eq!(
model.cell_formula(0, 1, 1).unwrap(), model.get_cell_formula(0, 1, 1).unwrap(),
Some("=_xlfn.SIN(1)".to_string()) Some("=_xlfn.SIN(1)".to_string())
); );
// unknown formulas keep the '_xlfn.' prefix // unknown formulas keep the '_xlfn.' prefix
assert_eq!( assert_eq!(
model.cell_formula(0, 2, 1).unwrap(), model.get_cell_formula(0, 2, 1).unwrap(),
Some("=_xlfn.SINY(1)".to_string()) Some("=_xlfn.SINY(1)".to_string())
); );
assert_eq!( assert_eq!(
model.cell_formula(0, 3, 1).unwrap(), model.get_cell_formula(0, 3, 1).unwrap(),
Some("=CONCAT(3,4)".to_string()) Some("=CONCAT(3,4)".to_string())
); );
} }
@@ -474,11 +511,11 @@ fn test_letter_case() {
model._set("A2", "=sIn(2)"); model._set("A2", "=sIn(2)");
model.evaluate(); model.evaluate();
assert_eq!( assert_eq!(
model.cell_formula(0, 1, 1).unwrap(), model.get_cell_formula(0, 1, 1).unwrap(),
Some("=SIN(1)".to_string()) Some("=SIN(1)".to_string())
); );
assert_eq!( assert_eq!(
model.cell_formula(0, 2, 1).unwrap(), model.get_cell_formula(0, 2, 1).unwrap(),
Some("=SIN(2)".to_string()) Some("=SIN(2)".to_string())
); );
} }

View File

@@ -0,0 +1,27 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn test_fn_geomean_arguments() {
let mut model = new_empty_model();
model._set("A1", "=GEOMEAN()");
model.evaluate();
assert_eq!(model._get_text("A1"), *"#ERROR!");
}
#[test]
fn test_fn_geomean_minimal() {
let mut model = new_empty_model();
model._set("B1", "1");
model._set("B2", "2");
model._set("B3", "3");
model._set("B4", "'2");
// B5 is empty
model._set("B6", "true");
model._set("A1", "=GEOMEAN(B1:B6)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"1.817120593");
}

View File

@@ -5,8 +5,12 @@ use crate::test::util::new_empty_model;
#[test] #[test]
fn test_formulas() { fn test_formulas() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "$100.348".to_string()); model
model.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string()); .set_user_input(0, 1, 1, "$100.348".to_string())
.unwrap();
model
.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string())
.unwrap();
model.evaluate(); model.evaluate();

View File

@@ -0,0 +1,14 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn issue_155() {
let mut model = new_empty_model();
model._set("A1", "1");
model._set("A2", "2");
model._set("B2", "=A$1:A2");
model.evaluate();
assert_eq!(model._get_formula("B2"), "=A$1:A2".to_string());
}

View File

@@ -1,9 +1,11 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model; use crate::test::util::new_empty_model;
#[test] #[test]
fn test_metadata_new_model() { fn test_metadata_new_model() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "5.5".to_string()); model.set_user_input(0, 1, 1, "5.5".to_string()).unwrap();
model.evaluate(); model.evaluate();
let metadata = &model.workbook.metadata; let metadata = &model.workbook.metadata;
assert_eq!(metadata.application, "IronCalc Sheets"); assert_eq!(metadata.application, "IronCalc Sheets");

View File

@@ -2,22 +2,22 @@
use crate::test::util::new_empty_model; use crate::test::util::new_empty_model;
#[test] #[test]
fn test_delete_cell_non_existing_sheet() { fn test_cell_clear_all_non_existing_sheet() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert_eq!( assert_eq!(
model.delete_cell(13, 1, 1), model.cell_clear_all(13, 1, 1),
Err("Invalid sheet index".to_string()) Err("Invalid sheet index".to_string())
); );
} }
#[test] #[test]
fn test_delete_cell_unset_cell() { fn test_cell_clear_all_unset_cell() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert!(model.delete_cell(0, 1, 1).is_ok()); assert!(model.cell_clear_all(0, 1, 1).is_ok());
} }
#[test] #[test]
fn test_delete_cell_with_value() { fn test_cell_clear_all_with_value() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "hello"); model._set("A1", "hello");
model.evaluate(); model.evaluate();
@@ -25,7 +25,7 @@ fn test_delete_cell_with_value() {
assert_eq!(model._get_text_at(0, 1, 1), "hello"); assert_eq!(model._get_text_at(0, 1, 1), "hello");
assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
model.delete_cell(0, 1, 1).unwrap(); model.cell_clear_all(0, 1, 1).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text_at(0, 1, 1), ""); assert_eq!(model._get_text_at(0, 1, 1), "");
@@ -33,7 +33,7 @@ fn test_delete_cell_with_value() {
} }
#[test] #[test]
fn test_delete_cell_referenced_elsewhere() { fn test_cell_clear_all_referenced_elsewhere() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "35"); model._set("A1", "35");
model._set("A2", "=2*A1"); model._set("A2", "=2*A1");
@@ -44,7 +44,7 @@ fn test_delete_cell_referenced_elsewhere() {
assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false)); assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false));
model.delete_cell(0, 1, 1).unwrap(); model.cell_clear_all(0, 1, 1).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text_at(0, 1, 1), ""); assert_eq!(model._get_text_at(0, 1, 1), "");

View File

@@ -14,9 +14,11 @@ fn test_is_empty_cell_non_existing_sheet() {
fn test_is_empty_cell() { fn test_is_empty_cell() {
let mut model = new_empty_model(); let mut model = new_empty_model();
assert!(model.is_empty_cell(0, 3, 1).unwrap()); assert!(model.is_empty_cell(0, 3, 1).unwrap());
model.set_user_input(0, 3, 1, "Hello World".to_string()); model
.set_user_input(0, 3, 1, "Hello World".to_string())
.unwrap();
assert!(!model.is_empty_cell(0, 3, 1).unwrap()); assert!(!model.is_empty_cell(0, 3, 1).unwrap());
model.set_cell_empty(0, 3, 1).unwrap(); model.cell_clear_contents(0, 3, 1).unwrap();
assert!(model.is_empty_cell(0, 3, 1).unwrap()); assert!(model.is_empty_cell(0, 3, 1).unwrap());
} }

View File

@@ -57,12 +57,12 @@ fn test_quote_prefix_enter() {
model._set("A2", "=ISTEXT(A1)"); model._set("A2", "=ISTEXT(A1)");
model.evaluate(); model.evaluate();
// We introduce a value with a "quote prefix" index // We introduce a value with a "quote prefix" index
model.set_user_input(0, 1, 3, "'=A1".to_string()); model.set_user_input(0, 1, 3, "'=A1".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("C1"), *"=A1"); assert_eq!(model._get_text("C1"), *"=A1");
// But if we enter with a quote_prefix but without the "'" it won't be quote_prefix // But if we enter with a quote_prefix but without the "'" it won't be quote_prefix
model.set_user_input(0, 1, 4, "=A1".to_string()); model.set_user_input(0, 1, 4, "=A1".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("D1"), *"123"); assert_eq!(model._get_text("D1"), *"123");
} }
@@ -75,7 +75,7 @@ fn test_quote_prefix_reenter() {
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
// We introduce a value with a "quote prefix" index // We introduce a value with a "quote prefix" index
model.set_user_input(0, 1, 1, "123".to_string()); model.set_user_input(0, 1, 1, "123".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"FALSE"); assert_eq!(model._get_text("A2"), *"FALSE");
} }
@@ -83,7 +83,7 @@ fn test_quote_prefix_reenter() {
#[test] #[test]
fn test_update_cell_quote() { fn test_update_cell_quote() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.update_cell_with_text(0, 1, 1, "= 1 + 3"); model.update_cell_with_text(0, 1, 1, "= 1 + 3").unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), *"= 1 + 3"); assert_eq!(model._get_text("A1"), *"= 1 + 3");
assert!(!model._has_formula("A1")); assert!(!model._has_formula("A1"));
@@ -92,12 +92,12 @@ fn test_update_cell_quote() {
#[test] #[test]
fn test_update_quote_prefix_reenter() { fn test_update_quote_prefix_reenter() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.update_cell_with_text(0, 1, 1, "123"); model.update_cell_with_text(0, 1, 1, "123").unwrap();
model._set("A2", "=ISTEXT(A1)"); model._set("A2", "=ISTEXT(A1)");
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
// We reenter as a number // We reenter as a number
model.update_cell_with_number(0, 1, 1, 123.0); model.update_cell_with_number(0, 1, 1, 123.0).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"FALSE"); assert_eq!(model._get_text("A2"), *"FALSE");
} }
@@ -105,12 +105,12 @@ fn test_update_quote_prefix_reenter() {
#[test] #[test]
fn test_update_quote_prefix_reenter_bool() { fn test_update_quote_prefix_reenter_bool() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.update_cell_with_text(0, 1, 1, "TRUE"); model.update_cell_with_text(0, 1, 1, "TRUE").unwrap();
model._set("A2", "=ISTEXT(A1)"); model._set("A2", "=ISTEXT(A1)");
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
// We enter a bool // We enter a bool
model.update_cell_with_bool(0, 1, 1, true); model.update_cell_with_bool(0, 1, 1, true).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"FALSE"); assert_eq!(model._get_text("A2"), *"FALSE");
} }
@@ -118,29 +118,29 @@ fn test_update_quote_prefix_reenter_bool() {
#[test] #[test]
fn test_update_quote_prefix_reenter_text() { fn test_update_quote_prefix_reenter_text() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.update_cell_with_text(0, 1, 1, "123"); model.update_cell_with_text(0, 1, 1, "123").unwrap();
model._set("A2", "=ISTEXT(A1)"); model._set("A2", "=ISTEXT(A1)");
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
assert!(model.get_style_for_cell(0, 1, 1).quote_prefix); assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
// We enter a string // We enter a string
model.update_cell_with_text(0, 1, 1, "Hello"); model.update_cell_with_text(0, 1, 1, "Hello").unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
assert!(!model.get_style_for_cell(0, 1, 1).quote_prefix); assert!(!model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
} }
#[test] #[test]
fn test_update_quote_prefix_reenter_text_2() { fn test_update_quote_prefix_reenter_text_2() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.update_cell_with_text(0, 1, 1, "123"); model.update_cell_with_text(0, 1, 1, "123").unwrap();
model._set("A2", "=ISTEXT(A1)"); model._set("A2", "=ISTEXT(A1)");
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
assert!(model.get_style_for_cell(0, 1, 1).quote_prefix); assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
// We enter another number // We enter another number
model.update_cell_with_text(0, 1, 1, "42"); model.update_cell_with_text(0, 1, 1, "42").unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A2"), *"TRUE"); assert_eq!(model._get_text("A2"), *"TRUE");
assert!(model.get_style_for_cell(0, 1, 1).quote_prefix); assert!(model.get_style_for_cell(0, 1, 1).unwrap().quote_prefix);
} }

View File

@@ -0,0 +1,451 @@
#![allow(clippy::unwrap_used)]
use crate::{expressions::token, test::util::new_empty_model, types::Cell};
#[test]
fn test_update_cell_with_text() {
let mut model = new_empty_model();
// Below are safe inputs
model.set_user_input(0, 1, 1, "Hello".to_string()).unwrap();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.update_cell_with_text(1, 1, 1, "new value");
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// Case2 : Invalid Row
let update_result = model.update_cell_with_text(0, 0, 1, "new value");
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Invalid Column
let update_result = model.update_cell_with_text(0, 1, 1048579, "new value");
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_update_cell_with_number() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.update_cell_with_number(1, 1, 1, 20.0);
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// Case2 : Invalid Row
let update_result = model.update_cell_with_number(0, 0, 1, 20.0);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Invalid Column
let update_result = model.update_cell_with_number(0, 1, 1048579, 20.0);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_update_cell_with_bool() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_bool(0, 1, 1, true).unwrap();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.update_cell_with_bool(1, 1, 1, false);
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// Case2 : Invalid Row
let update_result = model.update_cell_with_bool(0, 0, 1, false);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Invalid Column
let update_result = model.update_cell_with_bool(0, 1, 1048579, false);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_update_cell_with_formula() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
model
.update_cell_with_formula(0, 1, 2, "=A1*2".to_string())
.unwrap();
model.evaluate();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.update_cell_with_formula(1, 1, 2, "=A1*2".to_string());
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// Case2 : Invalid Row
let update_result = model.update_cell_with_formula(0, 0, 2, "=A1*2".to_string());
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Invalid Column
let update_result = model.update_cell_with_formula(0, 1, 1048579, "=A1*2".to_string());
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_set_user_input() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
model.evaluate();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.set_user_input(1, 1, 2, "20.0".to_string());
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// Case2 : Invalid Row
let update_result = model.set_user_input(0, 0, 2, "20.0".to_string());
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Invalid Column
let update_result = model.set_user_input(0, 1, 1048579, "20.0".to_string());
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_get_style_for_cell() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
model.evaluate();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.get_style_for_cell(1, 1, 2);
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// ATTENTION : get_cell_style_index tries to get cell using row and col
// if we invalid row or column is given, it will return index 0.
// Case2 : Invalid Row
let update_result = model.get_style_for_cell(0, 0, 2);
assert!(update_result.is_ok());
// Case3 : Invalid Column
let update_result = model.get_style_for_cell(0, 1, 1048579);
assert!(update_result.is_ok());
}
#[test]
fn test_get_cell_style_index() {
let mut model = new_empty_model();
// Below are safe inputs
model.update_cell_with_number(0, 1, 1, 10.0).unwrap();
model.evaluate();
// Now testing all the possible error scenarios
// Case1 : Invalid sheet
let update_result = model.get_cell_style_index(1, 1, 2);
assert_eq!(update_result, Err("Invalid sheet index".to_string()));
// ATTENTION : get_cell_style_index tries to get cell using row and col
// if we invalid row or column is given, it will return index 0.
// Case2 : Invalid Row
let update_result = model.get_cell_style_index(0, 0, 2);
assert_eq!(update_result, Ok(0));
// Case3 : Invalid Column
let update_result = model.get_cell_style_index(0, 1, 1048579);
assert_eq!(update_result, Ok(0));
}
#[test]
fn test_worksheet_update_cell() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result =
model
.workbook
.worksheet_mut(0)
.unwrap()
.update_cell(0, 1, Cell::new_number(10.0, 1));
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result =
model
.workbook
.worksheet_mut(0)
.unwrap()
.update_cell(1, 1048579, Cell::new_number(10.0, 1));
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_style() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_style(0, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_style(1, 1048579, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_with_formula() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_formula(0, 1, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_formula(1, 1048579, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_with_number() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_number(0, 1, 1.0, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_number(1, 1048579, 1.0, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_with_string() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_string(0, 1, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_string(1, 1048579, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_with_boolean() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_boolean(0, 1, true, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_boolean(1, 1048579, true, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_set_cell_with_error() {
let mut model = new_empty_model();
// Now testing all the possible error scenarios
// Case1: Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_error(0, 1, token::Error::ERROR, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.set_cell_with_error(1, 1048579, token::Error::ERROR, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
}
#[test]
fn test_worksheet_cell_clear_contents() {
let mut model = new_empty_model();
model
.workbook
.worksheet_mut(0)
.unwrap()
.update_cell(1, 1, Cell::new_number(10.0, 1))
.unwrap();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents(0, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents(1, 1048579);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Valid case
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents(1, 1);
assert_eq!(update_result, Ok(()))
}
#[test]
fn test_worksheet_cell_clear_contents_with_style() {
let mut model = new_empty_model();
model
.workbook
.worksheet_mut(0)
.unwrap()
.update_cell(1, 1, Cell::new_number(10.0, 1))
.unwrap();
// Now testing all the possible error scenarios
// Case1 : Invalid Row
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents_with_style(0, 1, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case2 : Invalid Column
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents_with_style(1, 1048579, 1);
assert_eq!(update_result, Err("Incorrect row or column".to_string()));
// Case3 : Valid case
let update_result = model
.workbook
.worksheet_mut(0)
.unwrap()
.cell_clear_contents_with_style(1, 1, 1);
assert_eq!(update_result, Ok(()))
}
#[test]
fn workbook_styles_get_style_error_handling() {
let model = new_empty_model();
// case 1 : Invalid index
assert_eq!(
model.workbook.styles.get_style(15),
Err("Invalid index provided".to_string())
);
}
#[test]
fn workbook_styles_get_style_without_quote_prefix_error_handling() {
let mut model = new_empty_model();
// case 1 : Invalid index
assert_eq!(
model.workbook.styles.get_style_without_quote_prefix(15),
Err("Invalid index provided".to_string())
);
}
#[test]
fn workbook_styles_get_style_with_format_error_handling() {
let mut model = new_empty_model();
// case 1 : Invalid index
assert_eq!(
model
.workbook
.styles
.get_style_with_format(15, "dummy_num_format"),
Err("Invalid index provided".to_string())
);
}
#[test]
fn workbook_styles_get_style_with_quote_prefix_handling() {
let mut model = new_empty_model();
// case 1 : Invalid index
assert_eq!(
model.workbook.styles.get_style_with_quote_prefix(15),
Err("Invalid index provided".to_string())
);
}

View File

@@ -5,16 +5,28 @@ use crate::{cell::CellValue, test::util::new_empty_model};
#[test] #[test]
fn test_currencies() { fn test_currencies() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "$100.348".to_string()); model
model.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string()); .set_user_input(0, 1, 1, "$100.348".to_string())
.unwrap();
model
.set_user_input(0, 1, 2, "=ISNUMBER(A1)".to_string())
.unwrap();
model.set_user_input(0, 2, 1, "$ 100.348".to_string()); model
model.set_user_input(0, 2, 2, "=ISNUMBER(A2)".to_string()); .set_user_input(0, 2, 1, "$ 100.348".to_string())
.unwrap();
model
.set_user_input(0, 2, 2, "=ISNUMBER(A2)".to_string())
.unwrap();
model.set_user_input(0, 3, 1, "100$".to_string()); model.set_user_input(0, 3, 1, "100$".to_string()).unwrap();
model.set_user_input(0, 3, 2, "=ISNUMBER(A3)".to_string()); model
.set_user_input(0, 3, 2, "=ISNUMBER(A3)".to_string())
.unwrap();
model.set_user_input(0, 4, 1, "3.1415926$".to_string()); model
.set_user_input(0, 4, 1, "3.1415926$".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -43,9 +55,9 @@ fn test_currencies() {
#[test] #[test]
fn scientific() { fn scientific() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "3e-4".to_string()); model.set_user_input(0, 1, 1, "3e-4".to_string()).unwrap();
model.set_user_input(0, 2, 1, "5e-4$".to_string()); model.set_user_input(0, 2, 1, "5e-4$".to_string()).unwrap();
model.set_user_input(0, 3, 1, "6e-4%".to_string()); model.set_user_input(0, 3, 1, "6e-4%".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -61,9 +73,13 @@ fn scientific() {
#[test] #[test]
fn test_percentage() { fn test_percentage() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 10, 1, "50%".to_string()); model.set_user_input(0, 10, 1, "50%".to_string()).unwrap();
model.set_user_input(0, 10, 2, "=ISNUMBER(A10)".to_string()); model
model.set_user_input(0, 11, 1, "55.759%".to_string()); .set_user_input(0, 10, 2, "=ISNUMBER(A10)".to_string())
.unwrap();
model
.set_user_input(0, 11, 1, "55.759%".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -81,8 +97,8 @@ fn test_percentage_ops() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "5%"); model._set("A1", "5%");
model._set("A2", "20%"); model._set("A2", "20%");
model.set_user_input(0, 3, 1, "=A1+A2".to_string()); model.set_user_input(0, 3, 1, "=A1+A2".to_string()).unwrap();
model.set_user_input(0, 4, 1, "=A1*A2".to_string()); model.set_user_input(0, 4, 1, "=A1*A2".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -93,11 +109,19 @@ fn test_percentage_ops() {
#[test] #[test]
fn test_numbers() { fn test_numbers() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "1,000,000".to_string()); model
.set_user_input(0, 1, 1, "1,000,000".to_string())
.unwrap();
model.set_user_input(0, 20, 1, "50,123.549".to_string()); model
model.set_user_input(0, 21, 1, "50,12.549".to_string()); .set_user_input(0, 20, 1, "50,123.549".to_string())
model.set_user_input(0, 22, 1, "1,234567".to_string()); .unwrap();
model
.set_user_input(0, 21, 1, "50,12.549".to_string())
.unwrap();
model
.set_user_input(0, 22, 1, "1,234567".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -131,7 +155,7 @@ fn test_numbers() {
#[test] #[test]
fn test_negative_numbers() { fn test_negative_numbers() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "-100".to_string()); model.set_user_input(0, 1, 1, "-100".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -144,15 +168,19 @@ fn test_negative_numbers() {
#[test] #[test]
fn test_negative_currencies() { fn test_negative_currencies() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "-$100".to_string()); model.set_user_input(0, 1, 1, "-$100".to_string()).unwrap();
model.set_user_input(0, 2, 1, "-$99.123".to_string()); model
.set_user_input(0, 2, 1, "-$99.123".to_string())
.unwrap();
// This is valid! // This is valid!
model.set_user_input(0, 3, 1, "$-345".to_string()); model.set_user_input(0, 3, 1, "$-345".to_string()).unwrap();
model.set_user_input(0, 1, 2, "-200$".to_string()); model.set_user_input(0, 1, 2, "-200$".to_string()).unwrap();
model.set_user_input(0, 2, 2, "-92.689$".to_string()); model
.set_user_input(0, 2, 2, "-92.689$".to_string())
.unwrap();
// This is valid! // This is valid!
model.set_user_input(0, 3, 2, "-22$".to_string()); model.set_user_input(0, 3, 2, "-22$".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -174,8 +202,10 @@ fn test_formulas() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "$100"); model._set("A1", "$100");
model._set("A2", "$200"); model._set("A2", "$200");
model.set_user_input(0, 3, 1, "=A1+A2".to_string()); model.set_user_input(0, 3, 1, "=A1+A2".to_string()).unwrap();
model.set_user_input(0, 4, 1, "=SUM(A1:A3)".to_string()); model
.set_user_input(0, 4, 1, "=SUM(A1:A3)".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -198,9 +228,9 @@ fn test_product() {
model._set("A2", "$5"); model._set("A2", "$5");
model._set("A3", "4"); model._set("A3", "4");
model.set_user_input(0, 1, 2, "=A1*A2".to_string()); model.set_user_input(0, 1, 2, "=A1*A2".to_string()).unwrap();
model.set_user_input(0, 2, 2, "=A1*A3".to_string()); model.set_user_input(0, 2, 2, "=A1*A3".to_string()).unwrap();
model.set_user_input(0, 3, 2, "=A1*3".to_string()); model.set_user_input(0, 3, 2, "=A1*3".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -216,10 +246,12 @@ fn test_division() {
model._set("A2", "$5"); model._set("A2", "$5");
model._set("A3", "4"); model._set("A3", "4");
model.set_user_input(0, 1, 2, "=A1/A2".to_string()); model.set_user_input(0, 1, 2, "=A1/A2".to_string()).unwrap();
model.set_user_input(0, 2, 2, "=A1/A3".to_string()); model.set_user_input(0, 2, 2, "=A1/A3".to_string()).unwrap();
model.set_user_input(0, 3, 2, "=A1/2".to_string()); model.set_user_input(0, 3, 2, "=A1/2".to_string()).unwrap();
model.set_user_input(0, 4, 2, "=100/A2".to_string()); model
.set_user_input(0, 4, 2, "=100/A2".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -235,54 +267,54 @@ fn test_some_complex_examples() {
// $3.00 / 2 = $1.50 // $3.00 / 2 = $1.50
model._set("A1", "$3.00"); model._set("A1", "$3.00");
model._set("A2", "2"); model._set("A2", "2");
model.set_user_input(0, 3, 1, "=A1/A2".to_string()); model.set_user_input(0, 3, 1, "=A1/A2".to_string()).unwrap();
// $3 / 2 = $1 // $3 / 2 = $1
model._set("B1", "$3"); model._set("B1", "$3");
model._set("B2", "2"); model._set("B2", "2");
model.set_user_input(0, 3, 2, "=B1/B2".to_string()); model.set_user_input(0, 3, 2, "=B1/B2".to_string()).unwrap();
// $5.00 * 25% = 25% * $5.00 = $1.25 // $5.00 * 25% = 25% * $5.00 = $1.25
model._set("C1", "$5.00"); model._set("C1", "$5.00");
model._set("C2", "25%"); model._set("C2", "25%");
model.set_user_input(0, 3, 3, "=C1*C2".to_string()); model.set_user_input(0, 3, 3, "=C1*C2".to_string()).unwrap();
model.set_user_input(0, 4, 3, "=C2*C1".to_string()); model.set_user_input(0, 4, 3, "=C2*C1".to_string()).unwrap();
// $5 * 75% = 75% * $5 = $1 // $5 * 75% = 75% * $5 = $1
model._set("D1", "$5"); model._set("D1", "$5");
model._set("D2", "75%"); model._set("D2", "75%");
model.set_user_input(0, 3, 4, "=D1*D2".to_string()); model.set_user_input(0, 3, 4, "=D1*D2".to_string()).unwrap();
model.set_user_input(0, 4, 4, "=D2*D1".to_string()); model.set_user_input(0, 4, 4, "=D2*D1".to_string()).unwrap();
// $10 + $9.99 = $9.99 + $10 = $19.99 // $10 + $9.99 = $9.99 + $10 = $19.99
model._set("E1", "$10"); model._set("E1", "$10");
model._set("E2", "$9.99"); model._set("E2", "$9.99");
model.set_user_input(0, 3, 5, "=E1+E2".to_string()); model.set_user_input(0, 3, 5, "=E1+E2".to_string()).unwrap();
model.set_user_input(0, 4, 5, "=E2+E1".to_string()); model.set_user_input(0, 4, 5, "=E2+E1".to_string()).unwrap();
// $2 * 2 = 2 * $2 = $4 // $2 * 2 = 2 * $2 = $4
model._set("F1", "$2"); model._set("F1", "$2");
model._set("F2", "2"); model._set("F2", "2");
model.set_user_input(0, 3, 6, "=F1*F2".to_string()); model.set_user_input(0, 3, 6, "=F1*F2".to_string()).unwrap();
model.set_user_input(0, 4, 6, "=F2*F1".to_string()); model.set_user_input(0, 4, 6, "=F2*F1".to_string()).unwrap();
// $2.50 * 2 = 2 * $2.50 = $5.00 // $2.50 * 2 = 2 * $2.50 = $5.00
model._set("G1", "$2.50"); model._set("G1", "$2.50");
model._set("G2", "2"); model._set("G2", "2");
model.set_user_input(0, 3, 7, "=G1*G2".to_string()); model.set_user_input(0, 3, 7, "=G1*G2".to_string()).unwrap();
model.set_user_input(0, 4, 7, "=G2*G1".to_string()); model.set_user_input(0, 4, 7, "=G2*G1".to_string()).unwrap();
// $2 * 2.5 = 2.5 * $2 = $5 // $2 * 2.5 = 2.5 * $2 = $5
model._set("H1", "$2"); model._set("H1", "$2");
model._set("H2", "2.5"); model._set("H2", "2.5");
model.set_user_input(0, 3, 8, "=H1*H2".to_string()); model.set_user_input(0, 3, 8, "=H1*H2".to_string()).unwrap();
model.set_user_input(0, 4, 8, "=H2*H1".to_string()); model.set_user_input(0, 4, 8, "=H2*H1".to_string()).unwrap();
// 10% * 1,000 = 1,000 * 10% = 100 // 10% * 1,000 = 1,000 * 10% = 100
model._set("I1", "10%"); model._set("I1", "10%");
model._set("I2", "1,000"); model._set("I2", "1,000");
model.set_user_input(0, 3, 9, "=I1*I2".to_string()); model.set_user_input(0, 3, 9, "=I1*I2".to_string()).unwrap();
model.set_user_input(0, 4, 9, "=I2*I1".to_string()); model.set_user_input(0, 4, 9, "=I2*I1".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -320,9 +352,15 @@ fn test_financial_functions() {
model._set("A3", "10"); model._set("A3", "10");
model._set("A4", "$10,000"); model._set("A4", "$10,000");
model.set_user_input(0, 5, 1, "=PMT(A2/12,A3,A4)".to_string()); model
model.set_user_input(0, 6, 1, "=PMT(A2/12,A3,A4,,1)".to_string()); .set_user_input(0, 5, 1, "=PMT(A2/12,A3,A4)".to_string())
model.set_user_input(0, 7, 1, "=PMT(0.2, 3, -200)".to_string()); .unwrap();
model
.set_user_input(0, 6, 1, "=PMT(A2/12,A3,A4,,1)".to_string())
.unwrap();
model
.set_user_input(0, 7, 1, "=PMT(0.2, 3, -200)".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -339,9 +377,15 @@ fn test_sum_function() {
model._set("A1", "$100"); model._set("A1", "$100");
model._set("A2", "$300"); model._set("A2", "$300");
model.set_user_input(0, 1, 2, "=SUM(A:A)".to_string()); model
model.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string()); .set_user_input(0, 1, 2, "=SUM(A:A)".to_string())
model.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string()); .unwrap();
model
.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string())
.unwrap();
model
.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -353,7 +397,7 @@ fn test_sum_function() {
#[test] #[test]
fn test_number() { fn test_number() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "3".to_string()); model.set_user_input(0, 1, 1, "3".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -367,7 +411,9 @@ fn test_number() {
#[test] #[test]
fn test_currencies_eur_prefix() { fn test_currencies_eur_prefix() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "€100.348".to_string()); model
.set_user_input(0, 1, 1, "€100.348".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -381,19 +427,27 @@ fn test_currencies_eur_prefix() {
#[test] #[test]
fn test_currencies_eur_suffix() { fn test_currencies_eur_suffix() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "100.348€".to_string()); model
model.set_user_input(0, 2, 1, "25".to_string()); .set_user_input(0, 1, 1, "100.348".to_string())
.unwrap();
model.set_user_input(0, 2, 1, "25€".to_string()).unwrap();
// negatives // negatives
model.set_user_input(0, 1, 2, "-123.348€".to_string()); model
model.set_user_input(0, 2, 2, "-42".to_string()); .set_user_input(0, 1, 2, "-123.348".to_string())
.unwrap();
model.set_user_input(0, 2, 2, "-42€".to_string()).unwrap();
// with a space // with a space
model.set_user_input(0, 1, 3, "101.348 €".to_string()); model
model.set_user_input(0, 2, 3, "26".to_string()); .set_user_input(0, 1, 3, "101.348".to_string())
.unwrap();
model.set_user_input(0, 2, 3, "26 €".to_string()).unwrap();
model.set_user_input(0, 1, 4, "-12.348 €".to_string()); model
model.set_user_input(0, 2, 4, "-45".to_string()); .set_user_input(0, 1, 4, "-12.348".to_string())
.unwrap();
model.set_user_input(0, 2, 4, "-45 €".to_string()).unwrap();
model.evaluate(); model.evaluate();
@@ -449,9 +503,15 @@ fn test_sum_function_eur() {
model._set("A1", "€100"); model._set("A1", "€100");
model._set("A2", "€300"); model._set("A2", "€300");
model.set_user_input(0, 1, 2, "=SUM(A:A)".to_string()); model
model.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string()); .set_user_input(0, 1, 2, "=SUM(A:A)".to_string())
model.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string()); .unwrap();
model
.set_user_input(0, 2, 2, "=SUM(A1:A2)".to_string())
.unwrap();
model
.set_user_input(0, 3, 2, "=SUM(A1, A2, A3)".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -463,7 +523,9 @@ fn test_sum_function_eur() {
#[test] #[test]
fn input_dates() { fn input_dates() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.set_user_input(0, 1, 1, "3/4/2025".to_string()); model
.set_user_input(0, 1, 1, "3/4/2025".to_string())
.unwrap();
model.evaluate(); model.evaluate();
@@ -474,7 +536,9 @@ fn input_dates() {
); );
// further date assignments do not change the format // further date assignments do not change the format
model.set_user_input(0, 1, 1, "08-08-2028".to_string()); model
.set_user_input(0, 1, 1, "08-08-2028".to_string())
.unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "8/8/2028"); assert_eq!(model._get_text("A1"), "8/8/2028");
} }

View File

@@ -14,14 +14,14 @@ fn test_sheet_markup() {
model._set("A4", "Total"); model._set("A4", "Total");
model._set("B4", "=SUM(B2:B3)"); model._set("B4", "=SUM(B2:B3)");
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
style.font.b = true; style.font.b = true;
model.set_cell_style(0, 1, 1, &style).unwrap(); model.set_cell_style(0, 1, 1, &style).unwrap();
model.set_cell_style(0, 1, 2, &style).unwrap(); model.set_cell_style(0, 1, 2, &style).unwrap();
model.set_cell_style(0, 4, 1, &style).unwrap(); model.set_cell_style(0, 4, 1, &style).unwrap();
assert_eq!( assert_eq!(
model.sheet_markup(0), model.get_sheet_markup(0),
Ok("**Item**|**Cost**\nRent|$600\nElectricity|$200\n**Total**|=SUM(B2:B3)".to_string()), Ok("**Item**|**Cost**\nRent|$600\nElectricity|$200\n**Total**|=SUM(B2:B3)".to_string()),
) )
} }

View File

@@ -138,14 +138,14 @@ fn test_insert_sheet() {
// Insert the sheet at the end and check the formula // Insert the sheet at the end and check the formula
assert!(model.insert_sheet("Bacchus", 1, None).is_ok()); assert!(model.insert_sheet("Bacchus", 1, None).is_ok());
model.set_user_input(1, 3, 1, "42".to_string()); model.set_user_input(1, 3, 1, "42".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "42"); assert_eq!(model._get_text("A1"), "42");
assert_eq!(model._get_text("A2"), "#REF!"); assert_eq!(model._get_text("A2"), "#REF!");
// Insert a sheet in between the other two // Insert a sheet in between the other two
assert!(model.insert_sheet("Dionysus", 1, None).is_ok()); assert!(model.insert_sheet("Dionysus", 1, None).is_ok());
model.set_user_input(1, 3, 1, "111".to_string()); model.set_user_input(1, 3, 1, "111".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "42"); assert_eq!(model._get_text("A1"), "42");
assert_eq!(model._get_text("A2"), "111"); assert_eq!(model._get_text("A2"), "111");
@@ -176,7 +176,7 @@ fn test_rename_sheet() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.new_sheet(); model.new_sheet();
model._set("A1", "=NewSheet!A3"); model._set("A1", "=NewSheet!A3");
model.set_user_input(1, 3, 1, "25".to_string()); model.set_user_input(1, 3, 1, "25".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "#REF!"); assert_eq!(model._get_text("A1"), "#REF!");
assert!(model.rename_sheet("Sheet2", "NewSheet").is_ok()); assert!(model.rename_sheet("Sheet2", "NewSheet").is_ok());
@@ -189,7 +189,7 @@ fn test_rename_sheet_by_index() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model.new_sheet(); model.new_sheet();
model._set("A1", "=NewSheet!A1"); model._set("A1", "=NewSheet!A1");
model.set_user_input(1, 1, 1, "25".to_string()); model.set_user_input(1, 1, 1, "25".to_string()).unwrap();
model.evaluate(); model.evaluate();
assert_eq!(model._get_text("A1"), "#REF!"); assert_eq!(model._get_text("A1"), "#REF!");
assert!(model.rename_sheet_by_index(1, "NewSheet").is_ok()); assert!(model.rename_sheet_by_index(1, "NewSheet").is_ok());
@@ -236,3 +236,11 @@ fn test_delete_sheet_by_index() {
assert_eq!(model.workbook.get_worksheet_names(), ["Sheet2"]); assert_eq!(model.workbook.get_worksheet_names(), ["Sheet2"]);
assert_eq!(model._get_text("Sheet2!A1"), "#REF!"); assert_eq!(model._get_text("Sheet2!A1"), "#REF!");
} }
#[test]
fn delete_sheet_error() {
let mut model = new_empty_model();
model.new_sheet();
assert!(model.delete_sheet(2).is_err());
assert!(model.delete_sheet(1).is_ok());
}

View File

@@ -7,10 +7,10 @@ use crate::types::Style;
fn test_model_set_cells_with_values_styles() { fn test_model_set_cells_with_values_styles() {
let mut model = new_empty_model(); let mut model = new_empty_model();
// Inputs // Inputs
model.set_user_input(0, 1, 1, "21".to_string()); // A1 model.set_user_input(0, 1, 1, "21".to_string()).unwrap(); // A1
model.set_user_input(0, 2, 1, "42".to_string()); // A2 model.set_user_input(0, 2, 1, "42".to_string()).unwrap(); // A2
let style_base = model.get_style_for_cell(0, 1, 1); let style_base = model.get_style_for_cell(0, 1, 1).unwrap();
let mut style = style_base.clone(); let mut style = style_base.clone();
style.font.b = true; style.font.b = true;
style.num_fmt = "#,##0.00".to_string(); style.num_fmt = "#,##0.00".to_string();
@@ -19,7 +19,7 @@ fn test_model_set_cells_with_values_styles() {
let mut style = style_base; let mut style = style_base;
style.num_fmt = "#,##0.00".to_string(); style.num_fmt = "#,##0.00".to_string();
assert!(model.set_cell_style(0, 2, 1, &style).is_ok()); assert!(model.set_cell_style(0, 2, 1, &style).is_ok());
let style: Style = model.get_style_for_cell(0, 2, 1); let style: Style = model.get_style_for_cell(0, 2, 1).unwrap();
assert_eq!(style.num_fmt, "#,##0.00".to_string()); assert_eq!(style.num_fmt, "#,##0.00".to_string());
} }
@@ -27,21 +27,21 @@ fn test_model_set_cells_with_values_styles() {
fn test_named_styles() { fn test_named_styles() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "42"); model._set("A1", "42");
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
style.font.b = true; style.font.b = true;
assert!(model.set_cell_style(0, 1, 1, &style).is_ok()); assert!(model.set_cell_style(0, 1, 1, &style).is_ok());
let bold_style_index = model.get_cell_style_index(0, 1, 1); let bold_style_index = model.get_cell_style_index(0, 1, 1).unwrap();
let e = model let e = model
.workbook .workbook
.styles .styles
.add_named_cell_style("bold", bold_style_index); .add_named_cell_style("bold", bold_style_index);
assert!(e.is_ok()); assert!(e.is_ok());
model._set("A2", "420"); model._set("A2", "420");
let a2_style_index = model.get_cell_style_index(0, 2, 1); let a2_style_index = model.get_cell_style_index(0, 2, 1).unwrap();
assert!(a2_style_index != bold_style_index); assert!(a2_style_index != bold_style_index);
let e = model.set_cell_style_by_name(0, 2, 1, "bold"); let e = model.set_cell_style_by_name(0, 2, 1, "bold");
assert!(e.is_ok()); assert!(e.is_ok());
assert_eq!(model.get_cell_style_index(0, 2, 1), bold_style_index); assert_eq!(model.get_cell_style_index(0, 2, 1), Ok(bold_style_index));
} }
#[test] #[test]
@@ -49,7 +49,7 @@ fn test_create_named_style() {
let mut model = new_empty_model(); let mut model = new_empty_model();
model._set("A1", "42"); model._set("A1", "42");
let mut style = model.get_style_for_cell(0, 1, 1); let mut style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(!style.font.b); assert!(!style.font.b);
style.font.b = true; style.font.b = true;
@@ -59,6 +59,6 @@ fn test_create_named_style() {
let e = model.set_cell_style_by_name(0, 1, 1, "bold"); let e = model.set_cell_style_by_name(0, 1, 1, "bold");
assert!(e.is_ok()); assert!(e.is_ok());
let style = model.get_style_for_cell(0, 1, 1); let style = model.get_style_for_cell(0, 1, 1).unwrap();
assert!(style.font.b); assert!(style.font.b);
} }

Some files were not shown because too many files have changed in this diff Show More