Combine array and value identifiers. (#615)

amber-lang · Nov 24, 2024 · 14f3ebc · 14f3ebc
1 parent 82e496d
commit 14f3ebc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/src/modules/builtin/lines.rs b/src/modules/builtin/lines.rs
@@ -43,7 +43,7 @@ impl SyntaxModule<ParserMetadata> for LinesInvocation {
 
 impl TranslateModule for LinesInvocation {
     fn translate(&self, meta: &mut TranslateMetadata) -> String {
-        let name = format!("__AMBER_ARRAY_{}", meta.gen_array_id());
+        let name = format!("__AMBER_ARRAY_{}", meta.gen_value_id());
         let temp = format!("__AMBER_LINE_{}", meta.gen_value_id());
         let path = (*self.path).as_ref()
             .map(|p| p.translate_eval(meta, false))

diff --git a/src/modules/expression/binop/add.rs b/src/modules/expression/binop/add.rs
@@ -65,7 +65,7 @@ impl TranslateModule for Add {
         match self.kind {
             Type::Array(_) => {
                 let quote = meta.gen_quote();
-                let id = meta.gen_array_id();
+                let id = meta.gen_value_id();
                 let name = format!("__AMBER_ARRAY_ADD_{id}");
                 meta.stmt_queue.push_back(format!("{name}=({left} {right})"));
                 format!("{quote}${{{name}[@]}}{quote}")

diff --git a/src/modules/expression/literal/array.rs b/src/modules/expression/literal/array.rs
@@ -84,7 +84,7 @@ impl SyntaxModule<ParserMetadata> for Array {
 
 impl TranslateModule for Array {
     fn translate(&self, meta: &mut TranslateMetadata) -> String {
-        let name = format!("__AMBER_ARRAY_{}", meta.gen_array_id());
+        let name = format!("__AMBER_ARRAY_{}", meta.gen_value_id());
         let args = self.exprs.iter().map(|expr| expr.translate_eval(meta, false)).collect::<Vec<String>>().join(" ");
         let quote = meta.gen_quote();
         let dollar = meta.gen_dollar();

diff --git a/src/modules/variable/get.rs b/src/modules/variable/get.rs
@@ -75,7 +75,7 @@ impl TranslateModule for VariableGet {
             },
             (true, Type::Array(_)) => match *self.index {
                 Some(ref expr) => {
-                    let id = meta.gen_array_id();
+                    let id = meta.gen_value_id();
                     let expr = expr.translate_eval(meta, true);
                     meta.stmt_queue.push_back(format!("eval \"local __AMBER_ARRAY_GET_{id}_{name}=\\\"\\${{${name}[{expr}]}}\\\"\""));
                     format!("$__AMBER_ARRAY_GET_{id}_{name}") // echo $__ARRAY_GET

diff --git a/src/utils/metadata/translate.rs b/src/utils/metadata/translate.rs
@@ -18,9 +18,7 @@ pub struct TranslateMetadata {
     pub stmt_queue: VecDeque<String>,
     /// The metadata of the function that is currently being translated.
     pub fun_meta: Option<FunctionMetadata>,
-    /// Array id is used to determine the array that is being evaluated.
-    pub array_id: usize,
-    /// Value ID - used to store values in variables.
+    /// Used to determine the value or array being evaluated.
     pub value_id: usize,
     /// Determines whether the current context is a context in bash's `eval`.
     pub eval_ctx: bool,
@@ -39,7 +37,6 @@ impl TranslateMetadata {
             fun_cache: meta.fun_cache,
             fun_meta: None,
             stmt_queue: VecDeque::new(),
-            array_id: 0,
             value_id: 0,
             eval_ctx: false,
             silenced: false,
@@ -64,12 +61,6 @@ impl TranslateMetadata {
         self.indent -= 1;
     }
 
-    pub fn gen_array_id(&mut self) -> usize {
-        let id = self.array_id;
-        self.array_id += 1;
-        id
-    }
-
     pub fn gen_value_id(&mut self) -> usize {
         let id = self.value_id;
         self.value_id += 1;