From a03aecedace8ccfca6bbfdc7a6c81842ddd51035 Mon Sep 17 00:00:00 2001
From: Andrew Morris <voltrevo@gmail.com>
Date: Fri, 23 Jun 2023 14:10:37 +1000
Subject: [PATCH] Add static eval for literals

---
 .../src/expression_compiler.rs                | 36 +++++++++++--------
 valuescript_compiler/src/static_eval_expr.rs  | 23 +++++++++++-
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/valuescript_compiler/src/expression_compiler.rs b/valuescript_compiler/src/expression_compiler.rs
index c96ee39..780a456 100644
--- a/valuescript_compiler/src/expression_compiler.rs
+++ b/valuescript_compiler/src/expression_compiler.rs
@@ -1391,21 +1391,13 @@ impl<'a> ExpressionCompiler<'a> {
   }
 
   pub fn compile_literal(&mut self, lit: &swc_ecma_ast::Lit) -> Value {
-    use swc_ecma_ast::Lit::*;
-
-    let (todo_name, message) = match lit {
-      Str(str_) => return Value::String(str_.value.to_string()),
-      Bool(bool_) => return Value::Bool(bool_.value),
-      Null(_) => return Value::Null,
-      Num(num) => return Value::Number(Number(num.value)),
-      BigInt(bigint) => return Value::BigInt(bigint.value.clone()),
-      Regex(_) => ("_todo_regex_literal", "Regex literals"),
-      JSXText(_) => ("_todo_jsxtext_literal", "JSXText literals"),
-    };
-
-    self.fnc.todo(lit.span(), message);
-
-    return Value::Register(self.fnc.allocate_numbered_reg(todo_name));
+    match value_from_literal(lit) {
+      Ok(value) => value,
+      Err(err) => {
+        self.fnc.todo(lit.span(), err);
+        return Value::Register(self.fnc.allocate_numbered_reg("_todo_unsupported_literal"));
+      }
+    }
   }
 
   pub fn pat(&mut self, pat: &swc_ecma_ast::Pat, register: &Register, skip_release: bool) {
@@ -1727,3 +1719,17 @@ pub fn make_update_op(op: swc_ecma_ast::UpdateOp, register: Register) -> Instruc
     MinusMinus => Instruction::OpDec(register),
   }
 }
+
+pub fn value_from_literal(lit: &swc_ecma_ast::Lit) -> Result<Value, &'static str> {
+  use swc_ecma_ast::Lit::*;
+
+  Ok(match lit {
+    Str(str_) => Value::String(str_.value.to_string()),
+    Bool(bool_) => Value::Bool(bool_.value),
+    Null(_) => Value::Null,
+    Num(num) => Value::Number(Number(num.value)),
+    BigInt(bigint) => Value::BigInt(bigint.value.clone()),
+    Regex(_) => return Err("Regex literals"),
+    JSXText(_) => return Err("JSXText literals"),
+  })
+}
diff --git a/valuescript_compiler/src/static_eval_expr.rs b/valuescript_compiler/src/static_eval_expr.rs
index ffe8356..0f5609d 100644
--- a/valuescript_compiler/src/static_eval_expr.rs
+++ b/valuescript_compiler/src/static_eval_expr.rs
@@ -1,6 +1,27 @@
-use crate::asm::{Builtin, Value};
+use crate::{
+  asm::{Builtin, Value},
+  expression_compiler::value_from_literal,
+};
 
 pub fn static_eval_expr(expr: &swc_ecma_ast::Expr) -> Option<Value> {
+  let symbol_iterator_opt = as_symbol_iterator(expr);
+
+  if symbol_iterator_opt.is_some() {
+    return symbol_iterator_opt;
+  }
+
+  match expr {
+    swc_ecma_ast::Expr::Lit(lit) => match value_from_literal(lit) {
+      Ok(value) => return Some(value),
+      _ => {}
+    },
+    _ => {} // TODO: Array, Object
+  }
+
+  None
+}
+
+fn as_symbol_iterator(expr: &swc_ecma_ast::Expr) -> Option<Value> {
   let member_expr = match expr {
     swc_ecma_ast::Expr::Member(member_expr) => member_expr,
     _ => return None,