rename Glob to StringGlob

partcl · Dec 23, 2009 · a112f2a · a112f2a
1 parent 0cf7a57
commit a112f2a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,8 @@ Makefile
 /src/Partcl/*.pir
 /src/Partcl/commands/*.pir
 /src/ARE/*.pir
-/src/Glob/*.pir
+/src/StringGlob/*.pir
+/src/FileGlob/*.pir
 /src/init.pir
 /src/options.pir
 /src/Tcl*.pir

diff --git a/build/Makefile.in b/build/Makefile.in
@@ -17,9 +17,9 @@ GEN_SOURCES = \
   src/ARE/Actions.pir \
   src/ARE/Compiler.pir \
   src/ARE/Grammar.pir \
-  src/Glob/Actions.pir \
-  src/Glob/Compiler.pir \
-  src/Glob/Grammar.pir \
+  src/StringGlob/Actions.pir \
+  src/StringGlob/Compiler.pir \
+  src/StringGlob/Grammar.pir \
   src/Partcl/Actions.pir \
   src/Partcl/Compiler.pir \
   src/Partcl/Grammar.pir \

diff --git a/src/Glob/Compiler.pm b/src/Glob/Compiler.pm
diff --git a/src/Partcl.pir b/src/Partcl.pir
@@ -34,9 +34,9 @@
 .include 'src/ARE/Grammar.pir'
 .include 'src/ARE/Actions.pir'
 .include 'src/ARE/Compiler.pir'
-.include 'src/Glob/Grammar.pir'
-.include 'src/Glob/Actions.pir'
-.include 'src/Glob/Compiler.pir'
+.include 'src/StringGlob/Grammar.pir'
+.include 'src/StringGlob/Actions.pir'
+.include 'src/StringGlob/Compiler.pir'
 .include 'src/init.pir'
 .include 'src/options.pir'
 

diff --git a/src/Partcl/commands/string.pm b/src/Partcl/commands/string.pm
@@ -108,8 +108,8 @@ our sub string(*@args) {
         }
 
         ## my &dumper := Q:PIR { %r = get_root_global ['parrot'], '_dumper' };
-        ## &dumper(Glob::Compiler.compile($pattern, :target<parse>));
-        my $globber := Glob::Compiler.compile($pattern);
+        ## &dumper(StringGlob::Compiler.compile($pattern, :target<parse>));
+        my $globber := StringGlob::Compiler.compile($pattern);
         ?Regex::Cursor.parse($string, :rule($globber), :c(0));
     } elsif $cmd eq 'range' {
         return '';

diff --git a/src/Glob/Actions.pm → src/StringGlob/Actions.pm b/src/Glob/Actions.pm → src/StringGlob/Actions.pm
@@ -1,4 +1,4 @@
-class Glob::Actions is HLL::Actions;
+class StringGlob::Actions is HLL::Actions;
 
 method TOP($/) {
     my $ast := $<termish>.ast;

diff --git a/src/StringGlob/Compiler.pm b/src/StringGlob/Compiler.pm
@@ -0,0 +1,9 @@
+class StringGlob::Compiler is HLL::Compiler {
+    INIT {
+        StringGlob::Compiler.parsegrammar(StringGlob::Grammar);
+        StringGlob::Compiler.parseactions(StringGlob::Actions);
+        StringGlob::Compiler.language('StringGlob');
+    }
+}
+
+# vim: filetype=perl6:
diff --git a/src/Glob/Grammar.pm → src/StringGlob/Grammar.pm b/src/Glob/Grammar.pm → src/StringGlob/Grammar.pm
@@ -1,4 +1,4 @@
-grammar Glob::Grammar is HLL::Grammar;
+grammar StringGlob::Grammar is HLL::Grammar;
 
 token TOP {
     <termish>