Cargo.toml

@@ -14,18 +14,9 @@ nom = "7.1.3"
 serde = "1.0.209"
 serde_yml = "0.0.12"
 splines = "4.3.1"
-strum = { version = "0.26", features = ["derive"] }
-strum_macros = "0.26"
 tinyaudio = { version = "0.1", optional = true }
-bng_macros = { path = "bng_macros" }
 
 [features]
 default = ["play", "save"]
 play = ["dep:tinyaudio"]
 save = []
-
-[workspace]
-members = ["bng_macros"]
-
-[lints.rust]
-unused = "allow"

bng_macros/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "bng_macros"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = { version = "2.0", features = ["full"] }

bng_macros/src/lib.rs

@@ -1,79 +0,0 @@
-extern crate proc_macro;
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, Data, DataEnum, DeriveInput, Fields};
-
-#[proc_macro_derive(ModifierParser)]
-pub fn modifier_parser(input: TokenStream) -> TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-    impl_modifier_parser(ast)
-}
-
-#[proc_macro_derive(SlopeModifierParser)]
-pub fn slope_modifier_parser(input: TokenStream) -> TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-    impl_slope_modifier_parser(ast)
-}
-
-fn impl_modifier_parser(ast: DeriveInput) -> TokenStream {
-    let name = &ast.ident;
-    if let Data::Enum(DataEnum { variants, .. }) = ast.data {
-        let match_arms = variants.iter().map(|variant| {
-            let variant_name = &variant.ident;
-            let variant_type = if let Fields::Unnamed(ref fields) = variant.fields {
-                &fields.unnamed[0].ty
-            } else {
-                panic!("Expected unnamed fields in enum variants");
-            };
-
-            quote! {
-                nom::combinator::map(
-                    nom::sequence::preceded(
-                        nom::character::complete::char(#name::#variant_name(Default::default()).token()),
-                        nom::character::complete::#variant_type
-                    ),
-                    #name::#variant_name
-                )
-            }
-        });
-
-        quote! {
-            impl lex::lexer::Parse for #name {
-                fn parse(input: &str) -> nom::IResult<&str, #name> {
-                    nom::branch::alt((
-                        #(#match_arms),*
-                    ))(input)
-                }
-            }
-        }
-        .into()
-    } else {
-        panic!("this macro only works on enums")
-    }
-}
-
-fn impl_slope_modifier_parser(ast: DeriveInput) -> TokenStream {
-    let name = &ast.ident;
-    if let Data::Enum(DataEnum { variants, .. }) = ast.data {
-        let match_arms = variants.iter().map(|variant| {
-            let variant_name = &variant.ident;
-            quote! {
-                tag(#name::#variant_name)
-            }
-        });
-
-        quote! {
-            impl lex::lexer::Parse for #name {
-                fn parse(input: &str) -> nom::IResult<&str, #name> {
-                    let tag = |sm: SlopeModifier| nom::combinator::value(sm, nom::character::complete::char(sm.token()));
-                    nom::branch::alt((
-                        #(#match_arms),*
-                    ))(input)
-                }
-            }
-        }
-        .into()
-    } else {
-        panic!("this macro only works on enums")
-    }
-}

poc/poc.yml

@@ -24,7 +24,7 @@ channels:
       (3deff)
       (deff)
       [ffe]
-      {l 1-cos((PI*x)/2),acced}
+      {1-cos((PI*x)/2),acced}
       abbc!o5cc!v15feed!l4fedd!t60hdd
       # rest: .
       # pizz.: '°
@@ -33,12 +33,7 @@ channels:
       # octave: ><
       # comment?: ;,
       # start here: ':'
-      # slope: {MODIFIER EXPR, score}
+      # glissando: {EXPR, score}
-      #   note modifier prefix: n
-      #   volume modifier prefix: v
-      #   octave modifier prefix: o
-      #   length modifier prefix: l
-      #   tempo modifier prefix: t
       # loop: ()
       # loop with count: (COUNT, score)
       # tuple: []

src/bng/score.rs

@@ -1,8 +1,6 @@
-use bng_macros::{ModifierParser, SlopeModifierParser};
 use fasteval::Instruction;
 
 mod lex;
-use lex::Token;
 
 pub(super) enum Atom {
     Note(u8),
@@ -14,7 +12,6 @@ pub(super) enum Atom {
     EmptyWrapper(WrapperKind),
 }
 
-#[derive(ModifierParser)]
 pub(super) enum Modifier {
     Volume(u8),
     Octave(u8),
@@ -36,7 +33,6 @@ pub(super) enum WrapperKind {
     Comment,
 }
 
-#[derive(Clone, Copy, SlopeModifierParser)]
 pub(super) enum SlopeModifier {
     Note,
     Volume,

src/bng/score/lex.rs

@@ -1,7 +1,4 @@
-use super::{Atom, Modifier, SlopeModifier, WrapperKind};
+use super::{Atom, Modifier, WrapperKind};
-
-pub(super) mod lexer;
-
 const MORE: bool = true;
 const LESS: bool = false;
 const ON: bool = true;
@@ -15,7 +12,7 @@ impl WrappingTokens {
     const SEMICOLON_COMMA: (char, char) = (';', ',');
 }
 
-pub(super) trait Token<T> {
+trait Token<T> {
     fn token(self) -> T;
 }
 
@@ -41,18 +38,6 @@ impl Token<char> for Modifier {
     }
 }
 
-impl Token<char> for SlopeModifier {
-    fn token(self) -> char {
-        match self {
-            Self::Note => 'n',
-            Self::Volume => 'v',
-            Self::Octave => 'o',
-            Self::Length => 'l',
-            Self::Tempo => 't',
-        }
-    }
-}
-
 impl Token<char> for Atom {
     fn token(self) -> char {
         match self {

src/bng/score/lex/lexer.rs

@@ -1,5 +0,0 @@
-use nom::IResult;
-
-pub(crate) trait Parse: Sized {
-    fn parse(input: &str) -> IResult<&str, Self>;
-}