From 5a7718698373d07a29fffcb792acdb81aa7712d7 Mon Sep 17 00:00:00 2001
From: Rory Dudley
Date: Sat, 23 Mar 2024 02:45:54 -0600
Subject: read() and recite() overhaul

Rebuilt the LR parser (i.e. read()) from the ground up. This required
that some changes be made to recite(), in order to accomodate the new
data structures. These data structures were each split out into their
own file, in order to make working with each component a bit easier.

In addition to reworking the parts of the parser already present, some
new features were also added, such as:
  - Support for strings (' and ")
  - Support for environment variables ($)
  - Support for interpreting tild as $HOME (~)
  - Support for sub-reading and sub-reciting (`)
---
 src/recite/ps.rs | 95 --------------------------------------------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 src/recite/ps.rs

(limited to 'src/recite/ps.rs')

diff --git a/src/recite/ps.rs b/src/recite/ps.rs
deleted file mode 100644
index 0738057..0000000
--- a/src/recite/ps.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-/// Fork into a process from a Verse
-///
-/// Figures out whether or not the given Verse is a couplet. If it is, fork
-/// into a process, and pipe the contents of out `out` into STDIN. If not, then
-/// simply fork into the process.
-///
-/// # Arguments
-/// * `$verse: &Verse` - The verse to fork into
-/// * `$out: &mut String` - If the $verse is a couplet, the contents of STDOUT from the last verse
-#[macro_export]
-macro_rules! task {
-    ($verse:expr, $out:expr) => {
-        if $verse.couplet {
-            let mut child = Command::new($verse.verb())
-                .args($verse.clause())
-                .stdin(Stdio::piped())
-                .spawn()?;
-
-            let stdin = child.stdin.as_mut().ok_or(io::ErrorKind::BrokenPipe)?;
-            stdin.write_all(&$out.as_bytes())?;
-            $out.clear();
-
-            child
-        } else {
-            Command::new($verse.verb()).args($verse.clause()).spawn()?
-        }
-    };
-}
-
-/// Fork into a process from a Verse, and capture STDOUT
-///
-/// Figures out whether or not the given Verse is a couplet. If it is, fork
-/// into a process, and pipe the contents of out `out` into STDIN. If not, then
-/// simply fork into the process. Additionally, this function will capture
-/// STDOUT of the process specified by the Verse, and store it in `out`.
-///
-/// # Arguments
-/// * `$verse: &Verse` - The verse to fork into
-/// * `$out: &mut String` - If the $verse is a couplet, the contents of STDOUT from the last verse
-#[macro_export]
-macro_rules! ctask {
-    ($verse:expr, $out:expr) => {
-        if $verse.couplet {
-            let mut child = Command::new($verse.verb())
-                .args($verse.clause())
-                .stdin(Stdio::piped())
-                .stdout(Stdio::piped())
-                .spawn()?;
-
-            let stdin = child.stdin.as_mut().ok_or(io::ErrorKind::BrokenPipe)?;
-            stdin.write_all(&$out.as_bytes())?;
-            $out.clear();
-
-            child
-        } else {
-            Command::new($verse.verb())
-                .args($verse.clause())
-                .stdout(Stdio::piped())
-                .spawn()?
-        }
-    };
-}
-
-#[macro_export]
-/// Fork into a background process from a Verse
-///
-/// Figures out whether or not the given Verse is a couplet. If it is, fork
-/// into a backgournd process, and pipe the contents of out `out` into STDIN.
-/// If not, then simply fork into the background process.
-///
-/// # Arguments
-/// * `$verse: &Verse` - The verse to fork into
-/// * `$out: &mut String` - If the $verse is a couplet, the contents of STDOUT from the last verse
-macro_rules! btask {
-    ($verse:expr, $out:expr) => {
-        if $verse.couplet {
-            let mut child = Command::new($verse.verb())
-                .args($verse.clause())
-                .stdin(Stdio::piped())
-                .process_group(0)
-                .spawn()?;
-
-            let stdin = child.stdin.as_mut().ok_or(io::ErrorKind::BrokenPipe)?;
-            stdin.write_all(&$out.as_bytes())?;
-            $out.clear();
-
-            child
-        } else {
-            Command::new($verse.verb())
-                .args($verse.clause())
-                .process_group(0)
-                .spawn()?
-        }
-    };
-}
-- 
cgit v1.2.3