Stdver (#82)

Author: aspizu

Cargo.lock

@@ -13,13 +13,15 @@ clap_complete_command = "0.6.1"
 clap_derive = "4.5.18"
 colored = "2.1.0"
 csscolorparser = "0.7.0"
+directories = "6.0.0"
 fxhash = "0.2.1"
 glob = "0.3.1"
 lalrpop-util = "0.22.0"
 log = "0.4.22"
 logos = "0.14.2"
 md-5 = "0.10.6"
 pretty_env_logger = "0.5.0"
+semver = "1.0.25"
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
 toml = "0.8.19"

Cargo.toml

@@ -1,8 +1,10 @@
 use logos::Span;
 
-use crate::blocks::{BinOp, UnOp};
-
 use super::Value;
+use crate::blocks::{
+    BinOp,
+    UnOp,
+};
 
 #[derive(Debug, Clone)]
 pub enum ConstExpr {

src/ast/const_expr.rs

@@ -1,6 +1,9 @@
 use logos::Span;
 
-use super::{type_::Type, ConstExpr};
+use super::{
+    type_::Type,
+    ConstExpr,
+};
 use crate::misc::SmolStr;
 
 #[derive(Debug)]

src/ast/list.rs

@@ -1,10 +1,16 @@
 mod binop;
 mod unop;
-use std::fmt::{self, Display};
+use std::fmt::{
+    self,
+    Display,
+};
 
 use logos::Span;
 
-use super::{ConstExpr, Expr};
+use super::{
+    ConstExpr,
+    Expr,
+};
 use crate::misc::SmolStr;
 
 #[derive(Debug, Clone)]

src/ast/value.rs

@@ -1,7 +1,13 @@
-use std::fmt::{self, Display};
+use std::fmt::{
+    self,
+    Display,
+};
 
 use super::node_id::NodeID;
-use crate::misc::{write_comma_fmt, SmolStr};
+use crate::misc::{
+    write_comma_fmt,
+    SmolStr,
+};
 
 pub struct Mutation<'a> {
     name: SmolStr,

src/codegen/mutation.rs

@@ -1,27 +1,49 @@
 use core::str;
 use std::{
     fs::File,
-    io::{self, Seek, Write},
+    io::{
+        self,
+        Seek,
+        Write,
+    },
     path::Path,
 };
 
-use fxhash::{FxHashMap, FxHashSet};
+use fxhash::{
+    FxHashMap,
+    FxHashSet,
+};
 use logos::Span;
-use md5::{Digest, Md5};
+use md5::{
+    Digest,
+    Md5,
+};
 use serde_json::json;
-use zip::{write::SimpleFileOptions, ZipWriter};
+use zip::{
+    write::SimpleFileOptions,
+    ZipWriter,
+};
 
 use super::{
-    cmd::cmd_to_list, node::Node, node_id::NodeID, node_id_factory::NodeIDFactory,
+    cmd::cmd_to_list,
+    node::Node,
+    node_id::NodeID,
+    node_id_factory::NodeIDFactory,
     turbowarp_config::TurbowarpConfig,
 };
 use crate::{
     ast::*,
     blocks::Block,
     codegen::mutation::Mutation,
     config::Config,
-    diagnostic::{DiagnosticKind, SpriteDiagnostics},
-    misc::{write_comma_io, SmolStr},
+    diagnostic::{
+        DiagnosticKind,
+        SpriteDiagnostics,
+    },
+    misc::{
+        write_comma_io,
+        SmolStr,
+    },
 };
 
 const STAGE_NAME: &str = "Stage";
@@ -242,8 +264,7 @@ impl Stmt {
 
 #[derive(Debug)]
 pub struct Sb3<T>
-where
-    T: Write + Seek,
+where T: Write + Seek
 {
     pub zip: ZipWriter<T>,
     pub id: NodeIDFactory,
@@ -255,8 +276,7 @@ where
 }
 
 impl<T> Write for Sb3<T>
-where
-    T: Write + Seek,
+where T: Write + Seek
 {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.zip.write(buf)
@@ -268,8 +288,7 @@ where
 }
 
 impl<T> Sb3<T>
-where
-    T: Write + Seek,
+where T: Write + Seek
 {
     pub fn new(file: T) -> Self {
         Self {

src/codegen/sb3.rs

@@ -3,8 +3,10 @@ use serde::{
     Serialize,
 };
 
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Clone, Copy)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Clone)]
 pub struct Config {
+    #[serde(default)]
+    pub std: Option<String>,
     #[serde(default)]
     pub frame_rate: Option<u64>,
     #[serde(default)]

src/config.rs

@@ -19,7 +19,11 @@ use super::{
 };
 use crate::{
     ast::Project,
-    translation_unit::TranslationUnit,
+    standard_library::StandardLibrary,
+    translation_unit::{
+        Owner,
+        TranslationUnit,
+    },
 };
 
 pub struct SpriteDiagnostics {
@@ -29,11 +33,11 @@ pub struct SpriteDiagnostics {
 }
 
 impl SpriteDiagnostics {
-    pub fn new(path: PathBuf) -> Self {
+    pub fn new(path: PathBuf, stdlib: &StandardLibrary) -> Self {
         let sprite_name = path.file_stem().unwrap().to_str().unwrap().to_string();
         let mut translation_unit = TranslationUnit::new(path);
         let mut diagnostics = vec![];
-        if let Err(diagnostic) = translation_unit.pre_process() {
+        if let Err(diagnostic) = translation_unit.pre_process(stdlib) {
             diagnostics.extend(diagnostic);
         }
         Self {
@@ -63,13 +67,12 @@ impl SpriteDiagnostics {
             let (start, include) = self
                 .translation_unit
                 .translate_position(diagnostic.span.start);
-            // Do not display diagnostics for standard library headers.
-            let Some(include_path) = &include.path else {
+            if !matches!(include.owner, Owner::Local) {
                 continue;
-            };
+            }
             // TODO: memoize this using a memoization crate.
-            let text = fs::read_to_string(include_path).unwrap();
-            let include_path = include_path.to_str().unwrap();
+            let text = fs::read_to_string(&include.path).unwrap();
+            let include_path = include.path.to_str().unwrap();
             if diagnostic.span.start == 0 && diagnostic.span.end == 0 {
                 let mut message = level
                     .title(&title)

src/diagnostic/sprite_diagnostics.rs

@@ -43,6 +43,7 @@ pub fn frontend() -> ExitCode {
         }
         Command::New {
             name,
+            std,
             frame_rate,
             max_clones,
             no_miscellaneous_limits,
@@ -55,6 +56,7 @@ pub fn frontend() -> ExitCode {
             match new::new(
                 name,
                 Config {
+                    std,
                     frame_rate,
                     max_clones,
                     no_miscellaneous_limits: Some(no_miscellaneous_limits),