Compare commits

...

7 Commits

Author SHA1 Message Date
Nicolás Hatcher
96a5482e01 FIX: Don not clone Locales and Languages, pass them by reference 2025-12-14 20:38:08 +01:00
Nicolás Hatcher
ffe5d1a158 UPDATE: Adds bindings to update timezone and locale
UPDATE: Update "generate locale" utility

FIX: Minor fixes to UI and proper support for locales/timezones

UPDATE: Adds "display language" setting to core
2025-12-13 08:12:11 +01:00
Daniel
402a13bd00 fix: mobile adjustments 2025-12-13 05:20:59 +01:00
Daniel
a345d7c9ac fix: force default values 2025-12-13 05:20:59 +01:00
Daniel
3fd55bb5c9 update: add dropdowns to content 2025-12-13 05:20:59 +01:00
Daniel
bab24a5207 update: open dialog from footer 2025-12-13 05:20:59 +01:00
Daniel
5288665f70 update: add a dialog for settings 2025-12-13 05:20:59 +01:00
164 changed files with 5384 additions and 3287 deletions

View File

@@ -1,7 +1,7 @@
use ironcalc_base::{types::CellType, Model};
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", "en")?;
// A1
model.set_user_input(0, 1, 1, "1".to_string())?;
// A2

View File

@@ -1,7 +1,7 @@
use ironcalc_base::{cell::CellValue, Model};
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", "en")?;
// A1
model.set_user_input(0, 1, 1, "Hello".to_string())?;
// B1

View File

@@ -1,5 +1,7 @@
use crate::constants::{LAST_COLUMN, LAST_ROW};
use crate::expressions::parser::stringify::{to_string, to_string_displaced, DisplaceData};
use crate::expressions::parser::stringify::{
to_localized_string, to_string_displaced, DisplaceData,
};
use crate::expressions::types::CellReferenceRC;
use crate::model::Model;
@@ -8,7 +10,7 @@ use crate::model::Model;
// In IronCalc, if one of the edges of the range is deleted will replace the edge with #REF!
// I feel this is unimportant for now.
impl Model {
impl<'a> Model<'a> {
fn shift_cell_formula(
&mut self,
sheet: u32,
@@ -29,7 +31,7 @@ impl Model {
column,
};
// FIXME: This is not a very performant way if the formula has changed :S.
let formula = to_string(node, &cell_reference);
let formula = to_localized_string(node, &cell_reference, self.locale, self.language);
let formula_displaced = to_string_displaced(node, &cell_reference, displace_data);
if formula != formula_displaced {
self.update_cell_with_formula(sheet, row, column, format!("={formula_displaced}"))?;
@@ -108,7 +110,9 @@ impl Model {
// FIXME: we need some user_input getter instead of get_text
let formula_or_value = self
.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_localized_text(&self.workbook.shared_strings, self.language)
});
self.set_user_input(sheet, target_row, target_column, formula_or_value)?;
self.workbook
.worksheet_mut(sheet)?
@@ -490,9 +494,11 @@ impl Model {
.cell(r.row, column)
.ok_or("Expected Cell to exist")?;
let style_idx = cell.get_style();
let formula_or_value = self
.get_cell_formula(sheet, r.row, column)?
.unwrap_or_else(|| cell.get_text(&self.workbook.shared_strings, &self.language));
let formula_or_value =
self.get_cell_formula(sheet, r.row, column)?
.unwrap_or_else(|| {
cell.get_localized_text(&self.workbook.shared_strings, self.language)
});
original_cells.push((r.row, formula_or_value, style_idx));
self.cell_clear_all(sheet, r.row, column)?;
}
@@ -577,9 +583,9 @@ impl Model {
.cell(row, *c)
.ok_or("Expected Cell to exist")?;
let style_idx = cell.get_style();
let formula_or_value = self
.get_cell_formula(sheet, row, *c)?
.unwrap_or_else(|| cell.get_text(&self.workbook.shared_strings, &self.language));
let formula_or_value = self.get_cell_formula(sheet, row, *c)?.unwrap_or_else(|| {
cell.get_localized_text(&self.workbook.shared_strings, self.language)
});
original_cells.push((*c, formula_or_value, style_idx));
self.cell_clear_all(sheet, row, *c)?;
}

View File

@@ -22,7 +22,7 @@ fn to_f64(value: &ArrayNode) -> Result<f64, Error> {
}
}
impl Model {
impl<'a> Model<'a> {
/// Applies `op` elementwise for arrays/numbers.
pub(crate) fn handle_arithmetic(
&mut self,

View File

@@ -14,7 +14,7 @@ pub(crate) enum NumberOrArray {
Array(Vec<Vec<ArrayNode>>),
}
impl Model {
impl<'a> Model<'a> {
pub(crate) fn cast_number(&self, s: &str) -> Option<f64> {
match s.trim().parse::<f64>() {
Ok(f) => Some(f),
@@ -24,8 +24,16 @@ impl Model {
if !currencies.iter().any(|e| *e == currency) {
currencies.push(currency);
}
let (decimal_separator, group_separator) =
if self.locale.numbers.symbols.decimal == "," {
(b',', b'.')
} else {
(b'.', b',')
};
// Try to parse as a formatted number (e.g., dates, currencies, percentages)
if let Ok((v, _number_format)) = parse_formatted_number(s, &currencies) {
if let Ok((v, _number_format)) =
parse_formatted_number(s, &currencies, decimal_separator, group_separator)
{
return Some(v);
}
None

View File

@@ -122,11 +122,17 @@ impl Cell {
}
}
pub fn get_text(&self, shared_strings: &[String], language: &Language) -> String {
pub fn get_localized_text(&self, shared_strings: &[String], language: &Language) -> String {
match self.value(shared_strings, language) {
CellValue::None => "".to_string(),
CellValue::String(v) => v,
CellValue::Boolean(v) => v.to_string().to_uppercase(),
CellValue::Boolean(v) => {
if v {
language.booleans.r#true.to_string()
} else {
language.booleans.r#false.to_string()
}
}
CellValue::Number(v) => to_excel_precision_str(v),
}
}
@@ -171,7 +177,13 @@ impl Cell {
match self.value(shared_strings, language) {
CellValue::None => "".to_string(),
CellValue::String(value) => value,
CellValue::Boolean(value) => value.to_string().to_uppercase(),
CellValue::Boolean(value) => {
if value {
language.booleans.r#true.to_string()
} else {
language.booleans.r#false.to_string()
}
}
CellValue::Number(value) => format_number(value),
}
}

View File

@@ -79,19 +79,24 @@ pub enum LexerMode {
/// Tokenize an input
#[derive(Clone)]
pub struct Lexer {
pub struct Lexer<'a> {
position: usize,
next_token_position: Option<usize>,
len: usize,
chars: Vec<char>,
mode: LexerMode,
locale: Locale,
language: Language,
locale: &'a Locale,
language: &'a Language,
}
impl Lexer {
impl<'a> Lexer<'a> {
/// Creates a new `Lexer` that returns the tokens of a formula.
pub fn new(formula: &str, mode: LexerMode, locale: &Locale, language: &Language) -> Lexer {
pub fn new(
formula: &str,
mode: LexerMode,
locale: &'a Locale,
language: &'a Language,
) -> Lexer<'a> {
let chars: Vec<char> = formula.chars().collect();
let len = chars.len();
Lexer {
@@ -100,8 +105,8 @@ impl Lexer {
next_token_position: None,
len,
mode,
locale: locale.clone(),
language: language.clone(),
locale,
language,
}
}
@@ -110,6 +115,16 @@ impl Lexer {
self.mode = mode;
}
/// Sets the locale
pub fn set_locale(&mut self, locale: &'a Locale) {
self.locale = locale;
}
/// Sets the language
pub fn set_language(&mut self, language: &'a Language) {
self.language = language;
}
// FIXME: I don't think we should have `is_a1_mode` and `get_formula`.
// The caller already knows those two
@@ -188,6 +203,7 @@ impl Lexer {
':' => TokenType::Colon,
';' => TokenType::Semicolon,
'@' => TokenType::At,
'\\' => TokenType::Backslash,
',' => {
if self.locale.numbers.symbols.decimal == "," {
match self.consume_number(',') {

View File

@@ -4,7 +4,7 @@ use crate::expressions::{token::TokenType, utils::column_to_number};
use super::Lexer;
use super::{ParsedRange, ParsedReference, Result};
impl Lexer {
impl<'a> Lexer<'a> {
/// Consumes a reference in A1 style like:
/// AS23, $AS23, AS$23, $AS$23, R12
/// Or returns an error

View File

@@ -16,7 +16,7 @@ use crate::expressions::token::{TableReference, TableSpecifier};
use super::Result;
use super::{Lexer, LexerError};
impl Lexer {
impl<'a> Lexer<'a> {
fn consume_table_specifier(&mut self) -> Result<Option<TableSpecifier>> {
if self.peek_char() == Some('#') {
// It's a specifier

View File

@@ -11,7 +11,7 @@ use crate::expressions::{
types::ParsedReference,
};
fn new_lexer(formula: &str, a1_mode: bool) -> Lexer {
fn new_lexer(formula: &str, a1_mode: bool) -> Lexer<'_> {
let locale = get_locale("en").unwrap();
let language = get_language("en").unwrap();
let mode = if a1_mode {
@@ -655,7 +655,9 @@ fn test_comma() {
// Used for testing locales where the comma is the decimal separator
let mut lx = new_lexer("12,34", false);
lx.locale.numbers.symbols.decimal = ",".to_string();
let locale = get_locale("de").unwrap();
lx.locale = locale;
assert_eq!(lx.next_token(), Number(12.34));
assert_eq!(lx.next_token(), EOF);
}

View File

@@ -7,7 +7,7 @@ use crate::expressions::{
use crate::language::get_language;
use crate::locale::get_locale;
fn new_lexer(formula: &str) -> Lexer {
fn new_lexer(formula: &str) -> Lexer<'_> {
let locale = get_locale("en").unwrap();
let language = get_language("en").unwrap();
Lexer::new(formula, LexerMode::A1, locale, language)

View File

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

View File

@@ -9,7 +9,7 @@ use crate::{
locale::get_locale,
};
fn new_language_lexer(formula: &str, locale: &str, language: &str) -> Lexer {
fn new_language_lexer<'a>(formula: &str, locale: &str, language: &str) -> Lexer<'a> {
let locale = get_locale(locale).unwrap();
let language = get_language(language).unwrap();
Lexer::new(formula, LexerMode::A1, locale, language)

View File

@@ -10,7 +10,7 @@ use crate::expressions::{
use crate::language::get_language;
use crate::locale::get_locale;
fn new_lexer(formula: &str) -> Lexer {
fn new_lexer(formula: &str) -> Lexer<'_> {
let locale = get_locale("en").unwrap();
let language = get_language("en").unwrap();
Lexer::new(formula, LexerMode::A1, locale, language)

View File

@@ -7,7 +7,7 @@ use crate::expressions::{
use crate::language::get_language;
use crate::locale::get_locale;
fn new_lexer(formula: &str) -> Lexer {
fn new_lexer(formula: &str) -> Lexer<'_> {
let locale = get_locale("en").unwrap();
let language = get_language("en").unwrap();
Lexer::new(formula, LexerMode::A1, locale, language)

View File

@@ -31,8 +31,12 @@ f_args => e (',' e)*
use std::collections::HashMap;
use crate::functions::Function;
use crate::language::get_default_language;
use crate::language::get_language;
use crate::language::Language;
use crate::locale::get_default_locale;
use crate::locale::get_locale;
use crate::locale::Locale;
use crate::types::Table;
use super::lexer;
@@ -202,28 +206,35 @@ pub enum Node {
}
#[derive(Clone)]
pub struct Parser {
lexer: lexer::Lexer,
pub struct Parser<'a> {
lexer: lexer::Lexer<'a>,
worksheets: Vec<String>,
defined_names: Vec<DefinedNameS>,
context: CellReferenceRC,
tables: HashMap<String, Table>,
locale: &'a Locale,
language: &'a Language,
}
impl Parser {
pub fn new_parser_english<'a>(
worksheets: Vec<String>,
defined_names: Vec<DefinedNameS>,
tables: HashMap<String, Table>,
) -> Parser<'a> {
let locale = get_default_locale();
let language = get_default_language();
Parser::new(worksheets, defined_names, tables, locale, language)
}
impl<'a> Parser<'a> {
pub fn new(
worksheets: Vec<String>,
defined_names: Vec<DefinedNameS>,
tables: HashMap<String, Table>,
) -> Parser {
let lexer = lexer::Lexer::new(
"",
lexer::LexerMode::A1,
#[allow(clippy::expect_used)]
get_locale("en").expect(""),
#[allow(clippy::expect_used)]
get_language("en").expect(""),
);
locale: &'a Locale,
language: &'a Language,
) -> Parser<'a> {
let lexer = lexer::Lexer::new("", lexer::LexerMode::A1, locale, language);
let context = CellReferenceRC {
sheet: worksheets.first().map_or("", |v| v).to_string(),
column: 1,
@@ -235,12 +246,24 @@ impl Parser {
defined_names,
context,
tables,
locale,
language,
}
}
pub fn set_lexer_mode(&mut self, mode: lexer::LexerMode) {
self.lexer.set_lexer_mode(mode)
}
pub fn set_locale(&mut self, locale: &'a Locale) {
self.locale = locale;
self.lexer.set_locale(locale);
}
pub fn set_language(&mut self, language: &'a Language) {
self.language = language;
self.lexer.set_language(language);
}
pub fn set_worksheets_and_names(
&mut self,
worksheets: Vec<String>,
@@ -256,6 +279,27 @@ impl Parser {
self.parse_expr()
}
// Returns the token used to separate arguments in functions and arrays
// If the locale decimal separator is '.', then it is a comma ','
// Otherwise, it is a semicolon ';'
fn get_argument_separator_token(&self) -> TokenType {
if self.locale.numbers.symbols.decimal == "." {
TokenType::Comma
} else {
TokenType::Semicolon
}
}
// Returns the token used to separate columns in arrays
// If the locale decimal separator is '.', then it is a semicolon ';'
fn get_column_separator_token(&self) -> TokenType {
if self.locale.numbers.symbols.decimal == "." {
TokenType::Semicolon
} else {
TokenType::Backslash
}
}
fn get_sheet_index_by_name(&self, name: &str) -> Option<u32> {
let worksheets = &self.worksheets;
for (i, sheet) in worksheets.iter().enumerate() {
@@ -464,6 +508,7 @@ impl Parser {
fn parse_array_row(&mut self) -> Result<Vec<ArrayNode>, Node> {
let mut row = Vec::new();
let column_separator_token = self.get_argument_separator_token();
// and array can only have numbers, string or booleans
// otherwise it is a syntax error
let first_element = match self.parse_expr() {
@@ -496,8 +541,7 @@ impl Parser {
};
row.push(first_element);
let mut next_token = self.lexer.peek_token();
// FIXME: this is not respecting the locale
while next_token == TokenType::Comma {
while next_token == column_separator_token {
self.lexer.advance_token();
let value = match self.parse_expr() {
Node::BooleanKind(s) => ArrayNode::Boolean(s),
@@ -555,6 +599,7 @@ impl Parser {
TokenType::String(s) => Node::StringKind(s),
TokenType::LeftBrace => {
// It's an array. It's a collection of rows all of the same dimension
let column_separator_token = self.get_column_separator_token();
let first_row = match self.parse_array_row() {
Ok(s) => s,
@@ -564,9 +609,8 @@ impl Parser {
let mut matrix = Vec::new();
matrix.push(first_row);
// FIXME: this is not respecting the locale
let mut next_token = self.lexer.peek_token();
while next_token == TokenType::Semicolon {
while next_token == column_separator_token {
self.lexer.advance_token();
let row = match self.parse_array_row() {
Ok(s) => s,
@@ -715,12 +759,7 @@ impl Parser {
message: err.message,
};
}
if let Some(function_kind) = Function::get_function(&name) {
return Node::FunctionKind {
kind: function_kind,
args,
};
}
// We should do this *only* importing functions from xlsx
if &name == "_xlfn.SINGLE" {
if args.len() != 1 {
return Node::ParseErrorKind {
@@ -735,6 +774,17 @@ impl Parser {
child: Box::new(args[0].clone()),
};
}
// We should do this *only* importing functions from xlsx
if let Some(function_kind) = self
.language
.functions
.lookup(name.trim_start_matches("_xlfn."))
{
return Node::FunctionKind {
kind: function_kind,
args,
};
}
return Node::InvalidFunctionKind { name, args };
}
let context = &self.context;
@@ -849,6 +899,7 @@ impl Parser {
| TokenType::RightBracket
| TokenType::Colon
| TokenType::Semicolon
| TokenType::Backslash
| TokenType::RightBrace
| TokenType::Comma
| TokenType::Bang
@@ -1048,12 +1099,13 @@ impl Parser {
}
fn parse_function_args(&mut self) -> Result<Vec<Node>, Node> {
let arg_separator_token = &self.get_argument_separator_token();
let mut args: Vec<Node> = Vec::new();
let mut next_token = self.lexer.peek_token();
if next_token == TokenType::RightParenthesis {
return Ok(args);
}
if self.lexer.peek_token() == TokenType::Comma {
if &self.lexer.peek_token() == arg_separator_token {
args.push(Node::EmptyArgKind);
} else {
let t = self.parse_expr();
@@ -1063,11 +1115,11 @@ impl Parser {
args.push(t);
}
next_token = self.lexer.peek_token();
while next_token == TokenType::Comma {
while &next_token == arg_separator_token {
self.lexer.advance_token();
if self.lexer.peek_token() == TokenType::Comma {
if &self.lexer.peek_token() == arg_separator_token {
args.push(Node::EmptyArgKind);
next_token = TokenType::Comma;
next_token = arg_separator_token.clone();
} else if self.lexer.peek_token() == TokenType::RightParenthesis {
args.push(Node::EmptyArgKind);
return Ok(args);

View File

@@ -5,6 +5,8 @@ use super::{
use crate::{
constants::{LAST_COLUMN, LAST_ROW},
expressions::token::OpUnary,
language::Language,
locale::Locale,
};
use crate::{
expressions::types::{Area, CellReferenceRC},
@@ -38,38 +40,78 @@ pub(crate) struct MoveContext<'a> {
/// We are moving a formula in (row, column) to (row+row_delta, column + column_delta).
/// All references that do not point to a cell in area will be left untouched.
/// All references that point to a cell in area will be displaced
pub(crate) fn move_formula(node: &Node, move_context: &MoveContext) -> String {
to_string_moved(node, move_context)
pub(crate) fn move_formula(
node: &Node,
move_context: &MoveContext,
locale: &Locale,
language: &Language,
) -> String {
to_string_moved(node, move_context, locale, language)
}
fn move_function(name: &str, args: &Vec<Node>, move_context: &MoveContext) -> String {
fn move_function(
name: &str,
args: &Vec<Node>,
move_context: &MoveContext,
locale: &Locale,
language: &Language,
) -> String {
let mut first = true;
let mut arguments = "".to_string();
for el in args {
if !first {
arguments = format!("{},{}", arguments, to_string_moved(el, move_context));
arguments = format!(
"{},{}",
arguments,
to_string_moved(el, move_context, locale, language)
);
} else {
first = false;
arguments = to_string_moved(el, move_context);
arguments = to_string_moved(el, move_context, locale, language);
}
}
format!("{name}({arguments})")
}
pub(crate) fn to_string_array_node(node: &ArrayNode) -> String {
fn format_number_locale(number: f64, locale: &Locale) -> String {
let s = to_excel_precision_str(number);
let decimal = &locale.numbers.symbols.decimal;
if decimal == "." {
s
} else {
s.replace('.', decimal)
}
}
pub(crate) fn to_string_array_node(
node: &ArrayNode,
locale: &Locale,
language: &Language,
) -> String {
match node {
ArrayNode::Boolean(value) => format!("{value}").to_ascii_uppercase(),
ArrayNode::Number(number) => to_excel_precision_str(*number),
ArrayNode::Boolean(value) => {
if *value {
language.booleans.r#true.to_ascii_uppercase()
} else {
language.booleans.r#false.to_ascii_uppercase()
}
}
ArrayNode::Number(number) => format_number_locale(*number, locale),
ArrayNode::String(value) => format!("\"{value}\""),
ArrayNode::Error(kind) => format!("{kind}"),
}
}
fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
fn to_string_moved(
node: &Node,
move_context: &MoveContext,
locale: &Locale,
language: &Language,
) -> String {
use self::Node::*;
match node {
BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
NumberKind(number) => to_excel_precision_str(*number),
NumberKind(number) => format_number_locale(*number, locale),
StringKind(value) => format!("\"{value}\""),
ReferenceKind {
sheet_name,
@@ -329,55 +371,81 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
}
OpRangeKind { left, right } => format!(
"{}:{}",
to_string_moved(left, move_context),
to_string_moved(right, move_context),
to_string_moved(left, move_context, locale, language),
to_string_moved(right, move_context, locale, language),
),
OpConcatenateKind { left, right } => format!(
"{}&{}",
to_string_moved(left, move_context),
to_string_moved(right, move_context),
to_string_moved(left, move_context, locale, language),
to_string_moved(right, move_context, locale, language),
),
OpSumKind { kind, left, right } => format!(
"{}{}{}",
to_string_moved(left, move_context),
to_string_moved(left, move_context, locale, language),
kind,
to_string_moved(right, move_context),
to_string_moved(right, move_context, locale, language),
),
OpProductKind { kind, left, right } => {
let x = match **left {
OpSumKind { .. } => format!("({})", to_string_moved(left, move_context)),
CompareKind { .. } => format!("({})", to_string_moved(left, move_context)),
_ => to_string_moved(left, move_context),
OpSumKind { .. } => format!(
"({})",
to_string_moved(left, move_context, locale, language)
),
CompareKind { .. } => format!(
"({})",
to_string_moved(left, move_context, locale, language)
),
_ => to_string_moved(left, move_context, locale, language),
};
let y = match **right {
OpSumKind { .. } => format!("({})", to_string_moved(right, move_context)),
CompareKind { .. } => format!("({})", to_string_moved(right, move_context)),
OpProductKind { .. } => format!("({})", to_string_moved(right, move_context)),
OpSumKind { .. } => format!(
"({})",
to_string_moved(right, move_context, locale, language)
),
CompareKind { .. } => format!(
"({})",
to_string_moved(right, move_context, locale, language)
),
OpProductKind { .. } => format!(
"({})",
to_string_moved(right, move_context, locale, language)
),
UnaryKind { .. } => {
format!("({})", to_string_moved(right, move_context))
format!(
"({})",
to_string_moved(right, move_context, locale, language)
)
}
_ => to_string_moved(right, move_context),
_ => to_string_moved(right, move_context, locale, language),
};
format!("{x}{kind}{y}")
}
OpPowerKind { left, right } => format!(
"{}^{}",
to_string_moved(left, move_context),
to_string_moved(right, move_context),
to_string_moved(left, move_context, locale, language),
to_string_moved(right, move_context, locale, language),
),
InvalidFunctionKind { name, args } => move_function(name, args, move_context),
InvalidFunctionKind { name, args } => {
move_function(name, args, move_context, locale, language)
}
FunctionKind { kind, args } => {
let name = &kind.to_string();
move_function(name, args, move_context)
let name = &kind.to_localized_name(language);
move_function(name, args, move_context, locale, language)
}
ArrayKind(args) => {
let mut first_row = true;
let mut matrix_string = String::new();
// Each element in `args` is assumed to be one "row" (itself a `Vec<T>`).
let row_separator = if locale.numbers.symbols.decimal == "." {
';'
} else {
'/'
};
let col_separator = if row_separator == ';' { ',' } else { ';' };
for row in args {
if !first_row {
matrix_string.push(',');
matrix_string.push(col_separator);
} else {
first_row = false;
}
@@ -387,13 +455,13 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
let mut row_string = String::new();
for el in row {
if !first_col {
row_string.push(',');
row_string.push(row_separator);
} else {
first_col = false;
}
// Reuse your existing element-stringification function
row_string.push_str(&to_string_array_node(el));
row_string.push_str(&to_string_array_node(el, locale, language));
}
// Enclose the row in braces
@@ -410,13 +478,19 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
WrongVariableKind(name) => name.to_string(),
CompareKind { kind, left, right } => format!(
"{}{}{}",
to_string_moved(left, move_context),
to_string_moved(left, move_context, locale, language),
kind,
to_string_moved(right, move_context),
to_string_moved(right, move_context, locale, language),
),
UnaryKind { kind, right } => match kind {
OpUnary::Minus => format!("-{}", to_string_moved(right, move_context)),
OpUnary::Percentage => format!("{}%", to_string_moved(right, move_context)),
OpUnary::Minus => format!(
"-{}",
to_string_moved(right, move_context, locale, language)
),
OpUnary::Percentage => format!(
"{}%",
to_string_moved(right, move_context, locale, language)
),
},
ErrorKind(kind) => format!("{kind}"),
ParseErrorKind {
@@ -429,7 +503,10 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
automatic: _,
child,
} => {
format!("@{}", to_string_moved(child, move_context))
format!(
"@{}",
to_string_moved(child, move_context, locale, language)
)
}
}
}

View File

@@ -3,6 +3,8 @@ use crate::constants::{LAST_COLUMN, LAST_ROW};
use crate::expressions::parser::move_formula::to_string_array_node;
use crate::expressions::parser::static_analysis::add_implicit_intersection;
use crate::expressions::token::{OpSum, OpUnary};
use crate::language::{get_language, Language};
use crate::locale::{get_locale, Locale};
use crate::{expressions::types::CellReferenceRC, number_format::to_excel_precision_str};
pub enum DisplaceData {
@@ -43,17 +45,44 @@ pub enum DisplaceData {
/// This is the internal mode in IronCalc
pub fn to_rc_format(node: &Node) -> String {
stringify(node, None, &DisplaceData::None, false)
#[allow(clippy::expect_used)]
let locale = get_locale("en").expect("");
#[allow(clippy::expect_used)]
let language = get_language("en").expect("");
stringify(node, None, &DisplaceData::None, false, locale, language)
}
/// This is the mode used to display the formula in the UI
pub fn to_string(node: &Node, context: &CellReferenceRC) -> String {
stringify(node, Some(context), &DisplaceData::None, false)
pub fn to_localized_string(
node: &Node,
context: &CellReferenceRC,
locale: &Locale,
language: &Language,
) -> String {
stringify(
node,
Some(context),
&DisplaceData::None,
false,
locale,
language,
)
}
/// This is the mode used to export the formula to Excel
pub fn to_excel_string(node: &Node, context: &CellReferenceRC) -> String {
stringify(node, Some(context), &DisplaceData::None, true)
#[allow(clippy::expect_used)]
let locale = get_locale("en").expect("");
#[allow(clippy::expect_used)]
let language = get_language("en").expect("");
stringify(
node,
Some(context),
&DisplaceData::None,
true,
locale,
language,
)
}
pub fn to_string_displaced(
@@ -61,7 +90,11 @@ pub fn to_string_displaced(
context: &CellReferenceRC,
displace_data: &DisplaceData,
) -> String {
stringify(node, Some(context), displace_data, false)
#[allow(clippy::expect_used)]
let locale = get_locale("en").expect("");
#[allow(clippy::expect_used)]
let language = get_language("en").expect("");
stringify(node, Some(context), displace_data, false, locale, language)
}
/// Converts a local reference to a string applying some displacement if needed.
@@ -273,19 +306,41 @@ fn format_function(
context: Option<&CellReferenceRC>,
displace_data: &DisplaceData,
export_to_excel: bool,
locale: &Locale,
language: &Language,
) -> String {
let mut first = true;
let mut arguments = "".to_string();
let arg_separator = if locale.numbers.symbols.decimal == "." {
','
} else {
';'
};
for el in args {
if !first {
arguments = format!(
"{},{}",
"{}{}{}",
arguments,
stringify(el, context, displace_data, export_to_excel)
arg_separator,
stringify(
el,
context,
displace_data,
export_to_excel,
locale,
language
)
);
} else {
first = false;
arguments = stringify(el, context, displace_data, export_to_excel);
arguments = stringify(
el,
context,
displace_data,
export_to_excel,
locale,
language,
);
}
}
format!("{name}({arguments})")
@@ -321,11 +376,26 @@ fn stringify(
context: Option<&CellReferenceRC>,
displace_data: &DisplaceData,
export_to_excel: bool,
locale: &Locale,
language: &Language,
) -> String {
use self::Node::*;
match node {
BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
NumberKind(number) => to_excel_precision_str(*number),
BooleanKind(value) => {
if *value {
language.booleans.r#true.to_string()
} else {
language.booleans.r#false.to_string()
}
}
NumberKind(number) => {
let s = to_excel_precision_str(*number);
if locale.numbers.symbols.decimal == "." {
s
} else {
s.replace(".", &locale.numbers.symbols.decimal)
}
}
StringKind(value) => format!("\"{value}\""),
WrongReferenceKind {
sheet_name,
@@ -469,32 +539,95 @@ fn stringify(
}
OpRangeKind { left, right } => format!(
"{}:{}",
stringify(left, context, displace_data, export_to_excel),
stringify(right, context, displace_data, export_to_excel)
stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language
),
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
),
OpConcatenateKind { left, right } => format!(
"{}&{}",
stringify(left, context, displace_data, export_to_excel),
stringify(right, context, displace_data, export_to_excel)
stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language
),
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
),
CompareKind { kind, left, right } => format!(
"{}{}{}",
stringify(left, context, displace_data, export_to_excel),
stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language
),
kind,
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
),
OpSumKind { kind, left, right } => {
let left_str = stringify(left, context, displace_data, export_to_excel);
let left_str = stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language,
);
// if kind is minus then we need parentheses in the right side if they are OpSumKind or CompareKind
let right_str = if (matches!(kind, OpSum::Minus) && matches!(**right, OpSumKind { .. }))
| matches!(**right, CompareKind { .. })
{
format!(
"({})",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
)
} else {
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language,
)
};
format!("{left_str}{kind}{right_str}")
@@ -503,16 +636,44 @@ fn stringify(
let x = match **left {
OpSumKind { .. } | CompareKind { .. } => format!(
"({})",
stringify(left, context, displace_data, export_to_excel)
stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language
)
),
_ => stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language,
),
_ => stringify(left, context, displace_data, export_to_excel),
};
let y = match **right {
OpSumKind { .. } | CompareKind { .. } | OpProductKind { .. } => format!(
"({})",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
),
_ => stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language,
),
_ => stringify(right, context, displace_data, export_to_excel),
};
format!("{x}{kind}{y}")
}
@@ -528,7 +689,14 @@ fn stringify(
| DefinedNameKind(_)
| TableNameKind(_)
| WrongVariableKind(_)
| WrongRangeKind { .. } => stringify(left, context, displace_data, export_to_excel),
| WrongRangeKind { .. } => stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language,
),
OpRangeKind { .. }
| OpConcatenateKind { .. }
| OpProductKind { .. }
@@ -543,7 +711,14 @@ fn stringify(
| ImplicitIntersection { .. }
| EmptyArgKind => format!(
"({})",
stringify(left, context, displace_data, export_to_excel)
stringify(
left,
context,
displace_data,
export_to_excel,
locale,
language
)
),
};
let y = match **right {
@@ -556,9 +731,14 @@ fn stringify(
| DefinedNameKind(_)
| TableNameKind(_)
| WrongVariableKind(_)
| WrongRangeKind { .. } => {
stringify(right, context, displace_data, export_to_excel)
}
| WrongRangeKind { .. } => stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language,
),
OpRangeKind { .. }
| OpConcatenateKind { .. }
| OpProductKind { .. }
@@ -574,29 +754,56 @@ fn stringify(
| ImplicitIntersection { .. }
| EmptyArgKind => format!(
"({})",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
),
};
format!("{x}^{y}")
}
InvalidFunctionKind { name, args } => {
format_function(name, args, context, displace_data, export_to_excel)
}
InvalidFunctionKind { name, args } => format_function(
&name.to_ascii_lowercase(),
args,
context,
displace_data,
export_to_excel,
locale,
language,
),
FunctionKind { kind, args } => {
let name = if export_to_excel {
kind.to_xlsx_string()
} else {
kind.to_string()
kind.to_localized_name(language)
};
format_function(&name, args, context, displace_data, export_to_excel)
format_function(
&name,
args,
context,
displace_data,
export_to_excel,
locale,
language,
)
}
ArrayKind(args) => {
let mut first_row = true;
let mut matrix_string = String::new();
let row_separator = if locale.numbers.symbols.decimal == "." {
';'
} else {
'/'
};
let col_separator = if row_separator == ';' { ',' } else { ';' };
for row in args {
if !first_row {
matrix_string.push(';');
matrix_string.push(row_separator);
} else {
first_row = false;
}
@@ -604,11 +811,11 @@ fn stringify(
let mut row_string = String::new();
for el in row {
if !first_column {
row_string.push(',');
row_string.push(col_separator);
} else {
first_column = false;
}
row_string.push_str(&to_string_array_node(el));
row_string.push_str(&to_string_array_node(el, locale, language));
}
matrix_string.push_str(&row_string);
}
@@ -647,19 +854,40 @@ fn stringify(
if needs_parentheses {
format!(
"-({})",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
)
} else {
format!(
"-{}",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
)
}
}
OpUnary::Percentage => {
format!(
"{}%",
stringify(right, context, displace_data, export_to_excel)
stringify(
right,
context,
displace_data,
export_to_excel,
locale,
language
)
)
}
},
@@ -680,17 +908,38 @@ fn stringify(
add_implicit_intersection(&mut new_node, true);
if matches!(&new_node, Node::ImplicitIntersection { .. }) {
return stringify(child, context, displace_data, export_to_excel);
return stringify(
child,
context,
displace_data,
export_to_excel,
locale,
language,
);
}
return format!(
"_xlfn.SINGLE({})",
stringify(child, context, displace_data, export_to_excel)
stringify(
child,
context,
displace_data,
export_to_excel,
locale,
language
)
);
}
format!(
"@{}",
stringify(child, context, displace_data, export_to_excel)
stringify(
child,
context,
displace_data,
export_to_excel,
locale,
language
)
)
}
}

View File

@@ -4,7 +4,10 @@ mod test_general;
mod test_implicit_intersection;
mod test_issue_155;
mod test_issue_483;
mod test_languages;
mod test_locales;
mod test_move_formula;
mod test_ranges;
mod test_stringify;
mod test_tables;
mod utils;

View File

@@ -2,8 +2,8 @@ use std::collections::HashMap;
use crate::expressions::{
parser::{
stringify::{to_excel_string, to_string},
Parser,
stringify::to_excel_string,
tests::utils::{new_parser, to_english_localized_string},
},
types::CellReferenceRC,
};
@@ -13,7 +13,7 @@ use crate::expressions::parser::static_analysis::add_implicit_intersection;
#[test]
fn simple_test() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -72,7 +72,7 @@ fn simple_test() {
for (formula, expected) in cases {
let mut t = parser.parse(formula, &cell_reference);
add_implicit_intersection(&mut t, true);
let r = to_string(&t, &cell_reference);
let r = to_english_localized_string(&t, &cell_reference);
assert_eq!(r, expected);
let excel_formula = to_excel_string(&t, &cell_reference);
assert_eq!(excel_formula, formula);

View File

@@ -2,14 +2,15 @@
use std::collections::HashMap;
use crate::expressions::parser::stringify::{to_rc_format, to_string};
use crate::expressions::parser::{ArrayNode, Node, Parser};
use crate::expressions::parser::stringify::to_rc_format;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::parser::{ArrayNode, Node};
use crate::expressions::types::CellReferenceRC;
#[test]
fn simple_horizontal() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -28,13 +29,16 @@ fn simple_horizontal() {
);
assert_eq!(to_rc_format(&horizontal), "{1,2,3}");
assert_eq!(to_string(&horizontal, &cell_reference), "{1,2,3}");
assert_eq!(
to_english_localized_string(&horizontal, &cell_reference),
"{1,2,3}"
);
}
#[test]
fn simple_vertical() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -52,13 +56,16 @@ fn simple_vertical() {
])
);
assert_eq!(to_rc_format(&vertical), "{1;2;3}");
assert_eq!(to_string(&vertical, &cell_reference), "{1;2;3}");
assert_eq!(
to_english_localized_string(&vertical, &cell_reference),
"{1;2;3}"
);
}
#[test]
fn simple_matrix() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -88,5 +95,8 @@ fn simple_matrix() {
])
);
assert_eq!(to_rc_format(&matrix), "{1,2,3;4,5,6;7,8,9}");
assert_eq!(to_string(&matrix, &cell_reference), "{1,2,3;4,5,6;7,8,9}");
assert_eq!(
to_english_localized_string(&matrix, &cell_reference),
"{1,2,3;4,5,6;7,8,9}"
);
}

View File

@@ -3,12 +3,12 @@
use std::collections::HashMap;
use crate::expressions::lexer::LexerMode;
use crate::expressions::parser::stringify::{
to_rc_format, to_string, to_string_displaced, DisplaceData,
};
use crate::expressions::parser::{Node, Parser};
use crate::expressions::parser::stringify::{to_rc_format, to_string_displaced, DisplaceData};
use crate::expressions::parser::Node;
use crate::expressions::types::CellReferenceRC;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
struct Formula<'a> {
initial: &'a str,
expected: &'a str,
@@ -17,7 +17,7 @@ struct Formula<'a> {
#[test]
fn test_parser_reference() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -32,7 +32,7 @@ fn test_parser_reference() {
#[test]
fn test_parser_absolute_column() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -47,7 +47,7 @@ fn test_parser_absolute_column() {
#[test]
fn test_parser_absolute_row_col() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -62,7 +62,7 @@ fn test_parser_absolute_row_col() {
#[test]
fn test_parser_absolute_row_col_1() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -77,7 +77,7 @@ fn test_parser_absolute_row_col_1() {
#[test]
fn test_parser_simple_formula() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -93,7 +93,7 @@ fn test_parser_simple_formula() {
#[test]
fn test_parser_boolean() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -109,7 +109,7 @@ fn test_parser_boolean() {
#[test]
fn test_parser_bad_formula() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -138,7 +138,7 @@ fn test_parser_bad_formula() {
#[test]
fn test_parser_bad_formula_1() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -167,7 +167,7 @@ fn test_parser_bad_formula_1() {
#[test]
fn test_parser_bad_formula_2() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -196,7 +196,7 @@ fn test_parser_bad_formula_2() {
#[test]
fn test_parser_bad_formula_3() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -225,7 +225,7 @@ fn test_parser_bad_formula_3() {
#[test]
fn test_parser_formulas() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let formulas = vec![
Formula {
@@ -266,14 +266,17 @@ fn test_parser_formulas() {
},
);
assert_eq!(to_rc_format(&t), formula.expected);
assert_eq!(to_string(&t, &cell_reference), formula.initial);
assert_eq!(
to_english_localized_string(&t, &cell_reference),
formula.initial
);
}
}
#[test]
fn test_parser_r1c1_formulas() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
parser.set_lexer_mode(LexerMode::R1C1);
let formulas = vec![
@@ -330,7 +333,10 @@ fn test_parser_r1c1_formulas() {
column: 1,
},
);
assert_eq!(to_string(&t, &cell_reference), formula.expected);
assert_eq!(
to_english_localized_string(&t, &cell_reference),
formula.expected
);
assert_eq!(to_rc_format(&t), formula.initial);
}
}
@@ -338,7 +344,7 @@ fn test_parser_r1c1_formulas() {
#[test]
fn test_parser_quotes() {
let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -354,7 +360,7 @@ fn test_parser_quotes() {
#[test]
fn test_parser_escape_quotes() {
let worksheets = vec!["Sheet1".to_string(), "Second '2' Sheet".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -370,7 +376,7 @@ fn test_parser_escape_quotes() {
#[test]
fn test_parser_parenthesis() {
let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -386,7 +392,7 @@ fn test_parser_parenthesis() {
#[test]
fn test_parser_excel_xlfn() {
let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -407,7 +413,7 @@ fn test_to_string_displaced() {
column: 1,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let node = parser.parse("C3", context);
let displace_data = DisplaceData::Column {
@@ -427,7 +433,7 @@ fn test_to_string_displaced_full_ranges() {
column: 1,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let node = parser.parse("SUM(3:3)", context);
let displace_data = DisplaceData::Column {
@@ -460,7 +466,7 @@ fn test_to_string_displaced_too_low() {
column: 1,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let node = parser.parse("C3", context);
let displace_data = DisplaceData::Column {
@@ -480,7 +486,7 @@ fn test_to_string_displaced_too_high() {
column: 1,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let node = parser.parse("C3", context);
let displace_data = DisplaceData::Column {

View File

@@ -1,13 +1,15 @@
#![allow(clippy::panic)]
use crate::expressions::parser::{Node, Parser};
use crate::expressions::parser::Node;
use crate::expressions::types::CellReferenceRC;
use std::collections::HashMap;
use crate::expressions::parser::tests::utils::new_parser;
#[test]
fn simple() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!B3
let cell_reference = CellReferenceRC {
@@ -40,7 +42,7 @@ fn simple() {
#[test]
fn simple_add() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!B3
let cell_reference = CellReferenceRC {

View File

@@ -2,14 +2,13 @@
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::Parser;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::types::CellReferenceRC;
#[test]
fn issue_155_parser() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -18,13 +17,13 @@ fn issue_155_parser() {
column: 2,
};
let t = parser.parse("A$1:A2", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "A$1:A2");
assert_eq!(to_english_localized_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, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -33,13 +32,13 @@ fn issue_155_parser_case_2() {
column: 20,
};
let t = parser.parse("C$1:D2", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "C$1:D2");
assert_eq!(to_english_localized_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, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -49,13 +48,13 @@ fn issue_155_parser_only_row() {
};
// This is tricky, I am not sure what to do in these cases
let t = parser.parse("A$2:B1", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "A1:B$2");
assert_eq!(to_english_localized_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, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -65,5 +64,5 @@ fn issue_155_parser_only_column() {
};
// This is tricky, I am not sure what to do in these cases
let t = parser.parse("D1:$A3", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "$A1:D3");
assert_eq!(to_english_localized_string(&t, &cell_reference), "$A1:D3");
}

View File

@@ -2,14 +2,14 @@
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::{Node, Parser};
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::parser::Node;
use crate::expressions::types::CellReferenceRC;
#[test]
fn issue_483_parser() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -19,9 +19,12 @@ fn issue_483_parser() {
};
let t = parser.parse("-(A1^1.22)", &cell_reference);
assert!(matches!(t, Node::UnaryKind { .. }));
assert_eq!(to_string(&t, &cell_reference), "-(A1^1.22)");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"-(A1^1.22)"
);
let t = parser.parse("-A1^1.22", &cell_reference);
assert!(matches!(t, Node::OpPowerKind { .. }));
assert_eq!(to_string(&t, &cell_reference), "-A1^1.22");
assert_eq!(to_english_localized_string(&t, &cell_reference), "-A1^1.22");
}

View File

@@ -0,0 +1,58 @@
#![allow(clippy::unwrap_used)]
use std::collections::HashMap;
use crate::expressions::parser::{DefinedNameS, Node, Parser};
use crate::expressions::types::CellReferenceRC;
use crate::expressions::parser::stringify::to_localized_string;
use crate::functions::Function;
use crate::language::get_language;
use crate::locale::get_locale;
use crate::types::Table;
pub fn to_string(t: &Node, cell_reference: &CellReferenceRC) -> String {
let locale = get_locale("en").unwrap();
let language = get_language("es").unwrap();
to_localized_string(t, cell_reference, locale, language)
}
pub fn new_parser<'a>(
worksheets: Vec<String>,
defined_names: Vec<DefinedNameS>,
tables: HashMap<String, Table>,
) -> Parser<'a> {
let locale = get_locale("en").unwrap();
let language = get_language("es").unwrap();
Parser::new(worksheets, defined_names, tables, locale, language)
}
#[test]
fn simple_language() {
let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
row: 1,
column: 1,
};
let t = parser.parse("FALSO", &cell_reference);
assert!(matches!(t, Node::BooleanKind(false)));
let t = parser.parse("VERDADERO", &cell_reference);
assert!(matches!(t, Node::BooleanKind(true)));
let t = parser.parse("TRUE()", &cell_reference);
assert!(matches!(t, Node::InvalidFunctionKind { ref name, args: _} if name == "TRUE"));
let t = parser.parse("VERDADERO()", &cell_reference);
assert!(matches!(
t,
Node::FunctionKind {
kind: Function::True,
args: _
}
));
assert_eq!(to_string(&t, &cell_reference), "VERDADERO()".to_string());
}

View File

@@ -0,0 +1 @@

View File

@@ -1,8 +1,17 @@
use std::collections::HashMap;
use crate::expressions::parser::move_formula::{move_formula, MoveContext};
use crate::expressions::parser::Parser;
use crate::expressions::parser::move_formula::{move_formula as mf, MoveContext};
use crate::expressions::parser::tests::utils::new_parser;
use crate::expressions::parser::Node;
use crate::expressions::types::{Area, CellReferenceRC};
use crate::language::get_default_language;
use crate::locale::get_default_locale;
fn move_formula(node: &Node, context: &MoveContext) -> String {
let locale = get_default_locale();
let language = get_default_language();
mf(node, context, locale, language)
}
#[test]
fn test_move_formula() {
@@ -15,7 +24,7 @@ fn test_move_formula() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -102,7 +111,7 @@ fn test_move_formula_context_offset() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -140,7 +149,7 @@ fn test_move_formula_area_limits() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -195,7 +204,7 @@ fn test_move_formula_ranges() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let area = &Area {
sheet: 0,
@@ -318,7 +327,7 @@ fn test_move_formula_wrong_reference() {
height: 5,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Wrong formulas will NOT be displaced
let node = parser.parse("Sheet3!AB31", context);
@@ -377,7 +386,7 @@ fn test_move_formula_misc() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -445,7 +454,7 @@ fn test_move_formula_another_sheet() {
};
// we add two sheets and we cut/paste from Sheet1 to Sheet2
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -487,7 +496,7 @@ fn move_formula_implicit_intersetion() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {
@@ -524,7 +533,7 @@ fn move_formula_implicit_intersetion_with_ranges() {
column,
};
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Area is C2:F6
let area = &Area {

View File

@@ -2,8 +2,8 @@ use std::collections::HashMap;
use crate::expressions::lexer::LexerMode;
use crate::expressions::parser::stringify::{to_rc_format, to_string};
use crate::expressions::parser::Parser;
use crate::expressions::parser::stringify::to_rc_format;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::types::CellReferenceRC;
struct Formula<'a> {
@@ -14,7 +14,7 @@ struct Formula<'a> {
#[test]
fn test_parser_formulas_with_full_ranges() {
let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let formulas = vec![
Formula {
@@ -59,7 +59,10 @@ fn test_parser_formulas_with_full_ranges() {
},
);
assert_eq!(to_rc_format(&t), formula.formula_r1c1);
assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
assert_eq!(
to_english_localized_string(&t, &cell_reference),
formula.formula_a1
);
}
// Now the inverse
@@ -74,14 +77,17 @@ fn test_parser_formulas_with_full_ranges() {
},
);
assert_eq!(to_rc_format(&t), formula.formula_r1c1);
assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
assert_eq!(
to_english_localized_string(&t, &cell_reference),
formula.formula_a1
);
}
}
#[test]
fn test_range_inverse_order() {
let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -96,7 +102,7 @@ fn test_range_inverse_order() {
&cell_reference,
);
assert_eq!(
to_string(&t, &cell_reference),
to_english_localized_string(&t, &cell_reference),
"SUM(C2:D4)*SUM(Sheet2!C4:D20)*SUM($C4:D$20)".to_string()
);
}

View File

@@ -2,14 +2,13 @@
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::Parser;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::types::CellReferenceRC;
#[test]
fn exp_order() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
// Reference cell is Sheet1!A1
let cell_reference = CellReferenceRC {
@@ -18,25 +17,34 @@ fn exp_order() {
column: 1,
};
let t = parser.parse("(1 + 2)^3 + 4", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "(1+2)^3+4");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"(1+2)^3+4"
);
let t = parser.parse("(C5 + 3)^R4", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "(C5+3)^R4");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"(C5+3)^R4"
);
let t = parser.parse("(C5 + 3)^(R4*6)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "(C5+3)^(R4*6)");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"(C5+3)^(R4*6)"
);
let t = parser.parse("(C5)^(R4)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "C5^R4");
assert_eq!(to_english_localized_string(&t, &cell_reference), "C5^R4");
let t = parser.parse("(5)^(4)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "5^4");
assert_eq!(to_english_localized_string(&t, &cell_reference), "5^4");
}
#[test]
fn correct_parenthesis() {
let worksheets = vec!["Sheet1".to_string()];
let mut parser = Parser::new(worksheets, vec![], HashMap::new());
let mut parser = new_parser(worksheets, vec![], HashMap::new());
let cell_reference = CellReferenceRC {
sheet: "Sheet1".to_string(),
@@ -45,26 +53,29 @@ fn correct_parenthesis() {
};
let t = parser.parse("-(1 + 1)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "-(1+1)");
assert_eq!(to_english_localized_string(&t, &cell_reference), "-(1+1)");
let t = parser.parse("1 - (3 + 4)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "1-(3+4)");
assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+4)");
let t = parser.parse("-(1.05*(0.0284 + 0.0046) - 0.0284)", &cell_reference);
assert_eq!(
to_string(&t, &cell_reference),
to_english_localized_string(&t, &cell_reference),
"-(1.05*(0.0284+0.0046)-0.0284)"
);
let t = parser.parse("1 + (3+5)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "1+3+5");
assert_eq!(to_english_localized_string(&t, &cell_reference), "1+3+5");
let t = parser.parse("1 - (3+5)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "1-(3+5)");
assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+5)");
let t = parser.parse("(1 - 3) - (3+5)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "1-3-(3+5)");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"1-3-(3+5)"
);
let t = parser.parse("1 + (3<5)", &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "1+(3<5)");
assert_eq!(to_english_localized_string(&t, &cell_reference), "1+(3<5)");
}

View File

@@ -2,8 +2,7 @@
use std::collections::HashMap;
use crate::expressions::parser::stringify::to_string;
use crate::expressions::parser::Parser;
use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
use crate::expressions::types::CellReferenceRC;
use crate::expressions::utils::{number_to_column, parse_reference_a1};
use crate::types::{Table, TableColumn, TableStyleInfo};
@@ -62,7 +61,7 @@ fn simple_table() {
let row_count = 3;
let tables = create_test_table("tblIncome", &column_names, "A1", row_count);
let mut parser = Parser::new(worksheets, vec![], tables);
let mut parser = new_parser(worksheets, vec![], tables);
// Reference cell is 'Sheet One'!F2
let cell_reference = CellReferenceRC {
sheet: "Sheet One".to_string(),
@@ -72,7 +71,10 @@ fn simple_table() {
let formula = "SUM(tblIncome[[#This Row],[Jan]:[Dec]])";
let t = parser.parse(formula, &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "SUM($A$2:$E$2)");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"SUM($A$2:$E$2)"
);
// Cell A3
let cell_reference = CellReferenceRC {
@@ -82,7 +84,10 @@ fn simple_table() {
};
let formula = "SUBTOTAL(109, tblIncome[Jan])";
let t = parser.parse(formula, &cell_reference);
assert_eq!(to_string(&t, &cell_reference), "SUBTOTAL(109,$A$2:$A$3)");
assert_eq!(
to_english_localized_string(&t, &cell_reference),
"SUBTOTAL(109,$A$2:$A$3)"
);
// Cell A3 in 'Second Sheet'
let cell_reference = CellReferenceRC {
@@ -93,7 +98,7 @@ fn simple_table() {
let formula = "SUBTOTAL(109, tblIncome[Jan])";
let t = parser.parse(formula, &cell_reference);
assert_eq!(
to_string(&t, &cell_reference),
to_english_localized_string(&t, &cell_reference),
"SUBTOTAL(109,'Sheet One'!$A$2:$A$3)"
);
}

View File

@@ -0,0 +1,29 @@
use std::collections::HashMap;
use crate::{
expressions::{
parser::{DefinedNameS, Node, Parser},
types::CellReferenceRC,
},
language::get_default_language,
locale::get_default_locale,
types::Table,
};
use crate::expressions::parser::stringify::to_localized_string;
pub fn to_english_localized_string(t: &Node, cell_reference: &CellReferenceRC) -> String {
let locale = get_default_locale();
let language = get_default_language();
to_localized_string(t, cell_reference, locale, language)
}
pub fn new_parser<'a>(
worksheets: Vec<String>,
defined_names: Vec<DefinedNameS>,
tables: HashMap<String, Table>,
) -> Parser<'a> {
let locale = get_default_locale();
let language = get_default_language();
Parser::new(worksheets, defined_names, tables, locale, language)
}

View File

@@ -241,6 +241,7 @@ pub enum TokenType {
Percent, // %
And, // &
At, // @
Backslash, // \
Reference {
sheet: Option<String>,
row: i32,

View File

@@ -128,6 +128,9 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
if (1.0e-8..1.0e+11).contains(&value_abs) {
let mut text = format!("{value:.9}");
text = text.trim_end_matches('0').trim_end_matches('.').to_string();
if locale.numbers.symbols.decimal != "." {
text = text.replace('.', &locale.numbers.symbols.decimal.to_string());
}
Formatted {
text,
color: None,
@@ -145,13 +148,17 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
value /= 10.0_f64.powf(exponent);
let sign = if exponent < 0.0 { '-' } else { '+' };
let s = format!("{value:.5}");
let mut text = format!(
"{}E{}{:02}",
s.trim_end_matches('0').trim_end_matches('.'),
sign,
exponent.abs()
);
if locale.numbers.symbols.decimal != "." {
text = text.replace('.', &locale.numbers.symbols.decimal.to_string());
}
Formatted {
text: format!(
"{}E{}{:02}",
s.trim_end_matches('0').trim_end_matches('.'),
sign,
exponent.abs()
),
text,
color: None,
error: None,
}
@@ -752,13 +759,15 @@ fn parse_date(value: &str) -> Result<(i32, String), String> {
pub(crate) fn parse_formatted_number(
original: &str,
currencies: &[&str],
decimal_separator: u8,
group_separator: u8,
) -> Result<(f64, Option<String>), String> {
let value = original.trim();
let scientific_format = "0.00E+00";
// Check if it is a percentage
if let Some(p) = value.strip_suffix('%') {
let (f, options) = parse_number(p.trim())?;
let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
if options.is_scientific {
return Ok((f / 100.0, Some(scientific_format.to_string())));
}
@@ -774,7 +783,7 @@ pub(crate) fn parse_formatted_number(
// check if it is a currency in currencies
for currency in currencies {
if let Some(p) = value.strip_prefix(&format!("-{currency}")) {
let (f, options) = parse_number(p.trim())?;
let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
if options.is_scientific {
return Ok((f, Some(scientific_format.to_string())));
}
@@ -783,7 +792,7 @@ pub(crate) fn parse_formatted_number(
}
return Ok((-f, Some(format!("{currency}#,##0"))));
} else if let Some(p) = value.strip_prefix(currency) {
let (f, options) = parse_number(p.trim())?;
let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
if options.is_scientific {
return Ok((f, Some(scientific_format.to_string())));
}
@@ -792,7 +801,7 @@ pub(crate) fn parse_formatted_number(
}
return Ok((f, Some(format!("{currency}#,##0"))));
} else if let Some(p) = value.strip_suffix(currency) {
let (f, options) = parse_number(p.trim())?;
let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
if options.is_scientific {
return Ok((f, Some(scientific_format.to_string())));
}
@@ -811,7 +820,7 @@ pub(crate) fn parse_formatted_number(
}
// Lastly we check if it is a number
let (f, options) = parse_number(value)?;
let (f, options) = parse_number(value, decimal_separator, group_separator)?;
if options.is_scientific {
return Ok((f, Some(scientific_format.to_string())));
}
@@ -834,7 +843,11 @@ struct NumberOptions {
// tries to parse 'value' as a number.
// If it is a number it either uses commas as thousands separator or it does not
fn parse_number(value: &str) -> Result<(f64, NumberOptions), String> {
fn parse_number(
value: &str,
decimal_separator: u8,
group_separator: u8,
) -> Result<(f64, NumberOptions), String> {
let mut position = 0;
let bytes = value.as_bytes();
let len = bytes.len();
@@ -842,8 +855,6 @@ fn parse_number(value: &str) -> Result<(f64, NumberOptions), String> {
return Err("Cannot parse number".to_string());
}
let mut chars = String::from("");
let decimal_separator = b'.';
let group_separator = b',';
let mut group_separator_index = Vec::new();
// get the sign
let sign = if bytes[0] == b'-' {

View File

@@ -1,4 +1,5 @@
#![allow(clippy::unwrap_used)]
#![allow(clippy::expect_used)]
use crate::{
formatter::format::format_number,
@@ -202,3 +203,9 @@ fn test_date() {
"Sat-September-12"
);
}
#[test]
fn test_german_locale() {
let locale = get_locale("de").expect("");
assert_eq!(format_number(1234.56, "General", locale).text, "1234,56");
}

View File

@@ -1,9 +1,13 @@
#![allow(clippy::unwrap_used)]
use crate::formatter::format::parse_formatted_number as parse;
use crate::formatter::format::parse_formatted_number;
const PARSE_ERROR_MSG: &str = "Could not parse number";
fn parse(input: &str, currencies: &[&str]) -> Result<(f64, Option<String>), String> {
parse_formatted_number(input, currencies, b'.', b',')
}
#[test]
fn numbers() {
// whole numbers

View File

@@ -137,7 +137,7 @@ pub(crate) fn binary_search_descending_or_greater<T: Ord>(target: &T, array: &[T
Some((n - r - 1) as i32)
}
impl Model {
impl<'a> Model<'a> {
/// Returns an array with the list of cell values in the range
pub(crate) fn prepare_array(
&mut self,

View File

@@ -9,7 +9,7 @@ use crate::{
use super::util::{compare_values, from_wildcard_to_regex, result_matches_regex};
impl Model {
impl<'a> Model<'a> {
// =DAVERAGE(database, field, criteria)
pub(crate) fn fn_daverage(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 3 {

View File

@@ -470,7 +470,7 @@ fn parse_datevalue_text(value: &str) -> Result<i32, String> {
}
}
impl Model {
impl<'a> Model<'a> {
fn get_date_serial(
&mut self,
node: &Node,

View File

@@ -12,7 +12,7 @@ use super::transcendental::{bessel_i, bessel_j, bessel_k, bessel_y};
// Notice that the parameters for Bessel functions in Excel and here have inverted order
// EXCEL_BESSEL(x, n) => bessel(n, x)
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_besseli(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 2 {
return CalcResult::new_args_number_error(cell);

View File

@@ -7,7 +7,7 @@ use crate::{
// 2^48-1
const MAX: f64 = 281474976710655.0;
impl Model {
impl<'a> Model<'a> {
// BITAND( number1, number2)
pub(crate) fn fn_bitand(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 2 {

View File

@@ -182,7 +182,7 @@ fn parse_complex_number(s: &str) -> Result<(f64, f64, Suffix), String> {
}
}
impl Model {
impl<'a> Model<'a> {
fn get_complex_number(
&mut self,
node: &Node,

View File

@@ -41,7 +41,7 @@ fn convert_temperature(
}
}
impl Model {
impl<'a> Model<'a> {
// CONVERT(number, from_unit, to_unit)
pub(crate) fn fn_convert(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 3 {

View File

@@ -5,7 +5,7 @@ use crate::{
number_format::to_precision,
};
impl Model {
impl<'a> Model<'a> {
// DELTA(number1, [number2])
pub(crate) fn fn_delta(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let arg_count = args.len();

View File

@@ -31,7 +31,7 @@ fn from_binary_to_decimal(value: f64) -> Result<i64, String> {
Ok(result)
}
impl Model {
impl<'a> Model<'a> {
// BIN2DEC(number)
pub(crate) fn fn_bin2dec(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {

View File

@@ -191,7 +191,7 @@ fn compute_ppmt(
// All, except for rate are easily solvable in terms of the others.
// In these formulas the payment (pmt) is normally negative
impl Model {
impl<'a> Model<'a> {
fn get_array_of_numbers_generic(
&mut self,
arg: &Node,

View File

@@ -4,7 +4,7 @@ use crate::{
model::{Model, ParsedDefinedName},
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_isnumber(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() == 1 {
match self.evaluate_node_in_context(&args[0], cell) {
@@ -373,6 +373,8 @@ impl Model {
CalcResult::Number(sheet_count)
}
/// INFO(info_type, [reference])
/// NB: In Excel "info_type" is localized. Here it is always in English.
pub(crate) fn fn_cell(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let arg_count = args.len();
if arg_count == 0 || arg_count > 2 {

View File

@@ -6,7 +6,7 @@ use crate::{
use super::util::compare_values;
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_true(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
CalcResult::Boolean(true)

View File

@@ -7,7 +7,7 @@ use crate::{
use super::util::{compare_values, from_wildcard_to_regex, result_matches_regex, values_are_equal};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_index(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let row_num;
let col_num;
@@ -698,7 +698,7 @@ impl Model {
let parsed_reference = ParsedReference::parse_reference_formula(
Some(cell.sheet),
&s,
&self.locale,
self.locale,
|name| self.get_sheet_index_by_name(name),
);
@@ -839,6 +839,10 @@ impl Model {
CalcResult::Range { left, right }
}
// FORMULATEXT(reference)
// Returns a formula as a string. Two differences with Excel:
// - It returns the formula in English
// - It formats the formula without spaces between elements
pub(crate) fn fn_formulatext(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {
return CalcResult::new_args_number_error(cell);
@@ -860,7 +864,7 @@ impl Model {
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) {
if let Ok(Some(f)) = self.get_english_cell_formula(left.sheet, left.row, left.column) {
CalcResult::String(f)
} else {
CalcResult::Error {

View File

@@ -47,7 +47,7 @@ pub fn random() -> f64 {
Math::random()
}
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_min(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let mut result = f64::NAN;
for arg in args {

View File

@@ -13,7 +13,7 @@ fn is_same_shape_or_1d(rows1: i32, cols1: i32, rows2: i32, cols2: i32) -> bool {
|| (rows2 == 1 && cols1 == 1 && cols2 == rows1)
}
impl Model {
impl<'a> Model<'a> {
// SUMX2MY2(array_x, array_y) - Returns the sum of the difference of squares
pub(crate) fn fn_sumx2my2(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let result = match self.fn_get_two_matrices(args, cell) {

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// BETA.DIST(x, alpha, beta, cumulative, [A], [B])
pub(crate) fn fn_beta_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let arg_count = args.len();

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_binom_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 4 {
return CalcResult::new_args_number_error(cell);

View File

@@ -6,7 +6,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// CHISQ.DIST(x, deg_freedom, cumulative)
pub(crate) fn fn_chisq_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 3 {

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// CORREL(array1, array2) - Returns the correlation coefficient of two data sets
pub(crate) fn fn_correl(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let (_, _, values_left, values_right) = match self.fn_get_two_matrices(args, cell) {

View File

@@ -7,7 +7,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
fn for_each_value<F>(
&mut self,
args: &[Node],

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_covariance_p(
&mut self,
args: &[Node],

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// DEVSQ(number1, [number2], ...)
pub(crate) fn fn_devsq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_expon_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
// EXPON.DIST(x, lambda, cumulative)
if args.len() != 3 {

View File

@@ -6,7 +6,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// FISHER(x) = 0.5 * ln((1 + x) / (1 - x))
pub(crate) fn fn_fisher(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {

View File

@@ -6,7 +6,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_gamma(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {
return CalcResult::new_args_number_error(cell);

View File

@@ -4,7 +4,7 @@ use crate::expressions::token::Error;
use crate::expressions::types::CellReferenceIndex;
use crate::{calc_result::CalcResult, expressions::parser::Node, model::Model};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_gauss(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {
return CalcResult::new_args_number_error(cell);

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_geomean(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
return CalcResult::new_args_number_error(cell);

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// =HYPGEOM.DIST(sample_s, number_sample, population_s, number_pop, cumulative)
pub(crate) fn fn_hyp_geom_dist(
&mut self,

View File

@@ -8,7 +8,7 @@ use crate::{
model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_countif(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() == 2 {
let arguments = vec![args[0].clone(), args[1].clone()];

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_log_norm_dist(
&mut self,
args: &[Node],

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// NORM.DIST(x, mean, standard_dev, cumulative)
pub(crate) fn fn_norm_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 4 {

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// PEARSON(array1, array2)
pub(crate) fn fn_pearson(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let (_, _, values_left, values_right) = match self.fn_get_two_matrices(args, cell) {

View File

@@ -1,7 +1,7 @@
use crate::expressions::types::CellReferenceIndex;
use crate::{calc_result::CalcResult, expressions::parser::Node, model::Model};
impl Model {
impl<'a> Model<'a> {
// PHI(x) = standard normal PDF at x
pub(crate) fn fn_phi(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 1 {

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// =POISSON.DIST(x, mean, cumulative)
pub(crate) fn fn_poisson_dist(
&mut self,

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// Helper to collect numeric values from the 2nd argument of RANK.*
fn collect_rank_values(
&mut self,

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_stdev_p(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
return CalcResult::new_args_number_error(cell);

View File

@@ -3,7 +3,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_standardize(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
// STANDARDIZE(x, mean, standard_dev)
if args.len() != 3 {

View File

@@ -42,7 +42,7 @@ enum TTestTails {
TwoTailed,
}
impl Model {
impl<'a> Model<'a> {
// T.DIST(x, deg_freedom, cumulative)
pub(crate) fn fn_t_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.len() != 3 {

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_var_p(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
if args.is_empty() {
return CalcResult::new_args_number_error(cell);

View File

@@ -5,7 +5,7 @@ use crate::{
calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
};
impl Model {
impl<'a> Model<'a> {
// WEIBULL.DIST(x, alpha, beta, cumulative)
pub(crate) fn fn_weibull_dist(
&mut self,

View File

@@ -4,7 +4,7 @@ use crate::expressions::token::Error;
use crate::expressions::types::CellReferenceIndex;
use crate::{calc_result::CalcResult, expressions::parser::Node, model::Model};
impl Model {
impl<'a> Model<'a> {
// Z.TEST(array, x, [sigma])
pub(crate) fn fn_z_test(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
// 2 or 3 arguments

View File

@@ -32,7 +32,7 @@ pub enum CellTableStatus {
Filtered,
}
impl Model {
impl<'a> Model<'a> {
fn get_table_for_cell(&self, sheet_index: u32, row: i32, column: i32) -> bool {
let worksheet = match self.workbook.worksheet(sheet_index) {
Ok(ws) => ws,

View File

@@ -50,7 +50,7 @@ fn search(search_for: &str, text: &str, start: usize) -> Option<i32> {
None
}
impl Model {
impl<'a> Model<'a> {
pub(crate) fn fn_concat(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
let mut result = "".to_string();
for arg in args {
@@ -149,7 +149,7 @@ impl Model {
Ok(s) => s,
Err(s) => return s,
};
let d = format_number(value, &format_code, &self.locale);
let d = format_number(value, &format_code, self.locale);
if let Some(_e) = d.error {
return CalcResult::Error {
error: Error::VALUE,
@@ -1210,7 +1210,15 @@ impl Model {
match self.evaluate_node_in_context(&args[0], cell) {
CalcResult::String(text) => {
let currencies = vec!["$", ""];
if let Ok((value, _)) = parse_formatted_number(&text, &currencies) {
let (decimal_separator, group_separator) =
if self.locale.numbers.symbols.decimal == "," {
(b',', b'.')
} else {
(b'.', b',')
};
if let Ok((value, _)) =
parse_formatted_number(&text, &currencies, decimal_separator, group_separator)
{
return CalcResult::Number(value);
};
CalcResult::Error {

View File

@@ -118,7 +118,7 @@ fn linear_search(
None
}
impl Model {
impl<'a> Model<'a> {
/// The XLOOKUP function searches a range or an array, and then returns the item corresponding
/// to the first match it finds. If no match exists, then XLOOKUP can return the closest (approximate) match.
/// =XLOOKUP(lookup_value, lookup_array, return_array, [if_not_found], [match_mode], [search_mode])

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -2,13 +2,13 @@ use std::{collections::HashMap, sync::OnceLock};
use bitcode::{Decode, Encode};
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Booleans {
pub r#true: String,
pub r#false: String,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Errors {
pub r#ref: String,
pub name: String,
@@ -24,10 +24,367 @@ pub struct Errors {
pub null: String,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Functions {
pub and: String,
pub r#false: String,
pub r#if: String,
pub iferror: String,
pub ifna: String,
pub ifs: String,
pub not: String,
pub or: String,
pub switch: String,
pub r#true: String,
pub xor: String,
pub log: String,
pub log10: String,
pub ln: String,
pub sin: String,
pub cos: String,
pub tan: String,
pub asin: String,
pub acos: String,
pub atan: String,
pub sinh: String,
pub cosh: String,
pub tanh: String,
pub asinh: String,
pub acosh: String,
pub atanh: String,
pub acot: String,
pub acoth: String,
pub cot: String,
pub coth: String,
pub csc: String,
pub csch: String,
pub sec: String,
pub sech: String,
pub abs: String,
pub pi: String,
pub sqrt: String,
pub sqrtpi: String,
pub atan2: String,
pub power: String,
pub max: String,
pub min: String,
pub product: String,
pub rand: String,
pub randbetween: String,
pub round: String,
pub rounddown: String,
pub roundup: String,
pub sum: String,
pub sumif: String,
pub sumifs: String,
pub choose: String,
pub column: String,
pub columns: String,
pub index: String,
pub indirect: String,
pub hlookup: String,
pub lookup: String,
pub r#match: String,
pub offset: String,
pub row: String,
pub rows: String,
pub vlookup: String,
pub xlookup: String,
pub concatenate: String,
pub exact: String,
pub value: String,
pub t: String,
pub valuetotext: String,
pub concat: String,
pub find: String,
pub left: String,
pub len: String,
pub lower: String,
pub mid: String,
pub right: String,
pub search: String,
pub text: String,
pub trim: String,
pub unicode: String,
pub upper: String,
pub isnumber: String,
pub isnontext: String,
pub istext: String,
pub islogical: String,
pub isblank: String,
pub iserr: String,
pub iserror: String,
pub isna: String,
pub na: String,
pub isref: String,
pub isodd: String,
pub iseven: String,
pub errortype: String,
pub formulatext: String,
pub isformula: String,
pub r#type: String,
pub sheet: String,
pub average: String,
pub averagea: String,
pub avedev: String,
pub averageif: String,
pub averageifs: String,
pub count: String,
pub counta: String,
pub countblank: String,
pub countif: String,
pub countifs: String,
pub maxifs: String,
pub minifs: String,
pub geomean: String,
pub year: String,
pub day: String,
pub month: String,
pub eomonth: String,
pub date: String,
pub datedif: String,
pub datevalue: String,
pub edate: String,
pub networkdays: String,
pub networkdaysintl: String,
pub time: String,
pub timevalue: String,
pub hour: String,
pub minute: String,
pub second: String,
pub today: String,
pub now: String,
pub days: String,
pub days360: String,
pub weekday: String,
pub weeknum: String,
pub workday: String,
pub workdayintl: String,
pub yearfrac: String,
pub isoweeknum: String,
pub pmt: String,
pub pv: String,
pub rate: String,
pub nper: String,
pub fv: String,
pub ppmt: String,
pub ipmt: String,
pub npv: String,
pub mirr: String,
pub irr: String,
pub xirr: String,
pub xnpv: String,
pub rept: String,
pub textafter: String,
pub textbefore: String,
pub textjoin: String,
pub substitute: String,
pub ispmt: String,
pub rri: String,
pub sln: String,
pub syd: String,
pub nominal: String,
pub effect: String,
pub pduration: String,
pub tbillyield: String,
pub tbillprice: String,
pub tbilleq: String,
pub dollarde: String,
pub dollarfr: String,
pub ddb: String,
pub db: String,
pub cumprinc: String,
pub cumipmt: String,
pub besseli: String,
pub besselj: String,
pub besselk: String,
pub bessely: String,
pub erf: String,
pub erfprecise: String,
pub erfc: String,
pub erfcprecise: String,
pub bin2dec: String,
pub bin2hex: String,
pub bin2oct: String,
pub dec2bin: String,
pub dec2hex: String,
pub dec2oct: String,
pub hex2bin: String,
pub hex2dec: String,
pub hex2oct: String,
pub oct2bin: String,
pub oct2dec: String,
pub oct2hex: String,
pub bitand: String,
pub bitlshift: String,
pub bitor: String,
pub bitrshift: String,
pub bitxor: String,
pub complex: String,
pub imabs: String,
pub imaginary: String,
pub imargument: String,
pub imconjugate: String,
pub imcos: String,
pub imcosh: String,
pub imcot: String,
pub imcsc: String,
pub imcsch: String,
pub imdiv: String,
pub imexp: String,
pub imln: String,
pub imlog10: String,
pub imlog2: String,
pub impower: String,
pub improduct: String,
pub imreal: String,
pub imsec: String,
pub imsech: String,
pub imsin: String,
pub imsinh: String,
pub imsqrt: String,
pub imsub: String,
pub imsum: String,
pub imtan: String,
pub convert: String,
pub delta: String,
pub gestep: String,
pub subtotal: String,
pub exp: String,
pub fact: String,
pub factdouble: String,
pub sign: String,
pub radians: String,
pub degrees: String,
pub int: String,
pub even: String,
pub odd: String,
pub ceiling: String,
pub ceilingmath: String,
pub ceilingprecise: String,
pub floor: String,
pub floormath: String,
pub floorprecise: String,
pub isoceiling: String,
pub r#mod: String,
pub quotient: String,
pub mround: String,
pub trunc: String,
pub gcd: String,
pub lcm: String,
pub base: String,
pub decimal: String,
pub roman: String,
pub arabic: String,
pub combin: String,
pub combina: String,
pub sumsq: String,
pub n: String,
pub cell: String,
pub info: String,
pub sheets: String,
pub daverage: String,
pub dcount: String,
pub dget: String,
pub dmax: String,
pub dmin: String,
pub dsum: String,
pub dcounta: String,
pub dproduct: String,
pub dstdev: String,
pub dvar: String,
pub dvarp: String,
pub dstdevp: String,
pub betadist: String,
pub betainv: String,
pub binomdist: String,
pub binomdistrange: String,
pub binominv: String,
pub chisqdist: String,
pub chisqdistrt: String,
pub chisqinv: String,
pub chisqinvrt: String,
pub chisqtest: String,
pub confidencenorm: String,
pub confidencet: String,
pub covariancep: String,
pub covariances: String,
pub devsq: String,
pub expondist: String,
pub fdist: String,
pub fdistrt: String,
pub finv: String,
pub finvrt: String,
pub fisher: String,
pub fisherinv: String,
pub ftest: String,
pub gamma: String,
pub gammadist: String,
pub gammainv: String,
pub gammaln: String,
pub gammalnprecise: String,
pub hypgeomdist: String,
pub lognormdist: String,
pub lognorminv: String,
pub negbinomdist: String,
pub normdist: String,
pub norminv: String,
pub normsdist: String,
pub normsinv: String,
pub pearson: String,
pub phi: String,
pub poissondist: String,
pub standardize: String,
pub stdevp: String,
pub stdevs: String,
pub stdeva: String,
pub stdevpa: String,
pub tdist: String,
pub tdist2t: String,
pub tdistrt: String,
pub tinv: String,
pub tinv2t: String,
pub ttest: String,
pub varp: String,
pub vars: String,
pub varpa: String,
pub vara: String,
pub weibulldist: String,
pub ztest: String,
pub sumx2my2: String,
pub sumx2py2: String,
pub sumxmy2: String,
pub correl: String,
pub rsq: String,
pub intercept: String,
pub slope: String,
pub steyx: String,
pub gauss: String,
pub harmean: String,
pub kurt: String,
pub large: String,
pub maxa: String,
pub median: String,
pub mina: String,
pub rankavg: String,
pub rankeq: String,
pub skew: String,
pub skewp: String,
pub small: String,
}
#[derive(Encode, Decode)]
pub struct Language {
pub name: String,
pub code: String,
pub booleans: Booleans,
pub errors: Errors,
pub functions: Functions,
}
pub fn get_default_language() -> &'static Language {
#[allow(clippy::unwrap_used)]
get_language("en").unwrap()
}
static LANGUAGES: OnceLock<HashMap<String, Language>> = OnceLock::new();
@@ -39,7 +396,7 @@ fn get_languages() -> &'static HashMap<String, Language> {
})
}
pub fn get_language(id: &str) -> Result<&Language, String> {
pub fn get_language(id: &str) -> Result<&'static Language, String> {
get_languages()
.get(id)
.ok_or_else(|| format!("Language is not supported: '{id}'"))

View File

@@ -57,8 +57,10 @@ mod test;
#[cfg(test)]
pub mod mock_time;
pub use locale::get_supported_locales;
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;
pub use utils::get_all_timezones;

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -2,36 +2,39 @@ use std::{collections::HashMap, sync::OnceLock};
use bitcode::{Decode, Encode};
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Locale {
pub dates: Dates,
pub numbers: NumbersProperties,
pub currency: Currency,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Currency {
pub iso: String,
pub symbol: String,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct NumbersProperties {
pub symbols: NumbersSymbols,
pub decimal_formats: DecimalFormats,
pub currency_formats: CurrencyFormats,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct Dates {
pub day_names: Vec<String>,
pub day_names_short: Vec<String>,
pub months: Vec<String>,
pub months_short: Vec<String>,
pub months_letter: Vec<String>,
pub date_formats: DateFormats,
pub time_formats: DateFormats,
pub date_time_formats: DateFormats,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct NumbersSymbols {
pub decimal: String,
pub group: String,
@@ -49,7 +52,7 @@ pub struct NumbersSymbols {
}
// See: https://cldr.unicode.org/translation/number-currency-formats/number-and-currency-patterns
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct CurrencyFormats {
pub standard: String,
pub standard_alpha_next_to_number: Option<String>,
@@ -59,11 +62,32 @@ pub struct CurrencyFormats {
pub accounting_no_currency: String,
}
#[derive(Encode, Decode, Clone)]
#[derive(Encode, Decode)]
pub struct DecimalFormats {
pub standard: String,
}
#[derive(Encode, Decode)]
pub struct DateFormats {
pub full: String,
pub long: String,
pub medium: String,
pub short: String,
}
#[derive(Encode, Decode)]
pub struct TimeFormats {
pub full: String,
pub long: String,
pub medium: String,
pub short: String,
}
pub fn get_default_locale() -> &'static Locale {
#[allow(clippy::unwrap_used)]
get_locale("en").unwrap()
}
static LOCALES: OnceLock<HashMap<String, Locale>> = OnceLock::new();
#[allow(clippy::expect_used)]
@@ -73,7 +97,12 @@ fn get_locales() -> &'static HashMap<String, Locale> {
})
}
pub fn get_locale(id: &str) -> Result<&Locale, String> {
/// Get all available locale IDs.
pub fn get_supported_locales() -> Vec<String> {
get_locales().keys().cloned().collect()
}
pub fn get_locale(id: &str) -> Result<&'static Locale, String> {
get_locales()
.get(id)
.ok_or_else(|| format!("Invalid locale: '{id}'"))

View File

@@ -11,7 +11,7 @@ use crate::{
lexer::LexerMode,
parser::{
move_formula::{move_formula, MoveContext},
stringify::{rename_defined_name_in_node, to_rc_format, to_string},
stringify::{rename_defined_name_in_node, to_localized_string, to_rc_format},
Node, Parser,
},
token::{get_error_by_name, Error, OpCompare, OpProduct, OpSum, OpUnary},
@@ -24,8 +24,8 @@ use crate::{
},
functions::util::compare_values,
implicit_intersection::implicit_intersection,
language::{get_language, Language},
locale::{get_locale, Currency, Locale},
language::{get_default_language, get_language, Language},
locale::{get_locale, Locale},
types::*,
utils as common,
};
@@ -95,7 +95,7 @@ pub(crate) enum ParsedDefinedName {
/// * A list of cells with its status (evaluating, evaluated, not evaluated)
/// * A dictionary with the shared strings and their indices.
/// This is an optimization for large files (~1 million rows)
pub struct Model {
pub struct Model<'a> {
/// A Rust internal representation of an Excel workbook
pub workbook: Workbook,
/// A list of parsed formulas
@@ -105,13 +105,13 @@ pub struct Model {
/// An optimization to lookup strings faster
pub(crate) shared_strings: HashMap<String, usize>,
/// An instance of the parser
pub(crate) parser: Parser,
pub(crate) parser: Parser<'a>,
/// The list of cells with formulas that are evaluated or being evaluated
pub(crate) cells: HashMap<(u32, i32, i32), CellState>,
/// The locale of the model
pub(crate) locale: Locale,
pub(crate) locale: &'a Locale,
/// The language used
pub(crate) language: Language,
pub(crate) language: &'a Language,
/// The timezone used to evaluate the model
pub(crate) tz: Tz,
/// The view id. A view consists of a selected sheet and ranges.
@@ -129,7 +129,7 @@ pub struct CellIndex {
pub column: i32,
}
impl Model {
impl<'a> Model<'a> {
pub(crate) fn evaluate_node_with_reference(
&mut self,
node: &Node,
@@ -375,7 +375,7 @@ impl Model {
}
FunctionKind { kind, args } => self.evaluate_function(kind, args, cell),
InvalidFunctionKind { name, args: _ } => {
CalcResult::new_error(Error::ERROR, cell, format!("Invalid function: {name}"))
CalcResult::new_error(Error::NAME, cell, format!("Invalid function: {name}"))
}
ArrayKind(s) => CalcResult::Array(s.to_owned()),
DefinedNameKind((name, scope, _)) => {
@@ -680,7 +680,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// assert_eq!(model.workbook.worksheet(0)?.color, None);
/// model.set_sheet_color(0, "#DBBE29")?;
/// assert_eq!(model.workbook.worksheet(0)?.color, Some("#DBBE29".to_string()));
@@ -721,7 +721,7 @@ impl Model {
BooleanCell { v, .. } => CalcResult::Boolean(*v),
NumberCell { v, .. } => CalcResult::Number(*v),
ErrorCell { ei, .. } => {
let message = ei.to_localized_error_string(&self.language);
let message = ei.to_localized_error_string(self.language);
CalcResult::new_error(ei.clone(), cell_reference, message)
}
SharedString { si, .. } => {
@@ -747,7 +747,7 @@ impl Model {
CalcResult::Error {
error: ei.clone(),
origin: cell_reference,
message: ei.to_localized_error_string(&self.language),
message: ei.to_localized_error_string(self.language),
}
}
}
@@ -761,7 +761,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// assert_eq!(model.is_empty_cell(0, 1, 1)?, true);
/// model.set_user_input(0, 1, 1, "Attention is all you need".to_string());
/// assert_eq!(model.is_empty_cell(0, 1, 1)?, false);
@@ -839,9 +839,9 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::cell::CellValue;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// model.set_user_input(0, 1, 1, "Stella!".to_string());
/// let model2 = Model::from_bytes(&model.to_bytes())?;
/// let model2 = Model::from_bytes(&model.to_bytes(), "en")?;
/// assert_eq!(
/// model2.get_cell_value_by_index(0, 1, 1),
/// Ok(CellValue::String("Stella!".to_string()))
@@ -852,10 +852,10 @@ impl Model {
///
/// See also:
/// * [Model::to_bytes]
pub fn from_bytes(s: &[u8]) -> Result<Model, String> {
pub fn from_bytes(s: &[u8], language_id: &'a str) -> Result<Model<'a>, String> {
let workbook: Workbook =
bitcode::decode(s).map_err(|e| format!("Error parsing workbook: {e}"))?;
Model::from_workbook(workbook)
Model::from_workbook(workbook, language_id)
}
/// Returns a model from a Workbook object
@@ -866,9 +866,9 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::cell::CellValue;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// model.set_user_input(0, 1, 1, "Stella!".to_string());
/// let model2 = Model::from_workbook(model.workbook)?;
/// let model2 = Model::from_workbook(model.workbook, "en")?;
/// assert_eq!(
/// model2.get_cell_value_by_index(0, 1, 1),
/// Ok(CellValue::String("Stella!".to_string()))
@@ -876,7 +876,7 @@ impl Model {
/// # Ok(())
/// # }
/// ```
pub fn from_workbook(workbook: Workbook) -> Result<Model, String> {
pub fn from_workbook(workbook: Workbook, language_id: &str) -> Result<Model<'_>, String> {
let parsed_formulas = Vec::new();
let worksheets = &workbook.worksheets;
@@ -892,20 +892,27 @@ impl Model {
// }
// tables.push(tables_in_sheet);
// }
let parser = Parser::new(worksheet_names, defined_names, workbook.tables.clone());
let cells = HashMap::new();
let locale = get_locale(&workbook.settings.locale)
.map_err(|_| "Invalid locale".to_string())?
.clone();
let locale =
get_locale(&workbook.settings.locale).map_err(|_| "Invalid locale".to_string())?;
let tz: Tz = workbook
.settings
.tz
.parse()
.map_err(|_| format!("Invalid timezone: {}", workbook.settings.tz))?;
// FIXME: Add support for display languages
#[allow(clippy::expect_used)]
let language = get_language("en").expect("").clone();
let language = match get_language(language_id) {
Ok(lang) => lang,
Err(_) => return Err("Invalid language".to_string()),
};
let parser = Parser::new(
worksheet_names,
defined_names,
workbook.tables.clone(),
locale,
language,
);
let mut shared_strings = HashMap::new();
for (index, s) in workbook.shared_strings.iter().enumerate() {
shared_strings.insert(s.to_string(), index);
@@ -938,7 +945,7 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::expressions::types::CellReferenceIndex;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// model.set_user_input(0, 1, 1, "Stella!".to_string());
/// let reference = model.parse_reference("Sheet1!D40");
/// assert_eq!(reference, Some(CellReferenceIndex {sheet: 0, row: 40, column: 4}));
@@ -1004,7 +1011,7 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::expressions::types::{Area, CellReferenceIndex};
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let source = CellReferenceIndex { sheet: 0, row: 3, column: 1};
/// let target = CellReferenceIndex { sheet: 0, row: 50, column: 1};
/// let area = Area { sheet: 0, row: 1, column: 1, width: 5, height: 4};
@@ -1060,6 +1067,8 @@ impl Model {
row_delta: target.row - source.row,
column_delta: target.column - source.column,
},
self.locale,
self.language,
);
Ok(format!("={formula_str}"))
} else {
@@ -1074,7 +1083,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "=B1*D4".to_string());
/// let (target_row, target_column) = (30, 1);
@@ -1098,7 +1107,7 @@ impl Model {
let cell = self.workbook.worksheet(sheet)?.cell(row, column);
let result = match cell {
Some(cell) => match cell.get_formula() {
None => cell.get_text(&self.workbook.shared_strings, &self.language),
None => cell.get_localized_text(&self.workbook.shared_strings, self.language),
Some(i) => {
let formula = &self.parsed_formulas[sheet as usize][i as usize];
let cell_ref = CellReferenceRC {
@@ -1106,7 +1115,10 @@ impl Model {
row: target_row,
column: target_column,
};
format!("={}", to_string(formula, &cell_ref))
format!(
"={}",
to_localized_string(formula, &cell_ref, self.locale, self.language)
)
}
},
None => "".to_string(),
@@ -1122,7 +1134,7 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::expressions::types::CellReferenceIndex;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let source = CellReferenceIndex {sheet: 0, row: 1, column: 1};
/// let target = CellReferenceIndex {sheet: 0, row: 30, column: 1};
/// let result = model.extend_copied_value("=B1*D4", &source, &target)?;
@@ -1164,7 +1176,10 @@ impl Model {
row: target.row,
column: target.column,
};
return Ok(format!("={}", to_string(formula, &cell_reference)));
return Ok(format!(
"={}",
to_localized_string(formula, &cell_reference, self.locale, self.language)
));
};
Ok(value.to_string())
}
@@ -1176,7 +1191,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "=SIN(B1*C3)+1".to_string());
/// model.evaluate();
@@ -1187,7 +1202,7 @@ impl Model {
/// ```
///
/// See also:
/// * [Model::get_cell_content()]
/// * [Model::get_localized_cell_content()]
pub fn get_cell_formula(
&self,
sheet: u32,
@@ -1209,7 +1224,47 @@ impl Model {
row,
column,
};
Ok(Some(format!("={}", to_string(formula, &cell_ref))))
Ok(Some(format!(
"={}",
to_localized_string(formula, &cell_ref, self.locale, self.language)
)))
}
None => Ok(None),
},
None => Ok(None),
}
}
/// Returns the text for the formula in (`sheet`, `row`, `column`) in English if any
///
/// See also:
/// * [Model::get_localized_cell_content()]
pub(crate) fn get_english_cell_formula(
&self,
sheet: u32,
row: i32,
column: i32,
) -> Result<Option<String>, String> {
let worksheet = self.workbook.worksheet(sheet)?;
match worksheet.cell(row, column) {
Some(cell) => match cell.get_formula() {
Some(formula_index) => {
let formula = &self
.parsed_formulas
.get(sheet as usize)
.ok_or("missing sheet")?
.get(formula_index as usize)
.ok_or("missing formula")?;
let cell_ref = CellReferenceRC {
sheet: worksheet.get_name(),
row,
column,
};
let language_en = get_default_language();
Ok(Some(format!(
"={}",
to_localized_string(formula, &cell_ref, self.locale, language_en)
)))
}
None => Ok(None),
},
@@ -1225,13 +1280,13 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "Hello!".to_string())?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "Hello!".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "Hello!".to_string());
///
/// model.update_cell_with_text(sheet, row, column, "Goodbye!")?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "Goodbye!".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "Goodbye!".to_string());
/// # Ok(())
/// # }
/// ```
@@ -1250,7 +1305,7 @@ impl Model {
) -> Result<(), String> {
let style_index = self.get_cell_style_index(sheet, row, column)?;
let new_style_index;
if common::value_needs_quoting(value, &self.language) {
if common::value_needs_quoting(value, self.language) {
new_style_index = self
.workbook
.styles
@@ -1275,13 +1330,13 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "TRUE".to_string())?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "TRUE".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "TRUE".to_string());
///
/// model.update_cell_with_bool(sheet, row, column, false)?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "FALSE".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "FALSE".to_string());
/// # Ok(())
/// # }
/// ```
@@ -1317,13 +1372,13 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "42".to_string())?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "42".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "42".to_string());
///
/// model.update_cell_with_number(sheet, row, column, 23.0)?;
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "23".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "23".to_string());
/// # Ok(())
/// # }
/// ```
@@ -1360,15 +1415,15 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "=A2*2".to_string())?;
/// model.evaluate();
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A2*2".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "=A2*2".to_string());
///
/// model.update_cell_with_formula(sheet, row, column, "=A3*2".to_string())?;
/// model.evaluate();
/// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A3*2".to_string());
/// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "=A3*2".to_string());
/// # Ok(())
/// # }
/// ```
@@ -1413,7 +1468,7 @@ impl Model {
/// # use ironcalc_base::Model;
/// # use ironcalc_base::cell::CellValue;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// model.set_user_input(0, 1, 1, "100$".to_string());
/// model.set_user_input(0, 2, 1, "125$".to_string());
/// model.set_user_input(0, 3, 1, "-10$".to_string());
@@ -1441,7 +1496,7 @@ impl Model {
let style_index = self.get_cell_style_index(sheet, row, column)?;
if let Some(new_value) = value.strip_prefix('\'') {
// First check if it needs quoting
let new_style = if common::value_needs_quoting(new_value, &self.language) {
let new_style = if common::value_needs_quoting(new_value, self.language) {
self.workbook
.styles
.get_style_with_quote_prefix(style_index)?
@@ -1478,8 +1533,16 @@ impl Model {
if !currencies.iter().any(|e| e == currency) {
currencies.push(currency);
}
let (decimal_separator, group_separator) =
if self.locale.numbers.symbols.decimal == "," {
(b',', b'.')
} else {
(b'.', b',')
};
// We try to parse as number
if let Ok((v, number_format)) = parse_formatted_number(&value, &currencies) {
if let Ok((v, number_format)) =
parse_formatted_number(&value, &currencies, decimal_separator, group_separator)
{
if let Some(num_fmt) = number_format {
// Should not apply the format in the following cases:
// - we assign a date to already date-formatted cell
@@ -1506,7 +1569,7 @@ impl Model {
// Check is it is error value
let upper = value.to_uppercase();
let worksheet = self.workbook.worksheet_mut(sheet)?;
match get_error_by_name(&upper, &self.language) {
match get_error_by_name(&upper, self.language) {
Some(error) => {
worksheet.set_cell_with_error(row, column, error, new_style_index)?;
}
@@ -1685,7 +1748,7 @@ impl Model {
.cell(row, column)
.cloned()
.unwrap_or_default();
let cell_value = cell.value(&self.workbook.shared_strings, &self.language);
let cell_value = cell.value(&self.workbook.shared_strings, self.language);
Ok(cell_value)
}
@@ -1700,7 +1763,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "=1/3".to_string());
/// model.evaluate();
@@ -1719,8 +1782,8 @@ impl Model {
Some(cell) => {
let format = self.get_style_for_cell(sheet_index, row, column)?.num_fmt;
let formatted_value =
cell.formatted_value(&self.workbook.shared_strings, &self.language, |value| {
format_number(value, &format, &self.locale).text
cell.formatted_value(&self.workbook.shared_strings, self.language, |value| {
format_number(value, &format, self.locale).text
});
Ok(formatted_value)
}
@@ -1736,10 +1799,16 @@ impl Model {
})
}
/// Returns a string with the cell content. If there is a formula returns the formula
/// Returns a string with the cell content in the given language and locale.
/// If there is a formula returns the formula
/// If the cell is empty returns the empty string
/// Raises an error if there is no worksheet
pub fn get_cell_content(&self, sheet: u32, row: i32, column: i32) -> Result<String, String> {
/// Returns an error if there is no worksheet
pub fn get_localized_cell_content(
&self,
sheet: u32,
row: i32,
column: i32,
) -> Result<String, String> {
let worksheet = self.workbook.worksheet(sheet)?;
let cell = match worksheet.cell(row, column) {
Some(c) => c,
@@ -1753,9 +1822,12 @@ impl Model {
row,
column,
};
Ok(format!("={}", to_string(formula, &cell_ref)))
Ok(format!(
"={}",
to_localized_string(formula, &cell_ref, self.locale, self.language)
))
}
None => Ok(cell.get_text(&self.workbook.shared_strings, &self.language)),
None => Ok(cell.get_localized_text(&self.workbook.shared_strings, self.language)),
}
}
@@ -1807,7 +1879,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "100$".to_string());
/// model.cell_clear_contents(sheet, row, column);
@@ -1834,7 +1906,7 @@ impl Model {
/// ```rust
/// # use ironcalc_base::Model;
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
/// let mut model = Model::new_empty("model", "en", "UTC")?;
/// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
/// let (sheet, row, column) = (0, 1, 1);
/// model.set_user_input(sheet, row, column, "100$".to_string());
/// model.cell_clear_all(sheet, row, column);
@@ -1958,29 +2030,6 @@ impl Model {
Ok(rows.join("\n"))
}
/// Sets the currency of the model.
/// Currently we only support `USD`, `EUR`, `GBP` and `JPY`
/// NB: This is not preserved in the JSON.
pub fn set_currency(&mut self, iso: &str) -> Result<(), &str> {
// TODO: Add a full list
let symbol = if iso == "USD" {
"$"
} else if iso == "EUR" {
""
} else if iso == "GBP" {
"£"
} else if iso == "JPY" {
"¥"
} else {
return Err("Unsupported currency");
};
self.locale.currency = Currency {
symbol: symbol.to_string(),
iso: iso.to_string(),
};
Ok(())
}
/// Returns the number of frozen rows in `sheet`
pub fn get_frozen_rows_count(&self, sheet: u32) -> Result<i32, String> {
if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
@@ -2106,12 +2155,9 @@ impl Model {
}
// Make sure the formula is valid
match common::ParsedReference::parse_reference_formula(
None,
formula,
&self.locale,
|name| self.get_sheet_index_by_name(name),
) {
match common::ParsedReference::parse_reference_formula(None, formula, self.locale, |name| {
self.get_sheet_index_by_name(name)
}) {
Ok(_) => {}
Err(_) => {
return Err("Formula: Invalid defined name formula".to_string());
@@ -2296,6 +2342,57 @@ impl Model {
pub fn delete_row_style(&mut self, sheet: u32, row: i32) -> Result<(), String> {
self.workbook.worksheet_mut(sheet)?.delete_row_style(row)
}
/// Sets the locale of the model
pub fn set_locale(&mut self, locale_id: &str) -> Result<(), String> {
let locale = match get_locale(locale_id) {
Ok(l) => l,
Err(_) => return Err(format!("Invalid locale: {locale_id}")),
};
self.parser.set_locale(locale);
self.locale = locale;
self.workbook.settings.locale = locale_id.to_string();
self.evaluate();
Ok(())
}
/// Sets the timezone of the model
pub fn set_timezone(&mut self, timezone: &str) -> Result<(), String> {
let tz: Tz = match &timezone.parse() {
Ok(tz) => *tz,
Err(_) => return Err(format!("Invalid timezone: {}", &timezone)),
};
self.tz = tz;
self.workbook.settings.tz = timezone.to_string();
self.evaluate();
Ok(())
}
/// Sets the language
pub fn set_language(&mut self, language_id: &str) -> Result<(), String> {
let language = match get_language(language_id) {
Ok(l) => l,
Err(_) => return Err(format!("Invalid language: {language_id}")),
};
self.parser.set_language(language);
self.language = language;
Ok(())
}
/// Gets the current language
pub fn get_language(&self) -> String {
self.language.name.clone()
}
/// Gets the timezone of the model
pub fn get_timezone(&self) -> String {
self.workbook.settings.tz.clone()
}
/// Gets the locale of the model
pub fn get_locale(&self) -> String {
self.workbook.settings.locale.clone()
}
}
#[cfg(test)]

View File

@@ -8,13 +8,13 @@ use crate::{
expressions::{
lexer::LexerMode,
parser::{
stringify::{rename_sheet_in_node, to_rc_format, to_string},
stringify::{rename_sheet_in_node, to_localized_string, to_rc_format},
Parser,
},
types::CellReferenceRC,
},
language::get_language,
locale::get_locale,
language::{get_default_language, get_language},
locale::{get_default_locale, get_locale},
model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
types::{
DefinedName, Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet,
@@ -37,7 +37,7 @@ fn is_valid_sheet_name(name: &str) -> bool {
!name.is_empty() && name.chars().count() <= 31 && !name.contains(&invalid[..])
}
impl Model {
impl<'a> Model<'a> {
/// 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, view_ids: &[&u32]) -> Worksheet {
let mut views = HashMap::new();
@@ -81,7 +81,14 @@ impl Model {
index + 1
}
// This function parses all the internal formulas in all the worksheets
// (in the default language ("en") and locale ("en") and the RC format)
pub(crate) fn parse_formulas(&mut self) {
let locale = self.locale;
let language = self.language;
self.parser.set_locale(get_default_locale());
self.parser.set_language(get_default_language());
self.parser.set_lexer_mode(LexerMode::R1C1);
let worksheets = &self.workbook.worksheets;
for worksheet in worksheets {
@@ -99,6 +106,8 @@ impl Model {
self.parsed_formulas.push(parse_formula);
}
self.parser.set_lexer_mode(LexerMode::A1);
self.parser.set_locale(locale);
self.parser.set_language(language);
}
pub(crate) fn parse_defined_names(&mut self) {
@@ -108,7 +117,7 @@ impl Model {
ParsedReference::parse_reference_formula(
None,
&defined_name.formula,
&self.locale,
self.locale,
|name| self.get_sheet_index_by_name(name),
) {
match reference {
@@ -290,7 +299,7 @@ impl Model {
for defined_name in &mut self.workbook.defined_names {
let mut t = self.parser.parse(&defined_name.formula, cell_reference);
rename_sheet_in_node(&mut t, sheet_index, new_name);
let formula = to_string(&t, cell_reference);
let formula = to_localized_string(&t, cell_reference, self.locale, self.language);
defined_names.push(DefinedName {
name: defined_name.name.clone(),
formula,
@@ -355,15 +364,24 @@ impl Model {
}
/// Creates a new workbook with one empty sheet
pub fn new_empty(name: &str, locale_id: &str, timezone: &str) -> Result<Model, String> {
pub fn new_empty(
name: &'a str,
locale_id: &'a str,
timezone: &'a str,
language_id: &'a str,
) -> Result<Model<'a>, String> {
let tz: Tz = match &timezone.parse() {
Ok(tz) => *tz,
Err(_) => return Err(format!("Invalid timezone: {}", &timezone)),
};
let locale = match get_locale(locale_id) {
Ok(l) => l.clone(),
Ok(l) => l,
Err(_) => return Err(format!("Invalid locale: {locale_id}")),
};
let language = match get_language(language_id) {
Ok(l) => l,
Err(_) => return Err(format!("Invalid language: {language_id}")),
};
let milliseconds = get_milliseconds_since_epoch();
let seconds = milliseconds / 1000;
@@ -409,13 +427,9 @@ impl Model {
let parsed_formulas = Vec::new();
let worksheets = &workbook.worksheets;
let worksheet_names = worksheets.iter().map(|s| s.get_name()).collect();
let parser = Parser::new(worksheet_names, vec![], HashMap::new());
let parser = Parser::new(worksheet_names, vec![], HashMap::new(), locale, language);
let cells = HashMap::new();
// FIXME: Add support for display languages
#[allow(clippy::expect_used)]
let language = get_language("en").expect("").clone();
let mut model = Model {
workbook,
shared_strings: HashMap::new(),

View File

@@ -213,7 +213,7 @@ impl Styles {
}
// TODO: Try to find a better spot for styles setters
impl Model {
impl<'a> Model<'a> {
pub fn set_cell_style(
&mut self,
sheet: u32,

View File

@@ -150,7 +150,7 @@ fn fn_hex2dec() {
model._set("A4", r#"=HEX2DEC("FE")"#);
model._set("B1", "=HEX2DEC()");
model._set("B2", "=HHEX2DEC(1,2,3)");
model._set("B2", "=HEX2DEC(1,2,3)");
model.evaluate();

View File

@@ -6,7 +6,6 @@ mod test_cell_clear_contents;
mod test_circular_references;
mod test_column_width;
mod test_criteria;
mod test_currency;
mod test_date_and_time;
mod test_datedif_leap_month_end;
mod test_days360_month_end;
@@ -63,6 +62,7 @@ mod test_fn_offset;
mod test_number_format;
mod test_arrays;
mod test_cell_info_n_sheets;
mod test_combin_combina;
mod test_escape_quotes;
mod test_even_odd;
@@ -79,7 +79,9 @@ mod test_get_cell_content;
mod test_implicit_intersection;
mod test_issue_155;
mod test_issue_483;
mod test_language;
mod test_ln;
mod test_locale;
mod test_log;
mod test_log10;
mod test_mod_quotient;

View File

@@ -5,10 +5,10 @@ use crate::test::util::new_empty_model;
#[test]
fn arguments() {
let mut model = new_empty_model();
model._set("A1", "=CELL("address",A1)");
model._set("A1", "=CELL(\"address\",A1)");
model._set("A2", "=CELL()");
model._set("A3", "=INFO("system")");
model._set("A3", "=INFO(\"system\")");
model._set("A4", "=INFO()");
model._set("A5", "=N(TRUE)");

View File

@@ -1,24 +0,0 @@
#![allow(clippy::unwrap_used)]
use crate::test::util::new_empty_model;
#[test]
fn test_cell_currency_dollar() {
let mut model = new_empty_model();
model._set("A1", "=PMT(8/1200,10,10000)");
model.evaluate();
assert_eq!(model._get_text("A1"), "-$1,037.03");
assert!(model.set_currency("EUR").is_ok());
}
#[test]
fn test_cell_currency_euro() {
let mut model = new_empty_model();
assert!(model.set_currency("EUR").is_ok());
model._set("A1", "=PMT(8/1200,10,10000)");
model.evaluate();
assert_eq!(model._get_text("A1"), "-€1,037.03");
}

View File

@@ -52,3 +52,32 @@ fn non_reference() {
assert_eq!(model._get_text("A1"), *"#ERROR!");
}
#[test]
fn test_language_independence() {
let mut model = new_empty_model();
model._set("A1", "=SUM(1, 2)");
model._set("B1", "=FORMULATEXT(A1)");
model.evaluate();
model.set_language("fr").unwrap();
model.evaluate();
assert_eq!(model._get_formula("A1"), *"=SOMME(1,2)");
assert_eq!(model._get_text("B1"), *"=SUM(1,2)");
}
#[test]
fn test_locale() {
let mut model = new_empty_model();
model._set("A1", "=SUM(1.123, 2)");
model._set("B1", "=FORMULATEXT(A1)");
model.evaluate();
model.set_language("fr").unwrap();
model.set_locale("fr").unwrap();
model.evaluate();
assert_eq!(model._get_formula("A1"), *"=SOMME(1,123;2)");
assert_eq!(model._get_text("B1"), *"=SUM(1,123;2)");
}

View File

@@ -23,7 +23,7 @@ const TIME_2_AM: &str = "0.083333333"; // 2:00 AM = 2/24 ≈ 0.083333333
const TIME_00_00_01: &str = "0.000011574"; // 1 second = 1/86400 ≈ 0.000011574
/// Helper function to set up and evaluate a model with time expressions
fn test_time_expressions(expressions: &[(&str, &str)]) -> crate::model::Model {
fn test_time_expressions<'a>(expressions: &[(&str, &str)]) -> crate::model::Model<'a> {
let mut model = new_empty_model();
for (cell, formula) in expressions {
model._set(cell, formula);

View File

@@ -481,7 +481,9 @@ fn test_cell_formula() {
);
}
// skip xlfn tests for now
#[test]
#[ignore]
fn test_xlfn() {
let mut model = new_empty_model();
model._set("A1", "=_xlfn.SIN(1)");

View File

@@ -14,9 +14,15 @@ fn test_formulas() {
model.evaluate();
assert_eq!(model.get_cell_content(0, 1, 1).unwrap(), "100.348");
assert_eq!(model.get_cell_content(0, 1, 2).unwrap(), "=ISNUMBER(A1)");
assert_eq!(model.get_cell_content(0, 5, 5).unwrap(), "");
assert_eq!(
model.get_localized_cell_content(0, 1, 1).unwrap(),
"100.348"
);
assert_eq!(
model.get_localized_cell_content(0, 1, 2).unwrap(),
"=ISNUMBER(A1)"
);
assert_eq!(model.get_localized_cell_content(0, 5, 5).unwrap(), "");
assert!(model.get_cell_content(1, 1, 2).is_err());
assert!(model.get_localized_cell_content(1, 1, 2).is_err());
}

View File

@@ -0,0 +1,52 @@
#![allow(clippy::unwrap_used)]
use crate::{test::util::new_empty_model, Model};
pub fn new_german_empty_model<'a>() -> Model<'a> {
Model::new_empty("model", "en", "UTC", "de").unwrap()
}
#[test]
fn german() {
let mut model = new_german_empty_model();
model._set("A1", "=WENN(1>2, 3, 4)");
model.evaluate();
assert_eq!(model._get_text("A1"), *"4");
}
#[test]
fn french() {
let mut model = new_empty_model();
model._set("A1", "=IF(1>2, 3, 4)");
model._set("B1", "=TRUE");
model._set("C1", "=FALSE()");
model._set("D1", "=FALSE");
model.evaluate();
model.set_language("fr").unwrap();
model.evaluate();
assert_eq!(model._get_text("A1"), *"4");
assert_eq!(model._get_formula("A1"), *"=SI(1>2,3,4)");
assert_eq!(model._get_formula("B1"), *"=VRAI");
assert_eq!(model._get_formula("C1"), *"=FAUX()");
assert_eq!(model._get_formula("D1"), *"=FAUX");
assert_eq!(model._get_text("B1"), *"VRAI");
assert_eq!(model._get_text("C1"), *"FAUX");
assert_eq!(model._get_text("D1"), *"FAUX");
}
#[test]
fn spanish() {
let mut model = new_empty_model();
model._set("A1", "=TRUE()");
model.evaluate();
model.set_language("es").unwrap();
model._set("B1", "=TRUE()");
model.evaluate();
assert_eq!(model._get_formula("A1"), *"=VERDADERO()");
assert_eq!(model._get_text("A1"), *"VERDADERO");
assert_eq!(model._get_text("B1"), *"#¿NOMBRE?");
}

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