Add stage size API

crates/cli/src/main.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Parser;
-use rascal::FileSystemSourceProvider;
 use rascal::ProgramBuilder;
+use rascal::{CompileOptions, FileSystemSourceProvider, SwfOptions};
 use std::fs;
 use std::path::PathBuf;
 
@@ -92,12 +92,12 @@ fn main() -> Result<()> {
     }
 
     let parsed = builder.build().unwrap_or_else(|e| panic!("{}", e));
-    let pcode = parsed.compile(opt.swf_version);
+    let pcode = parsed.compile(CompileOptions::default().with_swf_version(opt.swf_version));
     let output_path = opt
         .output
         .or_else(|| opt.script.first().map(|s| s.with_extension("swf")))
         .unwrap_or_else(|| PathBuf::from("output.swf"));
-    let swf = pcode.to_swf(opt.frame_rate)?;
+    let swf = pcode.to_swf(&SwfOptions::default().with_frame_rate(opt.frame_rate))?;
     fs::write(&output_path, swf)?;
     Ok(())
 }

crates/rascal/src/lib.rs

@@ -6,5 +6,5 @@ mod swf;
 #[cfg(test)]
 mod tests;
 
-pub use program::{CompiledProgram, Program, ProgramBuilder};
+pub use program::{CompileOptions, CompiledProgram, Program, ProgramBuilder, SwfOptions};
 pub use provider::{FileSystemSourceProvider, SourceProvider};

crates/rascal/src/program.rs

@@ -9,6 +9,66 @@ use crate::provider::SourceProvider;
 use indexmap::IndexSet;
 use serde::Serialize;
 
+#[derive(Debug, Clone, Serialize)]
+pub struct SwfOptions {
+    pub(crate) frame_rate: f32,
+    pub(crate) stage_x_min: f64,
+    pub(crate) stage_y_min: f64,
+    pub(crate) stage_x_max: f64,
+    pub(crate) stage_y_max: f64,
+}
+
+impl Default for SwfOptions {
+    fn default() -> Self {
+        Self {
+            frame_rate: 24.0,
+            stage_x_min: 0.0,
+            stage_y_min: 0.0,
+            stage_x_max: 100.0,
+            stage_y_max: 100.0,
+        }
+    }
+}
+
+impl SwfOptions {
+    pub fn with_frame_rate(mut self, frame_rate: f32) -> Self {
+        self.frame_rate = frame_rate;
+        self
+    }
+
+    pub fn with_stage_size(
+        mut self,
+        stage_x_min: f64,
+        stage_y_min: f64,
+        stage_x_max: f64,
+        stage_y_max: f64,
+    ) -> Self {
+        self.stage_x_min = stage_x_min;
+        self.stage_y_min = stage_y_min;
+        self.stage_x_max = stage_x_max;
+        self.stage_y_max = stage_y_max;
+        self
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct CompileOptions {
+    pub(crate) swf_version: u8,
+}
+
+impl Default for CompileOptions {
+    fn default() -> Self {
+        Self { swf_version: 15 }
+    }
+}
+
+impl CompileOptions {
+    pub fn with_swf_version(mut self, swf_version: u8) -> Self {
+        self.swf_version = swf_version;
+        self
+    }
+}
+
 #[derive(Debug, Serialize)]
 pub struct Program {
     pub(crate) initial_script: Vec<hir::StatementKind>,
@@ -18,7 +78,7 @@ pub struct Program {
 }
 
 impl Program {
-    pub fn compile(&self, swf_version: u8) -> CompiledProgram {
+    pub fn compile(&self, compile_options: CompileOptions) -> CompiledProgram {
         let initializer = if self.initial_script.is_empty() {
             None
         } else {
@@ -36,7 +96,7 @@ impl Program {
         CompiledProgram {
             initializer,
             extra_modules,
-            swf_version,
+            compile_options,
             custom_pcodes: self.custom_pcodes.clone(),
         }
     }
@@ -46,13 +106,13 @@ impl Program {
 pub struct CompiledProgram {
     pub(crate) initializer: Option<Actions>,
     pub(crate) extra_modules: Vec<(String, Actions)>,
-    pub(crate) swf_version: u8,
+    pub(crate) compile_options: CompileOptions,
     pub(crate) custom_pcodes: Vec<Actions>,
 }
 
 impl CompiledProgram {
-    pub fn to_swf(&self, frame_rate: f32) -> swf::error::Result<Vec<u8>> {
-        crate::swf::pcode_to_swf(self, frame_rate)
+    pub fn to_swf(&self, swf_options: &SwfOptions) -> swf::error::Result<Vec<u8>> {
+        crate::swf::pcode_to_swf(self, swf_options)
     }
 }
 

crates/rascal/src/snapshots/rascal__tests__all_samples@AnEmptyInterface.as.snap

@@ -32,5 +32,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 13
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@AnExtendingInterface.as.snap

@@ -73,5 +73,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 22
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@ClassMembersTest.as.snap

@@ -918,5 +918,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 109
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@DynamicClass.as.snap

@@ -51,5 +51,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 24
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@EmptyClass.as.snap

@@ -51,5 +51,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 24
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@MtascStyle.as.snap

@@ -82,5 +82,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 27
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@NotMtascStyle.as.snap

@@ -65,5 +65,6 @@ extra_modules:
         - Pop
       label_positions:
         loc0000: 27
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@assign_variable_and_trace.as.snap

@@ -18,5 +18,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@assign_variable_many_ways.as.snap

@@ -74,5 +74,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@block.as.snap

@@ -47,5 +47,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@comments.as.snap

@@ -86,5 +86,6 @@ initializer:
     - DefineLocal
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@delete.as.snap

@@ -169,5 +169,6 @@ initializer:
     loc0001: 45
     loc0000: 46
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@for_loop.as.snap

@@ -517,5 +517,6 @@ initializer:
     loc0027: 295
     loc0026: 300
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@function.as.snap

@@ -82,5 +82,6 @@ initializer:
     - Pop
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@function_hoisting.as.snap

@@ -178,5 +178,6 @@ initializer:
     - Pop
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@function_in_loop_break_continue.as.snap

@@ -136,5 +136,6 @@ initializer:
     loc0001: 45
     loc0000: 50
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@if_else.as.snap

@@ -243,5 +243,6 @@ initializer:
     loc0019: 138
     loc0018: 138
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@if_frame_loaded.as.snap

@@ -43,5 +43,6 @@ initializer:
   label_positions:
     loc0000: 16
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@import_affects_functions.as.snap

@@ -49,5 +49,6 @@ initializer:
     - Pop
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@inline_pcode.as.snap

@@ -35,5 +35,6 @@ initializer:
     - Pop
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@legacy_get_set.as.snap

@@ -57,5 +57,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@legacy_operators.as.snap

@@ -82,5 +82,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@nested_break_continue.as.snap

@@ -127,5 +127,6 @@ initializer:
     loc0001: 64
     loc0000: 69
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@nested_for_break_continue.as.snap

@@ -123,5 +123,6 @@ initializer:
     loc0001: 66
     loc0000: 71
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@numbers.as.snap

@@ -351,5 +351,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@objects.as.snap

@@ -84,5 +84,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__add_sub.as.snap

@@ -184,5 +184,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__bit_math.as.snap

@@ -246,5 +246,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__bit_shifts.as.snap

@@ -254,5 +254,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__comparison.as.snap

@@ -241,5 +241,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__equality.as.snap

@@ -201,5 +201,6 @@ initializer:
     - Trace
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__general.as.snap

@@ -871,5 +871,6 @@ initializer:
     loc000a: 487
     loc0009: 489
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__inc_dec.as.snap

@@ -83,5 +83,6 @@ initializer:
     - Pop
   label_positions: {}
 extra_modules: []
-swf_version: 15
+compile_options:
+  swf_version: 15
 custom_pcodes: []