linguify 0.5.2 → 0.6.0

data/README.md

@@ -168,6 +168,33 @@ end
 #    "
 ```
 
+There is also the inline keyword:
+
+``` ruby
+require 'linguify'
+
+reduce /inlined code/ => 'code' do
+  something.each do |foobar| # life is not worth living without psedo foobars
+    pp foobar
+  end
+end
+
+reduce /execute ({code:[^}]*})/ do |code|
+  pp "hey mum"
+  inline code
+  code
+  pp "you will never know what I just did"
+end
+
+"execute inlined code".linguify.to_ruby
+# => "code = lambda do
+#       (pp(\"hey mum\")
+#       (something.each { |foobar| pp(foobar) })
+#       pp(\"you will never know what I just did\"))
+#     end
+#    "
+```
+
 ## License
 
 (The MIT License)

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/lib/linguify/linguified.rb

@@ -42,6 +42,7 @@ module Linguify
       #
       @sentence = str.dup
       @bind = bind
+      @stack = [ str ]
       loop do
         rule = find_rule(str)
 
@@ -52,6 +53,8 @@ module Linguify
                                              :args     => rule[:match].match(str).to_a
 
         str = Linguified.reduce_string(str,rule[:match],reduction.to_rexp)
+        @stack << str
+
         break if /^{:[0-9]*}$/ =~ str
       end
 
@@ -63,6 +66,8 @@ module Linguify
 
       code = Reduction::parse(str).compile
 
+      Sexp.inline_keyword_inlined!(code)
+
       #if @dispatch_exceptions
       #  @sexy = Sexp.debug_envelope(code)
       #else
@@ -142,13 +147,20 @@ module Linguify
     def self.has_needle_on_word_boundary? splitted
       return true if splitted.size == 1 and splitted.first == :needle
 
+      prev_ends_with_space = true
+      following_needle     = true
+
       splitted.each_with_index do |split,i|
         if split.kind_of? String
-          word_bound = i == 0 ? split[-1] == ' ' : split[0] == ' ' || split[-1] == ' '
-          return true if word_bound
+          return true if following_needle and prev_ends_with_space and split[0] == ' '
+
+          prev_ends_with_space = (split[-1] == ' ')
+          following_needle = false
+        else # :needle
+          following_needle = true
         end
       end
-      false
+      following_needle && prev_ends_with_space
     end
 
     # Find a reduction rule for the string
@@ -166,7 +178,10 @@ module Linguify
           false
         end
       end
-      raise "no step definition for #{str}" if found.size == 0
+      if found.size == 0
+        pp @stack
+        raise "no step definition for #{str}"
+      end
       found[0]
     end
 

data/lib/linguify/sexp.rb

@@ -145,6 +145,54 @@ class Sexp < Array
   #            Sexp.new(:call, Sexp.new(:const, :Linguify), :exception, Sexp.new(:arglist, Sexp.new(:lvar, :e))))))))
   #end
 
+  def find needle
+    res = []
+    res << self if sexp_type == needle
+    case sexp_type
+    when :lasgn
+      self[1] == needle
+    when :lvar
+      self[1] == needle
+    when :call
+      self[2] == needle
+    when :lvar
+      self[1] == needle
+    else
+      self[1..-1].each do |h|
+        if h && h.kind_of?(Sexp)
+          res += h.find(needle)
+        end
+      end
+    end
+    res
+  end
+
+  def self.inline_keyword_inlined! code
+    inlines = Sexp.from_array(code).find(:call).select{ |call| call[1] == nil && call[2] == :inline }
+    inlines.each do |inline|
+      raise "Im lost, dont know what this is (yet)" unless inline[3].sexp_type == :arglist
+      raise "Im lost, dont know what this is (yet)" unless inline[3].size == 2
+      raise "Im lost, dont know what this is (yet)" unless inline[3][1].sexp_type == :lvar
+      var = inline[3][1][1]
+
+      assignments = []
+      code.each_with_index do |expression,n|
+        if expression.sexp_type == :lasgn and expression[1] == var
+          assignments << n
+        end
+      end
+      raise "this should never happen (yes, really!)" unless assignments.size == 1
+
+      code_block = code[assignments.first]
+      code.delete_at(assignments.first)
+
+      # now inject code
+      inline.clear
+      inline[0] = code_block[0]
+      inline[1] = code_block[1]
+      inline[2] = code_block[2]
+    end
+  end
 
 end
 

data/linguify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linguify"
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Hanevold"]
-  s.date = "2012-01-15"
+  s.date = "2012-01-29"
   s.description = "Linguify is a linguistic compiler allowing you to compile and execute plain english."
   s.email = "patrick.hanevold@gmail.com"
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/patrickhno/linguify"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "Linguify, the linguistic compiler."
 
   if s.respond_to? :specification_version then

metadata

@@ -2,7 +2,7 @@
 name: linguify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Patrick Hanevold
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-01-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sourcify
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 914071381584343177
+      hash: 4095864458397770704
       segments: 
       - 0
       version: "0"
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Linguify, the linguistic compiler.