Rename PredicatedAtom class to Predicate.

jcoglan · May 1, 2012 · 2c7e27a · 2c7e27a
1 parent 98fc940
commit 2c7e27a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/jake.yml b/jake.yml
@@ -27,7 +27,7 @@ packages:
       - canopy/compiler/char_class
       - canopy/compiler/string
       - canopy/compiler/ci_string
-      - canopy/compiler/predicated_atom
+      - canopy/compiler/predicate
       - canopy/compiler/repeat
       - canopy/compiler/sequence
       - canopy/compiler/sequence_part

diff --git a/source/canopy/compiler/predicated_atom.js → source/canopy/compiler/predicate.js b/source/canopy/compiler/predicated_atom.js → source/canopy/compiler/predicate.js
@@ -1,4 +1,4 @@
-Canopy.Compiler.PredicatedAtom = {
+Canopy.Compiler.Predicate = {
   atomic: function() {
     var expression = this.atom;
     return expression.parsing_expression || expression;

diff --git a/source/canopy/meta_grammar.js b/source/canopy/meta_grammar.js
@@ -1284,7 +1284,7 @@
       if (elements0) {
         this._offset = index1;
         var klass2 = null;
-        var type0 = find(this.constructor, "PredicatedAtom");
+        var type0 = find(this.constructor, "Predicate");
         if (type0 instanceof Function) {
           klass2 = type0;
         } else {

diff --git a/source/canopy/meta_grammar.peg b/source/canopy/meta_grammar.peg
@@ -43,7 +43,7 @@ grammar Canopy.MetaGrammar
                              / char_class_expression
 
   predicated_atom           <- predicate:("&" / "!") atom
-                               <PredicatedAtom>
+                               <Predicate>
 
   reference_expression      <- identifier !assignment <Reference>
 

diff --git a/spec/canopy/compiler/predicated_atom_spec.js → spec/canopy/compiler/predicate_spec.js b/spec/canopy/compiler/predicated_atom_spec.js → spec/canopy/compiler/predicate_spec.js
@@ -1,4 +1,4 @@
-Canopy.Compiler.PredicatedAtomSpec = JS.Test.describe("Canopy.Compiler.PredicatedAtom",
+Canopy.Compiler.PredicateSpec = JS.Test.describe("Canopy.Compiler.Predicate",
 function() { with(this) {
   include(Canopy.SpecHelper)
 

diff --git a/spec/runner.js b/spec/runner.js
@@ -28,7 +28,7 @@ JS.require('JS.Test', function() {
                 'Canopy.Compiler.AnyCharSpec',
                 'Canopy.Compiler.CharClassSpec',
                 'Canopy.Compiler.StringSpec',
-                'Canopy.Compiler.PredicatedAtomSpec',
+                'Canopy.Compiler.PredicateSpec',
                 'Canopy.Compiler.RepeatSpec',
                 'Canopy.Compiler.SequenceSpec',
                 'Canopy.Compiler.ChoiceSpec',