Context variable globals

Cargo.toml

@@ -14,6 +14,7 @@ edition = "2021"
 dirs = "5.0"
 directories = "5.0"
 log = "0.4"
+regex = "1.10"
 scopeguard = "1.2"
 serde = "1"
 tokio = "1.2"

runtime/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "riptide-runtime"
 description = "The Riptide programming language interpreter"
-rust-version = "1.70.0"
+rust-version = "1.75.0"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
@@ -13,7 +13,7 @@ bstr = "1.9"
 dirs.workspace = true
 futures = "0.3"
 log.workspace = true
-regex = "1.10"
+regex.workspace = true
 riptide-syntax.path = "../syntax"
 scopeguard.workspace = true
 tokio-pipe = "0.2"

runtime/src/builtins.rs

@@ -21,7 +21,7 @@ pub(crate) fn load_module() -> Result<Value, Exception> {
         "load" => Value::ForeignFn(load.into()),
         "nil" => Value::ForeignFn(nil.into()),
         "nth" => Value::ForeignFn(nth.into()),
-        "pwd" => Value::ForeignFn(pwd.into()),
+        "pass" => Value::ForeignFn(pass.into()),
         "throw" => Value::ForeignFn(throw.into()),
         "try" => Value::ForeignFn(try_fn.into()),
         "typeof" => Value::ForeignFn(type_of.into()),
@@ -91,8 +91,8 @@ async fn nil(_: &mut Fiber, _: Vec<Value>) -> Result<Value, Exception> {
     Ok(Value::Nil)
 }
 
-async fn pwd(fiber: &mut Fiber, _: Vec<Value>) -> Result<Value, Exception> {
-    Ok(fiber.current_dir())
+async fn pass(_fiber: &mut Fiber, args: Vec<Value>) -> Result<Value, Exception> {
+    Ok(args.first().cloned().unwrap_or(Value::Nil))
 }
 
 /// Throw an exception.

runtime/src/eval.rs

@@ -16,7 +16,6 @@ use super::{
 };
 use gc::Gc;
 use futures::future::try_join_all;
-use regex::bytes::Regex;
 
 /// Compile the given source code as a closure.
 pub(crate) fn compile(fiber: &mut Fiber, file: impl Into<SourceFile>) -> Result<Closure, Exception> {
@@ -29,6 +28,20 @@ pub(crate) fn compile(fiber: &mut Fiber, file: impl Into<SourceFile>) -> Result<
     }
 }
 
+pub(crate) fn compile_anonymous_closure(file: impl Into<SourceFile>) -> Result<Closure, Exception> {
+    let file = file.into();
+    let file_name = file.name().to_string();
+
+    match parse(file) {
+        Ok(block) => Ok(Closure {
+            block,
+            scope: None,
+            name: None,
+        }),
+        Err(e) => throw!("error parsing {}: {}", file_name, e),
+    }
+}
+
 /// Compile a block into an executable closure.
 fn compile_block(fiber: &mut Fiber, block: Block) -> Result<Closure, Exception> {
     // Constructing a closure is quite easy since our interpreter is based
@@ -276,7 +289,7 @@ async fn evaluate_expr(fiber: &mut Fiber, expr: Expr) -> Result<Value, Exception
     match expr {
         Expr::Number(number) => Ok(Value::Number(number)),
         Expr::String(string) => Ok(Value::from(string)),
-        Expr::Regex(RegexLiteral(src)) => Ok(Value::Regex(Regex::new(&src).unwrap())),
+        Expr::Regex(RegexLiteral(src)) => Ok(Value::Regex(src)),
         Expr::CvarReference(cvar) => evaluate_cvar(fiber, cvar).await,
         Expr::CvarScope(cvar_scope) => evaluate_cvar_scope(fiber, cvar_scope).await,
         Expr::Substitution(substitution) => evaluate_substitution(fiber, substitution).await,

runtime/src/fiber.rs

@@ -33,6 +33,10 @@ pub struct Fiber {
     /// Table where global values are stored that are not on the stack.
     globals: Table,
 
+    /// Default global values for context variables. This holds the values of
+    /// context variables that have not been set by any scope.
+    cvar_globals: Table,
+
     /// Call stack of functions being executed by this fiber.
     pub(crate) stack: Vec<Gc<Scope>>,
 
@@ -47,12 +51,22 @@ impl Fiber {
             pid: next_pid(),
             module_index: Rc::new(ModuleIndex::default()),
             globals: Default::default(),
+            cvar_globals: Default::default(),
             stack: Vec::new(),
             io: io_cx,
         };
 
         log::debug!("root fiber {} created", fiber.pid);
 
+        match std::env::current_dir() {
+            Ok(cwd) => {
+                fiber.cvar_globals.set("cwd", cwd);
+            }
+            Err(e) => {
+                log::warn!("failed to set initial cwd: {}", e);
+            }
+        }
+
         fiber
     }
 
@@ -82,6 +96,7 @@ impl Fiber {
             pid: next_pid(),
             module_index: self.module_index.clone(),
             globals: self.globals.clone(),
+            cvar_globals: self.cvar_globals.clone(),
             stack: self.stack.clone(),
             io: self.io.try_clone().unwrap(),
         };
@@ -93,17 +108,8 @@ impl Fiber {
 
     /// Get the fiber's current working directory.
     pub fn current_dir(&self) -> Value {
-        // First check the `@cwd` context variable.
-        let mut cwd = self.get_cvar("cwd");
-
-        // If not set, check the process-wide (default) working directory.
-        if cwd.is_nil() {
-            if let Ok(path) = std::env::current_dir() {
-                cwd = path.into();
-            }
-        }
-
-        cwd
+        // The working dir is just implemented as the `@cwd` context variable.
+        self.get_cvar("cwd")
     }
 
     /// Get the current exit code for the runtime. If no exit has been
@@ -199,7 +205,7 @@ impl Fiber {
             }
         }
 
-        Value::Nil
+        self.cvar_globals.get(name)
     }
 
     /// Force the garbage collector to run now.

runtime/src/init.rt

@@ -1,7 +1,13 @@
+import 'builtins' for pass
+
 $GLOBALS->modules = [
     # A list of module loader functions.
     loaders: []
 
     # A map of module paths to their preloaded contents.
     loaded: [:]
 ]
+
+$GLOBALS->pwd = {
+    pass @cwd
+}

runtime/src/scope.rs

@@ -21,7 +21,7 @@ pub(crate) struct Scope {
     /// on creation of the scope.
     pub(crate) cvars: Table,
 
-    /// The lexically parent scope to this one.
+    /// The lexical parent scope to this one.
     pub(crate) parent: Option<Gc<Scope>>,
 }
 

syntax/Cargo.toml

@@ -9,7 +9,7 @@ edition.workspace = true
 [dependencies]
 pest = "2.7"
 pest_derive = "2.7"
-regex-syntax = "0.8"
+regex.workspace = true
 
 [dev-dependencies]
 difference = "2.0"

syntax/src/ast.rs

@@ -1,6 +1,7 @@
 //! Abstract syntax tree definitions for the language syntax.
 
 use crate::source::Span;
+use regex::bytes::Regex;
 use std::fmt;
 
 macro_rules! derive_debug_enum_transparent {
@@ -193,11 +194,26 @@ pub enum InterpolatedStringPart {
     Substitution(Substitution),
 }
 
-#[derive(Clone, Debug, PartialEq)]
-pub struct RegexLiteral(pub String);
+/// A regular expression literal.
+///
+/// Regular expressions written in source code are always validated and parsed
+/// as part of the syntax parsing routine, and converted into a regular
+/// expression AST as part of the overall program AST.
+///
+/// This also can be used as a runtime optimizations, as regex literals do not
+/// have to be re-parsed every time they are used without any effort from the
+/// user. They can be executed directly from AST memory.
+#[derive(Clone, Debug)]
+pub struct RegexLiteral(pub Regex);
 
 impl fmt::Display for RegexLiteral {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
     }
 }
+
+impl PartialEq for RegexLiteral {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.as_str() == other.0.as_str()
+    }
+}

syntax/src/parser.rs

@@ -5,6 +5,7 @@ use crate::{
     source::{SourceFile, Span},
 };
 use pest::iterators::Pair;
+use regex::bytes::Regex;
 
 /// Attempt to parse a source file into an abstract syntax tree.
 ///
@@ -16,7 +17,6 @@ pub fn parse(source_file: impl Into<SourceFile>) -> Result<Block, ParseError> {
 
     let mut ctx = ParsingContext {
         source_file: source_file.clone(),
-        regex_parser: regex_syntax::Parser::new(),
     };
 
     let mut pair = match grammar::parse(source_file.source_text(), Rule::program) {
@@ -51,9 +51,6 @@ struct ParsingContext {
     /// Source file currently being parsed. This is provided so that the AST
     /// can fetch span information.
     source_file: SourceFile,
-
-    /// Regular expression parser.
-    regex_parser: regex_syntax::Parser,
 }
 
 impl ParsingContext {
@@ -376,11 +373,10 @@ impl ParsableNode for RegexLiteral {
         let regex_str = pair.as_str();
         let regex_str = &regex_str[1..regex_str.len()-1];
 
-        if let Err(e) = ctx.regex_parser.parse(regex_str) {
-            return Err(ParseError::new(ctx.span(&pair), e.to_string()));
+        match Regex::new(regex_str) {
+            Ok(regex) => Ok(RegexLiteral(regex)),
+            Err(e) => Err(ParseError::new(ctx.span(&pair), e.to_string()))
         }
-
-        Ok(RegexLiteral(regex_str.into()))
     }
 }