Share instances of the std prelude

Signed-off-by: Nick Cameron <[email protected]>

Author: nrc

docs/kcl/const_const_std-prelude-HALF_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::HALF_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::HALF_TURN: number(deg) = 180deg
+```
+
+

docs/kcl/const_const_std-prelude-QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::QUARTER_TURN: number(deg) = 90deg
+```
+
+

docs/kcl/const_const_std-prelude-THREE_QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::THREE_QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::THREE_QUARTER_TURN: number(deg) = 270deg
+```
+
+

docs/kcl/const_const_std-prelude-ZERO.md

@@ -0,0 +1,15 @@
+---
+title: "std::ZERO"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::ZERO: number = 0
+```
+
+

docs/kcl/const_std-HALF_TURN.md

@@ -10,6 +10,10 @@ layout: manual
 * [Modules](kcl/modules)
 * [Known Issues](kcl/KNOWN-ISSUES)
 * **`std`**
+  * [`HALF_TURN`](kcl/const_std-HALF_TURN)
+  * [`QUARTER_TURN`](kcl/const_std-QUARTER_TURN)
+  * [`THREE_QUARTER_TURN`](kcl/const_std-THREE_QUARTER_TURN)
+  * [`ZERO`](kcl/const_std-ZERO)
   * [`abs`](kcl/abs)
   * [`acos`](kcl/acos)
   * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
@@ -118,8 +122,3 @@ layout: manual
   * [`cos`](kcl/std-math-cos)
   * [`sin`](kcl/std-math-sin)
   * [`tan`](kcl/std-math-tan)
-* **`std::prelude`**
-  * [`HALF_TURN`](kcl/const_std-prelude-HALF_TURN)
-  * [`QUARTER_TURN`](kcl/const_std-prelude-QUARTER_TURN)
-  * [`THREE_QUARTER_TURN`](kcl/const_std-prelude-THREE_QUARTER_TURN)
-  * [`ZERO`](kcl/const_std-prelude-ZERO)

docs/kcl/const_std-QUARTER_TURN.md

@@ -457,7 +457,7 @@ fn generate_const_from_kcl(cnst: &ConstData, file_name: String) -> Result<()> {
     });
 
     let output = hbs.render("const", &data)?;
-    expectorate::assert_contents(format!("../../../docs/kcl/const_{}.md", file_name), &output);
+    expectorate::assert_contents(format!("../../../docs/kcl/{}.md", file_name), &output);
 
     Ok(())
 }

docs/kcl/const_std-THREE_QUARTER_TURN.md

@@ -49,12 +49,15 @@ impl CollectionVisitor {
                     }
                 }
                 crate::parsing::ast::types::BodyItem::VariableDeclaration(var) if !var.visibility.is_default() => {
+                    let qual_name = if self.name == "prelude" {
+                        "std::".to_owned()
+                    } else {
+                        format!("std::{}::", self.name)
+                    };
                     let mut dd = match var.kind {
                         // TODO metadata for args
-                        VariableKind::Fn => DocData::Fn(FnData::from_ast(var, format!("std::{}::", self.name))),
-                        VariableKind::Const => {
-                            DocData::Const(ConstData::from_ast(var, format!("std::{}::", self.name)))
-                        }
+                        VariableKind::Fn => DocData::Fn(FnData::from_ast(var, qual_name)),
+                        VariableKind::Const => DocData::Const(ConstData::from_ast(var, qual_name)),
                     };
 
                     // FIXME this association of metadata with items is pretty flaky.

docs/kcl/const_std-ZERO.md

@@ -15,7 +15,7 @@ pub(super) const SIGNIFICANT_ATTRS: [&str; 2] = [SETTINGS, NO_PRELUDE];
 pub(crate) const SETTINGS: &str = "settings";
 pub(crate) const SETTINGS_UNIT_LENGTH: &str = "defaultLengthUnit";
 pub(crate) const SETTINGS_UNIT_ANGLE: &str = "defaultAngleUnit";
-pub(super) const NO_PRELUDE: &str = "no_prelude";
+pub(super) const NO_PRELUDE: &str = "no_std";
 
 pub(super) const IMPORT_FORMAT: &str = "format";
 pub(super) const IMPORT_FORMAT_VALUES: [&str; 9] = ["fbx", "gltf", "glb", "obj", "ply", "sldprt", "stp", "step", "stl"];

docs/kcl/const_const_std-math-E.md renamed to docs/kcl/const_std-math-E.md

@@ -6,7 +6,7 @@ use itertools::{EitherOrBoth, Itertools};
 use tokio::sync::RwLock;
 
 use crate::{
-    execution::{annotations, memory::ProgramMemory, ExecState, ExecutorSettings},
+    execution::{annotations, memory::ProgramMemory, EnvironmentRef, ExecState, ExecutorSettings},
     parsing::ast::types::{Annotation, Node, Program},
     walk::Node as WalkNode,
 };
@@ -65,6 +65,7 @@ pub struct OldAstState {
     pub exec_state: ExecState,
     /// The last settings used for execution.
     pub settings: crate::execution::ExecutorSettings,
+    pub result_env: EnvironmentRef,
 }
 
 /// The result of a cache check.
@@ -267,7 +268,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, ctx, _) = parse_execute(new).await.unwrap();
+        let (program, _, ctx, _) = parse_execute(new).await.unwrap();
 
         let result = get_changed_program(
             CacheInformation {
@@ -310,7 +311,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program_old, ctx, _) = parse_execute(old).await.unwrap();
+        let (program_old, _, ctx, _) = parse_execute(old).await.unwrap();
 
         let program_new = crate::Program::parse_no_errs(new).unwrap();
 
@@ -355,7 +356,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, ctx, _) = parse_execute(old).await.unwrap();
+        let (program, _, ctx, _) = parse_execute(old).await.unwrap();
 
         let program_new = crate::Program::parse_no_errs(new).unwrap();
 
@@ -404,7 +405,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, ctx, _) = parse_execute(old).await.unwrap();
+        let (program, _, ctx, _) = parse_execute(old).await.unwrap();
 
         let program_new = crate::Program::parse_no_errs(new).unwrap();
 
@@ -438,7 +439,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, mut ctx, _) = parse_execute(new).await.unwrap();
+        let (program, _, mut ctx, _) = parse_execute(new).await.unwrap();
 
         // Change the settings to cm.
         ctx.settings.units = crate::UnitLength::Cm;
@@ -480,7 +481,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, mut ctx, _) = parse_execute(new).await.unwrap();
+        let (program, _, mut ctx, _) = parse_execute(new).await.unwrap();
 
         // Change the settings.
         ctx.settings.show_grid = !ctx.settings.show_grid;
@@ -515,7 +516,7 @@ firstSketch = startSketchOn('XY')
 // Remove the end face for the extrusion.
 shell(firstSketch, faces = ['end'], thickness = 0.25)"#;
 
-        let (program, mut ctx, _) = parse_execute(new).await.unwrap();
+        let (program, _, mut ctx, _) = parse_execute(new).await.unwrap();
 
         // Change the settings.
         ctx.settings.highlight_edges = !ctx.settings.highlight_edges;
@@ -582,7 +583,7 @@ startSketchOn('XY')
 startSketchOn('XY')
 "#;
 
-        let (program, ctx, _) = parse_execute(old_code).await.unwrap();
+        let (program, _, ctx, _) = parse_execute(old_code).await.unwrap();
 
         let mut new_program = crate::Program::parse_no_errs(new_code).unwrap();
         new_program.compute_digest();