Use a single syntax for custom rules

eo-phi-normalizer/Setup.hs

@@ -20,8 +20,7 @@ main = defaultMainWithHooks $ simpleUserHooks
   { hookedPrograms = [ bnfcProgram ]
   , postConf       = \args flags packageDesc localBuildInfo -> do
 #ifndef mingw32_HOST_OS
-      _ <- system "bnfc -d -p Language.EO.Phi --generic -o src/ grammar/EO/Phi/Syntax.cf"
-      _ <- system "bnfc -d -p Language.EO.Phi.Rules --generic -o src/ grammar/EO/Phi/Rules/Syntax.cf"
+      _ <- system "bnfc --haskell -d -p Language.EO.Phi --generic -o src/ grammar/EO/Phi/Syntax.cf"
 #endif
       postConf simpleUserHooks args flags packageDesc localBuildInfo
   }

eo-phi-normalizer/eo-phi-normalizer.cabal

@@ -36,10 +36,6 @@ library
       Language.EO.Phi.Normalize
       Language.EO.Phi.Rules.Common
       Language.EO.Phi.Rules.PhiPaper
-      Language.EO.Phi.Rules.Syntax.Abs
-      Language.EO.Phi.Rules.Syntax.Lex
-      Language.EO.Phi.Rules.Syntax.Par
-      Language.EO.Phi.Rules.Syntax.Print
       Language.EO.Phi.Rules.Yaml
       Language.EO.Phi.Syntax
       Language.EO.Phi.Syntax.Abs
@@ -96,7 +92,9 @@ test-suite eo-phi-normalizer-test
   main-is: Spec.hs
   other-modules:
       Language.EO.PhiSpec
+      Language.EO.YamlSpec
       Test.EO.Phi
+      Test.EO.Yaml
       Paths_eo_phi_normalizer
   hs-source-dirs:
       test

eo-phi-normalizer/grammar/EO/Phi/Syntax.cf

@@ -8,6 +8,7 @@ token Bytes ({"--"} | ["0123456789ABCDEF"] ["0123456789ABCDEF"] {"-"} | ["012345
 token Function upper (char - [" \r\n\t,.|':;!-?][}{)(⟧⟦"])* ;
 token LabelId  lower (char - [" \r\n\t,.|':;!-?][}{)(⟧⟦"])* ;
 token AlphaIndex ({"α0"} | {"α"} (digit - ["0"]) (digit)* ) ;
+token MetaId {"!"} (char - [" \r\n\t,.|':;!-?][}{)(⟧⟦"])* ;
 
 Program. Program ::= "{" [Binding] "}" ;
 
@@ -17,11 +18,13 @@ ObjectDispatch. Object ::= Object "." Attribute ;
 GlobalDispatch. Object ::= "Φ" "." Attribute ;
 ThisDispatch.   Object ::= "ξ" "." Attribute ;
 Termination.    Object ::= "⊥" ;
+MetaObject.     Object ::= MetaId ;
 
 AlphaBinding.   Binding ::= Attribute "↦" Object ;
 EmptyBinding.   Binding ::= Attribute "↦" "∅" ;
 DeltaBinding.   Binding ::= "Δ" "⤍" Bytes ;
 LambdaBinding.  Binding ::= "λ" "⤍" Function ;
+MetaBindings.   Binding ::= MetaId ;
 separator Binding "," ;
 
 Phi.    Attribute ::= "φ" ;   -- decoratee object
@@ -30,6 +33,7 @@ Sigma.  Attribute ::= "σ" ;   -- home object
 VTX.    Attribute ::= "ν" ;   -- the vertex identifier (an object that represents the unique identifier of the containing object)
 Label.  Attribute ::= LabelId ;
 Alpha.  Attribute ::= AlphaIndex ;
+MetaAttr. Attribute ::= MetaId ;
 
 PeeledObject. PeeledObject ::= ObjectHead [ObjectAction] ;
 

eo-phi-normalizer/src/Language/EO/Phi/Normalize.hs

@@ -92,6 +92,7 @@ peelObject = \case
   GlobalDispatch attr -> PeeledObject HeadGlobal [ActionDispatch attr]
   ThisDispatch attr -> PeeledObject HeadThis [ActionDispatch attr]
   Termination -> PeeledObject HeadTermination []
+  MetaObject _ -> PeeledObject HeadTermination []
  where
   followedBy (PeeledObject object actions) action = PeeledObject object (actions ++ [action])
 

eo-phi-normalizer/src/Language/EO/Phi/Rules/Common.hs

@@ -39,6 +39,7 @@ withSubObject f root =
       GlobalDispatch{} -> []
       ThisDispatch{} -> []
       Termination -> []
+      MetaObject _ -> []
 
 withSubObjectBindings :: (Object -> [Object]) -> [Binding] -> [[Binding]]
 withSubObjectBindings _ [] = []
@@ -54,6 +55,7 @@ withSubObjectBinding f = \case
   EmptyBinding{} -> []
   DeltaBinding{} -> []
   LambdaBinding{} -> []
+  MetaBindings _ -> []
 
 applyOneRule :: Context -> Object -> [Object]
 applyOneRule = withSubObject . applyOneRuleAtRoot