From 12455c6369547e970c4556bb20d8261eadc3b5ab Mon Sep 17 00:00:00 2001 From: tslil Date: Tue, 24 Mar 2026 18:27:04 +0000 Subject: big ole rename for consistent terminology: scalar, vector, matrix, tensor --- .../src/selection_functions/function_character.rs | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'rprt-engine/src/selection_functions/function_character.rs') diff --git a/rprt-engine/src/selection_functions/function_character.rs b/rprt-engine/src/selection_functions/function_character.rs index 87bda3d..b4bbf0f 100644 --- a/rprt-engine/src/selection_functions/function_character.rs +++ b/rprt-engine/src/selection_functions/function_character.rs @@ -11,14 +11,14 @@ selection_function! { param_type: usize, niladic: |(param, es): (usize, &EditorState)| { let buf = get_buffer(es, es.current_buffer_id)?; - Ok(Selection::Position { + Ok(Selection::Scalar { buffer_id: es.current_buffer_id, pos: usize::min(param, buf.max_pos()) }) }, - monadic_rank0: |_, buffer_id, pos| Ok(Selection::Position {buffer_id, pos}), + monadic_rank0: |_, buffer_id, pos| Ok(Selection::Scalar {buffer_id, pos}), monadic_rank1: |(param, _), buffer_id, int| Ok( - Selection::Position {buffer_id, pos: usize::min(int.end, *param)} + Selection::Scalar {buffer_id, pos: usize::min(int.end, *param)} ) } @@ -28,11 +28,11 @@ selection_function!( niladic: |_| Err(SFError::NoNiladicForm(";n").into()), monadic_rank0: |(param, es), buffer_id, pos| { let buf = get_buffer(es, buffer_id)?; - Ok(Selection::Position {buffer_id, pos: usize::min(pos+*param, buf.max_pos())}) + Ok(Selection::Scalar {buffer_id, pos: usize::min(pos+*param, buf.max_pos())}) }, monadic_rank1: |(param, es), buffer_id, int| { let buf = get_buffer(es, buffer_id)?; - Ok(Selection::Position {buffer_id, pos: usize::min(int.end+*param, buf.max_pos())}) + Ok(Selection::Scalar {buffer_id, pos: usize::min(int.end+*param, buf.max_pos())}) } ); @@ -41,7 +41,7 @@ selection_function!( param_type: usize, niladic: |(param, es): (usize, &EditorState)| { let buf = get_buffer(es, es.current_buffer_id)?; - Ok(Selection::Position { + Ok(Selection::Scalar { buffer_id: es.current_buffer_id, pos: if buf.max_pos() < param { 0 @@ -50,9 +50,9 @@ selection_function!( }, }) }, - monadic_rank0: |_, buffer_id, pos| Ok(Selection::Position {buffer_id, pos}), + monadic_rank0: |_, buffer_id, pos| Ok(Selection::Scalar {buffer_id, pos}), monadic_rank1: |(param, _), buffer_id, int| Ok( - Selection::Position {buffer_id, pos: usize::min(int.end, *param)} + Selection::Scalar {buffer_id, pos: usize::min(int.end, *param)} ) ); @@ -61,10 +61,10 @@ selection_function!( param_type: usize, niladic: |_| Err(SFError::NoNiladicForm(";'n").into()), monadic_rank0: |(param, _), buffer_id, pos| { - Ok(Selection::Position {buffer_id, pos: if *param