Move the grammar to the ABC.pm file.

colomon · Dec 16, 2009 · c08cd27 · c08cd27
1 parent a0e8c61
commit c08cd27
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/lib/ABC.pm b/lib/ABC.pm
@@ -1,5 +1,22 @@
 use v6;
 
+grammar ABC
+{
+    regex header_field_name { \w }
+    regex header_field_data { \N* }
+    regex header_field { ^^ <header_field_name> ':' \s* <header_field_data> $$ }
+    regex header { [<header_field> \n]+ }
+
+    regex basenote { <[a..g]+[A..G]> }
+    regex octave { \'+ | \,+ }
+    regex accidental { '^' | '^^' | '_' | '__' | '=' }
+    regex pitch { <accidental>? <basenote> <octave>? }
+
+    regex tie { '-' }
+    regex note_length { [\d* ['/' \d*] ] | '/' }
+    regex note { <pitch> <note_length>? <tie>? }
+}
+
 class ABCHeader
 {
 

diff --git a/playing.pl b/playing.pl
@@ -1,5 +1,8 @@
 use v6;
 
+BEGIN { push @*INC, "lib" }
+use ABC;
+
 my $abc = q«X:64
 T:Cuckold Come Out o' the Amrey
 S:Northumbrian Minstrelsy
@@ -11,23 +14,6 @@
 g>ecg ec e/f/g/e/ | d/c/B/A/ Gd BG B/c/d/B/ | 
 g/f/e/d/ c/d/e/f/ gc e/f/g/e/ | dB/A/ gB +trill+A2 +trill+e2 :|»;
 
-grammar ABC
-{
-    regex header_field_name { \w }
-    regex header_field_data { \N* }
-    regex header_field { ^^ <header_field_name> ':' \s* <header_field_data> $$ }
-    regex header { [<header_field> \n]+ }
-
-    regex basenote { <[a..g]+[A..G]> }
-    regex octave { \'+ | \,+ }
-    regex accidental { '^' | '^^' | '_' | '__' | '=' }
-    regex pitch { <accidental>? <basenote> <octave>? }
-
-    regex tie { '-' }
-    regex note_length { [\d* ['/' \d*] ] | '/' }
-    regex note { <pitch> <note_length>? <tie>? }
-}
-
 if $abc ~~ m/ <ABC::header> /
 {
     for $<ABC::header><header_field> -> $line