diff --git a/crates/moon/src/watch/mod.rs b/crates/moon/src/watch/mod.rs index facf560ef..bd31857cd 100644 --- a/crates/moon/src/watch/mod.rs +++ b/crates/moon/src/watch/mod.rs @@ -498,56 +498,6 @@ mod tests { assert!(result); } - #[test] - fn rerun_triggered_for_moonlex_input() { - use std::fs; - - let temp_dir = tempfile::tempdir().unwrap(); - let root = temp_dir.path(); - let target_dir = root.join(BUILD_DIR); - std::fs::create_dir_all(&target_dir).unwrap(); - - let file = root.join("src/main/lexer.mbl"); - fs::create_dir_all(file.parent().unwrap()).unwrap(); - fs::write(&file, "rule token = parse").unwrap(); - - let event = build_event(&file); - let result = check_rerun_trigger( - &target_dir, - root, - &[event], - &AdditionalWatchPaths::default(), - ) - .unwrap(); - - assert!(result); - } - - #[test] - fn rerun_triggered_for_moonyacc_input() { - use std::fs; - - let temp_dir = tempfile::tempdir().unwrap(); - let root = temp_dir.path(); - let target_dir = root.join(BUILD_DIR); - std::fs::create_dir_all(&target_dir).unwrap(); - - let file = root.join("src/main/parser.mby"); - fs::create_dir_all(file.parent().unwrap()).unwrap(); - fs::write(&file, "%%").unwrap(); - - let event = build_event(&file); - let result = check_rerun_trigger( - &target_dir, - root, - &[event], - &AdditionalWatchPaths::default(), - ) - .unwrap(); - - assert!(result); - } - #[test] fn rerun_triggered_for_explicitly_watched_prebuild_input() { use std::fs; diff --git a/crates/moon/src/watch/prebuild_output.rs b/crates/moon/src/watch/prebuild_output.rs index 1b80e9f4d..d98a97f51 100644 --- a/crates/moon/src/watch/prebuild_output.rs +++ b/crates/moon/src/watch/prebuild_output.rs @@ -47,17 +47,6 @@ pub(crate) fn rr_get_prebuild_watch_paths(env: &ResolveOutput) -> PrebuildWatchP &pkg.root_path, ); } - - ignored_paths.extend( - pkg.mbt_lex_files - .iter() - .map(|path| path.with_extension("mbt")), - ); - ignored_paths.extend( - pkg.mbt_yacc_files - .iter() - .map(|path| path.with_extension("mbt")), - ); } } diff --git a/crates/moon/tests/test_cases/mod.rs b/crates/moon/tests/test_cases/mod.rs index f6f9bb60c..723e671d5 100644 --- a/crates/moon/tests/test_cases/mod.rs +++ b/crates/moon/tests/test_cases/mod.rs @@ -83,7 +83,6 @@ mod native_stub_stability; mod no_export_when_test; mod output_format; mod packages; -mod prebuild; mod prebuild_config_script; mod prebuild_link_config_self; mod query_symbol; @@ -2136,7 +2135,7 @@ fn test_exports_in_native_backend() { } #[test] -#[ignore = "moonyacc is not updated for a long time, and this test case is broken"] +#[ignore = "known broken test case"] fn test_diag_loc_map() { let dir = TestDir::new("diag_loc_map.in"); check( diff --git a/crates/moon/tests/test_cases/prebuild/mod.rs b/crates/moon/tests/test_cases/prebuild/mod.rs deleted file mode 100644 index 730355209..000000000 --- a/crates/moon/tests/test_cases/prebuild/mod.rs +++ /dev/null @@ -1,10 +0,0 @@ -use super::*; - -#[test] -fn test_moonlex() { - // Note: previously there's a check about installed `moonlex` binary, - // but since it comes with the distribution now, we can skip that. - let dir = TestDir::new("prebuild/moonlex"); - let _ = get_stdout(&dir, ["check"]); - assert!(dir.join("src/main/fortytwolexer.mbt").exists()); -} diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/.gitignore b/crates/moon/tests/test_cases/prebuild/moonlex/.gitignore deleted file mode 100644 index 37b38748c..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target/ -.mooncakes/ -src/main/fortytwolexer.mbt diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/README.md b/crates/moon/tests/test_cases/prebuild/moonlex/README.md deleted file mode 100644 index ae00983f7..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/README.md +++ /dev/null @@ -1 +0,0 @@ -# username/hello \ No newline at end of file diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/moon.mod.json b/crates/moon/tests/test_cases/prebuild/moonlex/moon.mod.json deleted file mode 100644 index 9e55a9051..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/moon.mod.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "username/hello", - "version": "0.1.0", - "readme": "README.md", - "repository": "", - "license": "", - "keywords": [], - "description": "", - "source": "src" -} \ No newline at end of file diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/fortytwolexer.mbl b/crates/moon/tests/test_cases/prebuild/moonlex/src/main/fortytwolexer.mbl deleted file mode 100644 index 471c93307..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/fortytwolexer.mbl +++ /dev/null @@ -1,83 +0,0 @@ -{ -///| -pub(open) trait IStringLexbuf { - next_as_int(Self) -> Int - curr_pos(Self) -> Int - reset(Self, pos~ : Int) -> Unit - get_char(Self, Int, Int) -> Char - get_string(Self, Int, Int) -> String -} - -///| -pub struct StringLexbuf { - data : String - end : Int - mut pos : Int -} - -///| -pub fn StringLexbuf::from_string(string : String) -> StringLexbuf { - StringLexbuf::{ data: string, end: string.length(), pos: 0 } -} - -///| -pub impl IStringLexbuf for StringLexbuf with next_as_int(self) { - let pos = self.pos - let end = self.end - if self.pos < end { - let c = self.data.unsafe_charcode_at(pos) - if c >= 0xD800 && c <= 0xDBFF { - let pos2 = pos + 1 - if pos2 < end { - let c2 = self.data.unsafe_charcode_at(pos2) - if c2 >= 0xDC00 && c2 <= 0xDFFF { - self.pos = pos2 + 1 - return (c - 0xD800) * 0x400 + c2 - 0xDC00 + 0x10000 - } - } - } - self.pos = pos + 1 - return c - } - -1 -} - -///| -pub impl IStringLexbuf for StringLexbuf with curr_pos(self) { - self.pos -} - -///| -pub impl IStringLexbuf for StringLexbuf with reset(self, pos~) { - self.pos = pos -} - -///| -pub impl IStringLexbuf for StringLexbuf with get_char(self, start, _end) { - self.data.unsafe_char_at(start) -} - -///| -pub impl IStringLexbuf for StringLexbuf with get_string(self, start, end) { - self.data.substring(start~, end~) -} -} - -rule scan_newline[T : IStringLexbuf](lexbuf : T) -> Int { - parse { - '\r'? '\n' | '\r' => { - $startpos - } - _ => { scan_newline(lexbuf) } - "" => { -1 } - } -} - -{ -///| -test { - let lexbuf = StringLexbuf::from_string("Hello\nworld!") - let pos = scan_newline(lexbuf) - assert_eq!(pos, 5) -} -} diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/main.mbt b/crates/moon/tests/test_cases/prebuild/moonlex/src/main/main.mbt deleted file mode 100644 index 6fd53a617..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/main.mbt +++ /dev/null @@ -1,3 +0,0 @@ -fn main { - () -} diff --git a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/moon.pkg.json b/crates/moon/tests/test_cases/prebuild/moonlex/src/main/moon.pkg.json deleted file mode 100644 index d6a16d9e2..000000000 --- a/crates/moon/tests/test_cases/prebuild/moonlex/src/main/moon.pkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "is-main": true, - "import": [] -} \ No newline at end of file diff --git a/crates/moonbuild-rupes-recta/src/build_lower/context.rs b/crates/moonbuild-rupes-recta/src/build_lower/context.rs index 3173918ba..336b1334b 100644 --- a/crates/moonbuild-rupes-recta/src/build_lower/context.rs +++ b/crates/moonbuild-rupes-recta/src/build_lower/context.rs @@ -154,8 +154,6 @@ impl<'a> BuildPlanLowerContext<'a> { BuildPlanNode::BuildRuntimeLib => self.lower_compile_runtime(), BuildPlanNode::BuildDocs(module_id) => self.lower_build_docs(module_id), BuildPlanNode::RunPrebuild(pkg, idx) => self.lower_run_prebuild(pkg, idx), - BuildPlanNode::RunMoonLexPrebuild(pkg, idx) => self.lower_moon_lex_prebuild(pkg, idx), - BuildPlanNode::RunMoonYaccPrebuild(pkg, idx) => self.lower_moon_yacc_prebuild(pkg, idx), }; // Collect n2 inputs and outputs. @@ -435,16 +433,6 @@ impl<'a> BuildPlanLowerContext<'a> { self.opt.target_backend.into(), )); } - BuildPlanNode::RunMoonLexPrebuild(pkg, idx) => { - let pkg_info = self.packages.get_package(pkg); - let mbtlex_file = &pkg_info.mbt_lex_files[idx as usize]; - out.push(mbtlex_file.with_extension("mbt")); - } - BuildPlanNode::RunMoonYaccPrebuild(pkg, idx) => { - let pkg_info = self.packages.get_package(pkg); - let mbtyacc_file = &pkg_info.mbt_yacc_files[idx as usize]; - out.push(mbtyacc_file.with_extension("mbt")); - } } } diff --git a/crates/moonbuild-rupes-recta/src/build_lower/lower_aux.rs b/crates/moonbuild-rupes-recta/src/build_lower/lower_aux.rs index ab5b8ad6b..3ecf0628e 100644 --- a/crates/moonbuild-rupes-recta/src/build_lower/lower_aux.rs +++ b/crates/moonbuild-rupes-recta/src/build_lower/lower_aux.rs @@ -279,52 +279,4 @@ impl<'a> super::BuildPlanLowerContext<'a> { extra_inputs: info.resolved_inputs.clone(), } } - - pub(super) fn lower_moon_lex_prebuild(&self, pkg: PackageId, idx: u32) -> BuildCommand { - let pkg = self.packages.get_package(pkg); - let mbtlex_path = pkg - .mbt_lex_files - .get(idx as usize) - .expect("mbt_lex file index out of bounds") - .clone(); - let output = mbtlex_path.with_extension("mbt"); - - let commandline = vec![ - moonutil::BINARIES.moonrun.display().to_string(), - moonutil::BINARIES.moonlex.display().to_string(), - "--".into(), - mbtlex_path.display().to_string(), - "-o".into(), - output.display().to_string(), - ]; - - BuildCommand { - commandline: commandline.into(), - extra_inputs: vec![mbtlex_path], - } - } - - pub(super) fn lower_moon_yacc_prebuild(&self, pkg: PackageId, idx: u32) -> BuildCommand { - let pkg = self.packages.get_package(pkg); - let mby_path = pkg - .mbt_yacc_files - .get(idx as usize) - .expect("mbt_yacc file index out of bounds") - .clone(); - let output = mby_path.with_extension("mbt"); - - let commandline = vec![ - moonutil::BINARIES.moonrun.display().to_string(), - moonutil::BINARIES.moonyacc.display().to_string(), - "--".into(), - mby_path.display().to_string(), - "-o".into(), - output.display().to_string(), - ]; - - BuildCommand { - commandline: commandline.into(), - extra_inputs: vec![mby_path], - } - } } diff --git a/crates/moonbuild-rupes-recta/src/build_plan/builders.rs b/crates/moonbuild-rupes-recta/src/build_plan/builders.rs index b2aee432d..b9472229a 100644 --- a/crates/moonbuild-rupes-recta/src/build_plan/builders.rs +++ b/crates/moonbuild-rupes-recta/src/build_plan/builders.rs @@ -111,15 +111,6 @@ impl<'a> BuildPlanConstructor<'a> { self.add_edge(node, prebuild_node); } } - for i in 0..pkg.mbt_lex_files.len() { - let prebuild_node = self.need_node(BuildPlanNode::RunMoonLexPrebuild(pkg_id, i as u32)); - self.add_edge(node, prebuild_node); - } - for i in 0..pkg.mbt_yacc_files.len() { - let prebuild_node = - self.need_node(BuildPlanNode::RunMoonYaccPrebuild(pkg_id, i as u32)); - self.add_edge(node, prebuild_node); - } } fn check_backend_compatibility_for_dep( @@ -434,24 +425,10 @@ impl<'a> BuildPlanConstructor<'a> { }) }); - // MAINTAINERS: These predefined prebuild operations that have a fixed - // meaning. If these are not needed in the future, they can be removed. - let mbtlex_iter = pkg - .mbt_lex_files - .iter() - .map(|x| Cow::Owned(x.with_extension("mbt"))); - let mbtyacc_iter = pkg - .mbt_yacc_files - .iter() - .map(|x| Cow::Owned(x.with_extension("mbt"))); - // Filter source files let source_files = cond_comp::filter_files( &pkg.raw, - source_iter - .chain(prebuild_output_iter) - .chain(mbtlex_iter) - .chain(mbtyacc_iter), + source_iter.chain(prebuild_output_iter), &compile_condition, ); @@ -1343,27 +1320,6 @@ impl<'a> BuildPlanConstructor<'a> { } v[index as usize] = Some(info); } - - pub(super) fn build_lex_prebuild( - &mut self, - node: BuildPlanNode, - ) -> Result<(), BuildPlanConstructError> { - // Not much things to do here, moonlex is straightforward - // the hassle is telling the build system we have the files to compile - self.need_node(node); - self.resolved_node(node); - Ok(()) - } - - pub(super) fn build_yacc_prebuild( - &mut self, - node: BuildPlanNode, - ) -> Result<(), BuildPlanConstructError> { - // similar to lex prebuild - self.need_node(node); - self.resolved_node(node); - Ok(()) - } } /// Concatenate two optional strings diff --git a/crates/moonbuild-rupes-recta/src/build_plan/constructor.rs b/crates/moonbuild-rupes-recta/src/build_plan/constructor.rs index 75cb95ba6..d55837598 100644 --- a/crates/moonbuild-rupes-recta/src/build_plan/constructor.rs +++ b/crates/moonbuild-rupes-recta/src/build_plan/constructor.rs @@ -334,8 +334,6 @@ impl<'a> BuildPlanConstructor<'a> { node ); } - BuildPlanNode::RunMoonLexPrebuild(_pkg, _idx) => (), - BuildPlanNode::RunMoonYaccPrebuild(_pkg, _idx) => (), BuildPlanNode::BuildVirtual(_build_target) => (), } } @@ -432,10 +430,6 @@ impl<'a> BuildPlanConstructor<'a> { BuildPlanNode::RunPrebuild(package_id, index) => { self.build_run_prebuild(node, package_id, index) } - BuildPlanNode::RunMoonLexPrebuild(_package_id, _index) => self.build_lex_prebuild(node), - BuildPlanNode::RunMoonYaccPrebuild(_package_id, _index) => { - self.build_yacc_prebuild(node) - } BuildPlanNode::BuildVirtual(target) => self.build_parse_mbti(node, target), } } diff --git a/crates/moonbuild-rupes-recta/src/discover/mod.rs b/crates/moonbuild-rupes-recta/src/discover/mod.rs index e7f5a62d4..55096c83d 100644 --- a/crates/moonbuild-rupes-recta/src/discover/mod.rs +++ b/crates/moonbuild-rupes-recta/src/discover/mod.rs @@ -339,8 +339,6 @@ fn discover_one_package( // Discover source files within the package let mut source_files = Vec::new(); - let mut mbt_lex_files = Vec::new(); - let mut mbt_yacc_files = Vec::new(); let mut mbt_md_files = Vec::new(); let mut mbtp_files = Vec::new(); @@ -379,12 +377,26 @@ fn discover_one_package( .file_name() .expect("We are listing a dir, file should have name"); let filename_str = filename.to_string_lossy(); + if filename_str.ends_with(".mbl") { + return Err(DiscoverError::UnsupportedLegacyGeneratedSource { + module: m.clone(), + package: fqn.package().clone(), + file: path.clone(), + extension: ".mbl", + }); + } + if filename_str.ends_with(".mby") { + return Err(DiscoverError::UnsupportedLegacyGeneratedSource { + module: m.clone(), + package: fqn.package().clone(), + file: path.clone(), + extension: ".mby", + }); + } match package_source_file_kind(&filename_str) { Some(PackageSourceFileKind::Mbt) => source_files.push(path), Some(PackageSourceFileKind::MbtMd) => mbt_md_files.push(path), Some(PackageSourceFileKind::Mbtp) => mbtp_files.push(path), - Some(PackageSourceFileKind::Mbl) => mbt_lex_files.push(path), - Some(PackageSourceFileKind::Mby) => mbt_yacc_files.push(path), None => { // File is not one of our expected types, skip } @@ -412,8 +424,6 @@ fn discover_one_package( // Sort the source files for repeatable results let _sort_guard = tracing::debug_span!("sorting_files").entered(); source_files.sort(); - mbt_lex_files.sort(); - mbt_yacc_files.sort(); mbt_md_files.sort(); mbtp_files.sort(); drop(_sort_guard); @@ -430,8 +440,6 @@ fn discover_one_package( supported_targets_decl, effective_supported_targets, source_files, - mbt_lex_files, - mbt_yacc_files, mbt_md_files, mbtp_files, c_stub_files: c_stubs, diff --git a/crates/moonbuild-rupes-recta/src/discover/model.rs b/crates/moonbuild-rupes-recta/src/discover/model.rs index 7debd579a..a147a8eba 100644 --- a/crates/moonbuild-rupes-recta/src/discover/model.rs +++ b/crates/moonbuild-rupes-recta/src/discover/model.rs @@ -69,14 +69,6 @@ pub struct DiscoveredPackage { /// files, and platform-specific files. pub source_files: Vec, - /// MoonBit Lex files (`.mbl`) contained by this package. - /// - /// TODO: Most of these logic are replaced with pre-build tasks, and - /// `moonlex`/`moonyacc` bundled with the toolchain is not updated - /// frequently. Consider deprecating these fields and related logic. - pub mbt_lex_files: Vec, - /// MoonBit Yacc files (`.mby`) contained by this package. - pub mbt_yacc_files: Vec, /// Documentation-oriented programming Markdown files (`.mbt.md`) contained /// by this package. pub mbt_md_files: Vec, @@ -339,6 +331,16 @@ pub enum DiscoverError { inner: anyhow::Error, }, + #[error( + "File '{file}' in package '{package}' of module '{module}' uses legacy extension '{extension}', which is no longer supported. Migrate to `pre-build` generation that emits `.mbt` files." + )] + UnsupportedLegacyGeneratedSource { + module: ModuleSource, + package: PackagePath, + file: PathBuf, + extension: &'static str, + }, + #[error( "C stub file path '{path}' in package '{package}' of module '{module}' is invalid: {msg}" )] diff --git a/crates/moonbuild-rupes-recta/src/discover/synth.rs b/crates/moonbuild-rupes-recta/src/discover/synth.rs index 8ebe88260..fff624aac 100644 --- a/crates/moonbuild-rupes-recta/src/discover/synth.rs +++ b/crates/moonbuild-rupes-recta/src/discover/synth.rs @@ -157,8 +157,6 @@ pub fn build_synth_single_file_package( supported_targets_decl: SupportedTargetsDeclKind::Omitted, effective_supported_targets: supported, source_files, - mbt_lex_files: Vec::new(), - mbt_yacc_files: Vec::new(), mbt_md_files, mbtp_files: Vec::new(), c_stub_files: Vec::new(), diff --git a/crates/moonbuild-rupes-recta/src/model.rs b/crates/moonbuild-rupes-recta/src/model.rs index ae039868c..656f7a19b 100644 --- a/crates/moonbuild-rupes-recta/src/model.rs +++ b/crates/moonbuild-rupes-recta/src/model.rs @@ -212,11 +212,6 @@ pub enum BuildPlanNode { /// Run the i-th prebuild script in the prebuild script list. RunPrebuild(PackageId, u32), - /// Run the i-th prebuild rule for `moonlex` predefined prebuild. - RunMoonLexPrebuild(PackageId, u32), - /// Run the i-th prebuild rule for `moonyacc` predefined prebuild. - RunMoonYaccPrebuild(PackageId, u32), - /// Docs build for a single selected module. /// /// The legacy layout does not have a separate folder for different kinds @@ -266,9 +261,7 @@ impl BuildPlanNode { | BuildPlanNode::BuildRuntimeLib | BuildPlanNode::BuildDocs(_) | BuildPlanNode::BuildVirtual(_) - | BuildPlanNode::RunPrebuild(_, _) - | BuildPlanNode::RunMoonLexPrebuild(_, _) - | BuildPlanNode::RunMoonYaccPrebuild(_, _) => None, + | BuildPlanNode::RunPrebuild(_, _) => None, } } @@ -368,18 +361,6 @@ impl BuildPlanNode { }; format!("prebuild script {} {}", packages.fqn(*package_id), joined) } - BuildPlanNode::RunMoonLexPrebuild(package_id, index) => { - let pkg = packages.get_package(*package_id); - let input = &pkg.mbt_lex_files[*index as usize]; - let input_name = file_basename(input.as_path()); - format!("run moonlex {} {}", packages.fqn(*package_id), input_name) - } - BuildPlanNode::RunMoonYaccPrebuild(package_id, index) => { - let pkg = packages.get_package(*package_id); - let input = &pkg.mbt_yacc_files[*index as usize]; - let input_name = file_basename(input.as_path()); - format!("run moonyacc {} {}", packages.fqn(*package_id), input_name) - } BuildPlanNode::BuildDocs(module_id) => { let src = env.module_source(*module_id); format!("build docs {}", src) @@ -440,14 +421,6 @@ impl BuildPlanNode { let fqn = packages.fqn(*pkg); format!("{}@RunPrebuild_{}", fqn, idx) } - BuildPlanNode::RunMoonLexPrebuild(pkg, idx) => { - let fqn = packages.fqn(*pkg); - format!("{}@RunMoonLexPrebuild_{}", fqn, idx) - } - BuildPlanNode::RunMoonYaccPrebuild(pkg, idx) => { - let fqn = packages.fqn(*pkg); - format!("{}@RunMoonYaccPrebuild_{}", fqn, idx) - } BuildPlanNode::BuildDocs(module_id) => { let src = env.module_source(*module_id); format!("{}@BuildDocs", src) diff --git a/crates/moonbuild-rupes-recta/src/util.rs b/crates/moonbuild-rupes-recta/src/util.rs index 2d733a78b..c5a287609 100644 --- a/crates/moonbuild-rupes-recta/src/util.rs +++ b/crates/moonbuild-rupes-recta/src/util.rs @@ -196,12 +196,6 @@ impl BuildPlanNode { BuildPlanNode::BuildRuntimeLib => "BuildRuntimeLib".to_string(), BuildPlanNode::BuildDocs(module_id) => format!("{:?}@BuildDocs", module_id), BuildPlanNode::BuildVirtual(target) => format!("{:?}@BuildVirtual", target), - BuildPlanNode::RunMoonLexPrebuild(package_id, index) => { - format!("{:?}@RunMoonLexPrebuild_{}", package_id, index) - } - BuildPlanNode::RunMoonYaccPrebuild(package_id, index) => { - format!("{:?}@RunMoonYaccPrebuild_{}", package_id, index) - } } } @@ -260,14 +254,6 @@ impl BuildPlanNode { let fqn = packages.fqn(*package); format!("{}\\nBuildVirtual", fqn) } - BuildPlanNode::RunMoonLexPrebuild(package_id, index) => { - let fqn = packages.fqn(*package_id); - format!("{}\\nRunMoonLexPrebuild_{}", fqn, index) - } - BuildPlanNode::RunMoonYaccPrebuild(package_id, index) => { - let fqn = packages.fqn(*package_id); - format!("{}\\nRunMoonYaccPrebuild_{}", fqn, index) - } } } @@ -287,8 +273,6 @@ impl BuildPlanNode { BuildPlanNode::BuildRuntimeLib => "orange", BuildPlanNode::BuildDocs(_) => "lavender", BuildPlanNode::BuildVirtual(_) => "lightsteelblue", - BuildPlanNode::RunMoonLexPrebuild(..) => "plum", - BuildPlanNode::RunMoonYaccPrebuild(..) => "thistle", } } } diff --git a/crates/moonutil/src/binaries.rs b/crates/moonutil/src/binaries.rs index 88170bbfc..8f16fa9d9 100644 --- a/crates/moonutil/src/binaries.rs +++ b/crates/moonutil/src/binaries.rs @@ -76,9 +76,7 @@ pub struct CachedBinaries { pub moondoc: LazyLock, pub moonfmt: LazyLock, pub mooninfo: LazyLock, - pub moonlex: LazyLock, pub moonrun: LazyLock, - pub moonyacc: LazyLock, pub moon_cove_report: LazyLock, pub node: LazyLock>, pub python: LazyLock>, @@ -94,9 +92,7 @@ impl CachedBinaries { ("moondoc", self.moondoc.clone()), ("moonfmt", self.moonfmt.clone()), ("mooninfo", self.mooninfo.clone()), - ("moonlex", self.moonlex.clone()), ("moonrun", self.moonrun.clone()), - ("moonyacc", self.moonyacc.clone()), ("moon_cove_report", self.moon_cove_report.clone()), ("node", self.node_or_default()), ("git", self.git_or_default()), @@ -124,9 +120,7 @@ pub static BINARIES: CachedBinaries = CachedBinaries { moondoc: LazyLock::new(|| moon_bin("moondoc", "MOONDOC_OVERRIDE")), moonfmt: LazyLock::new(|| moon_bin("moonfmt", "MOONFMT_OVERRIDE")), mooninfo: LazyLock::new(|| moon_bin("mooninfo", "MOONINFO_OVERRIDE")), - moonlex: LazyLock::new(|| moon_bin("moonlex.wasm", "MOONLEX_OVERRIDE")), moonrun: LazyLock::new(|| moon_bin("moonrun", "MOONRUN_OVERRIDE")), - moonyacc: LazyLock::new(|| moon_bin("moonyacc.wasm", "MOONYACC_OVERRIDE")), moon_cove_report: LazyLock::new(|| moon_bin("moon_cove_report", "MOON_COVE_REPORT_OVERRIDE")), node: LazyLock::new(|| which_bin(&["node.cmd", "node"], "MOON_NODE_OVERRIDE")), python: LazyLock::new(|| which_bin(&["python", "python3"], "MOON_PYTHON_OVERRIDE")), diff --git a/crates/moonutil/src/common.rs b/crates/moonutil/src/common.rs index cf7c50000..e270f67e2 100644 --- a/crates/moonutil/src/common.rs +++ b/crates/moonutil/src/common.rs @@ -76,8 +76,6 @@ pub const BLACKBOX_TEST_PATCH: &str = "_test.json"; pub const DOT_MBT_DOT_MD: &str = ".mbt.md"; pub const DOT_MBTP: &str = ".mbtp"; -pub const DOT_MBL: &str = ".mbl"; -pub const DOT_MBY: &str = ".mby"; pub const MOON_BIN_DIR: &str = "__moonbin__"; @@ -119,8 +117,6 @@ pub enum PackageSourceFileKind { Mbt, MbtMd, Mbtp, - Mbl, - Mby, } pub fn package_source_file_kind(filename: &str) -> Option { @@ -130,10 +126,6 @@ pub fn package_source_file_kind(filename: &str) -> Option Some(PackageSourceFileKind::MbtMd) } else if filename.ends_with(DOT_MBTP) { Some(PackageSourceFileKind::Mbtp) - } else if filename.ends_with(DOT_MBL) { - Some(PackageSourceFileKind::Mbl) - } else if filename.ends_with(DOT_MBY) { - Some(PackageSourceFileKind::Mby) } else { None } @@ -160,14 +152,6 @@ fn package_source_file_kind_detects_supported_package_inputs() { package_source_file_kind("proof.mbtp"), Some(PackageSourceFileKind::Mbtp) ); - assert_eq!( - package_source_file_kind("lexer.mbl"), - Some(PackageSourceFileKind::Mbl) - ); - assert_eq!( - package_source_file_kind("parser.mby"), - Some(PackageSourceFileKind::Mby) - ); assert_eq!(package_source_file_kind("moon.pkg"), None); } @@ -178,7 +162,7 @@ fn watch_relevant_project_file_covers_sources_and_manifests() { assert!(is_watch_relevant_project_file("moon.work.json")); assert!(is_watch_relevant_project_file("moon.pkg")); assert!(is_watch_relevant_project_file("moon.pkg.json")); - assert!(is_watch_relevant_project_file("lexer.mbl")); + assert!(!is_watch_relevant_project_file("lexer.mbl")); assert!(!is_watch_relevant_project_file("README.md")); }