Move transforms into subdir.

alphagov · Mar 23, 2012 · b182679 · b182679
1 parent f54c72e
commit b182679
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 100 deletions.
diff --git a/lib/sibyl/graph.rb b/lib/sibyl/graph.rb
@@ -1,6 +1,6 @@
 require "sibyl/errors"
 require "sibyl/parser"
-require "sibyl/ruby_transform"
+require "sibyl/transform/ruby"
 require "tsort"
 
 module Sibyl
@@ -98,7 +98,7 @@ def sink_names
 
     def parse(source)
       parser = Sibyl::Parser.new
-      transform = Sibyl::RubyTransform.new
+      transform = Sibyl::Transform::Ruby.new
       transform.apply(parser.parse(source))
     end
 

diff --git a/lib/sibyl/ruby_transform.rb b/lib/sibyl/ruby_transform.rb
diff --git a/lib/sibyl/sexp_transform.rb b/lib/sibyl/sexp_transform.rb
diff --git a/lib/sibyl/transform/ruby.rb b/lib/sibyl/transform/ruby.rb
@@ -0,0 +1,51 @@
+require "parslet"
+require "sibyl/nodes"
+
+module Sibyl
+  module Transform
+    class Ruby < Parslet::Transform
+      include Nodes
+
+      rule(text: simple(:x)) { x.to_s }
+      rule(numeric: simple(:x)) { x.to_i }
+      rule(code: simple(:x)) { x.to_s.strip }
+      rule(empty: simple(:x)) { [] }
+      rule(type: 'if', expr: simple(:expr), target: simple(:target)) {
+        ConditionalJump.new(expr, target)
+      }
+      rule(type: 'set', var: simple(:var), expr: simple(:expr)) {
+        Set.new(var, expr)
+      }
+      rule(type: 'otherwise', target: simple(:target)) {
+        Jump.new(target)
+      }
+      rule(type: 'branch', branch: subtree(:branch), from: simple(:from)) {
+        OptionBrancher.new(from, branch)
+      }
+      rule(type: 'option', branch: subtree(:branch), from: simple(:from)) {
+        OptionBrancher.new(from, branch)
+      }
+      rule(type: 'option', target: simple(:target), from: simple(:from)) {
+        OptionBrancher.new(from, [Jump.new(target)])
+      }
+      rule(type: 'go', branch: subtree(:branch)) {
+        Brancher.new(branch)
+      }
+      rule(type: 'go', target: simple(:target)) {
+        Brancher.new([Jump.new(target)])
+      }
+      rule(type: 'reject', expr: simple(:expr)) {
+        Reject.new(expr)
+      }
+      rule(type: 'step', subtype: simple(:subtype), name: simple(:name), body: subtree(:body)) {
+        Step.new(subtype, name, body)
+      }
+      rule(type: 'outcome', name: simple(:name)) {
+        Outcome.new(name)
+      }
+      rule(type: 'metadata', key: simple(:key), value: simple(:value)) {
+        Metadata.new(key, value)
+      }
+    end
+  end
+end
diff --git a/lib/sibyl/transform/sexp.rb b/lib/sibyl/transform/sexp.rb
@@ -0,0 +1,45 @@
+require "parslet"
+
+module Sibyl
+  module Transform
+    class Sexp < Parslet::Transform
+      rule(text: simple(:x)) { x.to_s }
+      rule(numeric: simple(:x)) { x.to_i }
+      rule(code: simple(:x)) { x.to_s.strip }
+      rule(empty: simple(:x)) { [] }
+      rule(type: 'if', expr: simple(:expr), target: simple(:target)) {
+        [:if, expr, target]
+      }
+      rule(type: 'set', var: simple(:var), expr: simple(:expr)) {
+        [:set, var, expr]
+      }
+      rule(type: 'otherwise', target: simple(:target)) {
+        [:otherwise, target]
+      }
+      rule(type: 'option', branch: subtree(:branch), from: simple(:from)) {
+        [:option, :branch, from, branch]
+      }
+      rule(type: 'option', target: simple(:target), from: simple(:from)) {
+        [:option, :simple, from, target]
+      }
+      rule(type: 'go', branch: subtree(:branch)) {
+        [:go, :branch, branch]
+      }
+      rule(type: 'go', target: simple(:target)) {
+        [:go, :simple, target]
+      }
+      rule(type: 'reject', expr: simple(:expr)) {
+        [:reject, expr.to_s.strip]
+      }
+      rule(type: 'step', subtype: simple(:subtype), name: simple(:name), body: subtree(:body)) {
+        [:step, subtype, name, body]
+      }
+      rule(type: 'outcome', name: simple(:name)) {
+        [:outcome, name]
+      }
+      rule(type: 'metadata', key: simple(:key), value: simple(:value)) {
+        [:metadata, key, value]
+      }
+    end
+  end
+end
diff --git a/test/parsing_test.rb b/test/parsing_test.rb
@@ -1,11 +1,11 @@
 require "common"
 require "sibyl/parser"
-require "sibyl/sexp_transform"
+require "sibyl/transform/sexp"
 
 describe "Parser" do
   def sexp(source)
     parser = Sibyl::Parser.new
-    transform = Sibyl::SexpTransform.new
+    transform = Sibyl::Transform::Sexp.new
     transform.apply(parser.parse(source))
   end
 

diff --git a/test/step_test.rb b/test/step_test.rb
@@ -1,13 +1,13 @@
 require "common"
 require "sibyl/parser"
-require "sibyl/ruby_transform"
+require "sibyl/transform/ruby"
 require "sibyl/errors"
 require "ostruct"
 
 describe "Step" do
   def ruby(source)
     parser = Sibyl::Parser.new
-    transform = Sibyl::RubyTransform.new
+    transform = Sibyl::Transform::Ruby.new
     transform.apply(parser.parse(source)).first
   end
 

diff --git a/test/transform_test.rb b/test/transform_test.rb
@@ -1,11 +1,11 @@
 require "common"
 require "sibyl/parser"
-require "sibyl/ruby_transform"
+require "sibyl/transform/ruby"
 
 describe "Ruby Transform" do
   def ruby(source)
     parser = Sibyl::Parser.new
-    transform = Sibyl::RubyTransform.new
+    transform = Sibyl::Transform::Ruby.new
     transform.apply(parser.parse(source)).first
   end