big ole rename for consistent terminology: scalar, vector, matrix, tensor

3 files changed, 26 insertions, 26 deletions

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<pos {pos - *param} else {0}})
+        Ok(Selection::Scalar {buffer_id, pos: if *param<pos {pos - *param} else {0}})
     },
     monadic_rank1: |(param, _), buffer_id, int| {
-        Ok(Selection::Position {buffer_id, pos: if *param<int.end {int.end - *param} else {0}})
+        Ok(Selection::Scalar {buffer_id, pos: if *param<int.end {int.end - *param} else {0}})
     }
 );
 
@@ -73,10 +73,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<pos {pos - *param} else {0}})
+        Ok(Selection::Scalar {buffer_id, pos: if *param<pos {pos - *param} else {0}})
     },
     monadic_rank1: |(param, _), buffer_id, int| {
-        Ok(Selection::Position {buffer_id, pos: if *param<int.start {int.start - *param} else {0}})
+        Ok(Selection::Scalar {buffer_id, pos: if *param<int.start {int.start - *param} else {0}})
     }
 );
 
diff --git a/rprt-engine/src/selection_functions/function_end.rs b/rprt-engine/src/selection_functions/function_end.rs
index 44aab90..75b4c96 100644
--- a/rprt-engine/src/selection_functions/function_end.rs
+++ b/rprt-engine/src/selection_functions/function_end.rs
@@ -11,36 +11,36 @@ selection_function! {
     param_type: (),
     niladic: |(_, es): ((), &EditorState)| {
         let buf = get_buffer(es, es.current_buffer_id)?;
-        Ok(Selection::Position {
+        Ok(Selection::Scalar {
             buffer_id: es.current_buffer_id,
             pos: buf.max_pos(),
         })
     },
-    monadic_rank0: |_, buffer_id, pos | Ok(Selection::Position { buffer_id, pos }),
-    monadic_rank1: |_, buffer_id, int | Ok(Selection::Position { buffer_id, pos: int.end })
+    monadic_rank0: |_, buffer_id, pos | Ok(Selection::Scalar { buffer_id, pos }),
+    monadic_rank1: |_, buffer_id, int | Ok(Selection::Scalar { buffer_id, pos: int.end })
 }
 
 selection_function! {
     name: reverse_end,
     param_type: (),
     niladic: |(_, es): ((), &EditorState)| {
-        Ok(Selection::Position {
+        Ok(Selection::Scalar {
             buffer_id: es.current_buffer_id,
             pos: 0,
         })
     },
-    monadic_rank0: |_, buffer_id, pos | Ok(Selection::Position { buffer_id, pos }),
-    monadic_rank1: |_, buffer_id, int | Ok(Selection::Position { buffer_id, pos: int.start })
+    monadic_rank0: |_, buffer_id, pos | Ok(Selection::Scalar { buffer_id, pos }),
+    monadic_rank1: |_, buffer_id, int | Ok(Selection::Scalar { buffer_id, pos: int.start })
 }
 
 selection_function! {
     name: sequential_end,
     param_type: (),
     niladic: |_| Err(SFError::NoNiladicForm(";$").into()),
-    monadic_rank0: |_, buffer_id, pos| Ok(Selection::Position { buffer_id, pos }),
+    monadic_rank0: |_, buffer_id, pos| Ok(Selection::Scalar { buffer_id, pos }),
     monadic_rank1: |(_, es), buffer_id, _| {
         let buf = get_buffer(es, buffer_id)?;
-        Ok(Selection::Position { buffer_id, pos: buf.max_pos() })
+        Ok(Selection::Scalar { buffer_id, pos: buf.max_pos() })
     }
 }
 
@@ -49,10 +49,10 @@ selection_function! {
     param_type: (),
     niladic: |_| Err(SFError::NoNiladicForm(";'$").into()),
     monadic_rank0: |_, buffer_id, pos| {
-        Ok(Selection::Position { buffer_id, pos })
+        Ok(Selection::Scalar { buffer_id, pos })
     },
     monadic_rank1: |_, buffer_id, interval| {
-        Ok(Selection::Position {
+        Ok(Selection::Scalar {
             buffer_id,
             pos: interval.end,
         })
@@ -64,10 +64,10 @@ selection_function! {
     param_type: (),
     niladic: |_| Err(SFError::NoNiladicForm("';$").into()),
     monadic_rank0: |_, buffer_id, pos| {
-        Ok(Selection::Position { buffer_id, pos })
+        Ok(Selection::Scalar { buffer_id, pos })
     },
     monadic_rank1: |_, buffer_id, interval| {
-        Ok(Selection::Position {
+        Ok(Selection::Scalar {
             buffer_id,
             pos: interval.end,
         })
diff --git a/rprt-engine/src/selection_functions/result_transformation.rs b/rprt-engine/src/selection_functions/result_transformation.rs
index 865038c..c150916 100644
--- a/rprt-engine/src/selection_functions/result_transformation.rs
+++ b/rprt-engine/src/selection_functions/result_transformation.rs
@@ -20,7 +20,7 @@ pub fn complement_transform(es: &EditorState, result: Selection) -> SFResult {
             if pos + 1 < max_pos {
                 ranges.push(Interval::new(pos + 1, max_pos));
             }
-            Ok(Selection::Ranges { buffer_id, ranges })
+            Ok(Selection::Vectors { buffer_id, ranges })
         } else {
             Err(SFError::BufferNotFound(buffer_id))
         }
@@ -48,7 +48,7 @@ pub fn complement_transform(es: &EditorState, result: Selection) -> SFResult {
                 ranges.push(Interval::new(0, interval.start));
                 ranges.push(Interval::new(interval.end, max_pos));
             }
-            Ok(Selection::Ranges { buffer_id, ranges })
+            Ok(Selection::Vectors { buffer_id, ranges })
         } else {
             Err(SFError::BufferNotFound(buffer_id))
         }